From dcc1dc1383cc82d03caa49b8b2be2a4303dce885 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 24 Sep 2018 11:31:04 +0200
Subject: [PATCH 01/43] ENH: cylindricalCS is now in radians only (issue #863)

- this provides internal consistency and allows direct use of the
  coordinate angle with sin(), cos() functions.
  It eliminates potential issues that could otherwise arise from
  alternative user input.

  Eg, in mixerFvMesh it would have previously been possible to specify
  the coordinate system to use degrees or radians, but these units were
  not checked when determining the tangential sweep positions.

NOTE: this may represent a breaking change if user coding has been
relying on cylindrical coordinate system in degrees.
---
 .../derived/rotorDiskSource/rotorDiskSource.C |   4 +-
 .../derived/rotorDiskSource/rotorDiskSource.H |   4 +-
 .../ParticleCollector/ParticleCollector.C     |   4 +-
 .../blockMesh/blockEdges/arcEdge/arcEdge.C    |   9 +-
 .../blockMesh/blockEdges/arcEdge/arcEdge.H    |   2 +-
 .../coordinate/systems/cylindricalCS.C        | 180 ++++++++----------
 .../coordinate/systems/cylindricalCS.H        |  35 +---
 .../mixerFvMesh/mixerFvMesh.C                 |  18 +-
 8 files changed, 113 insertions(+), 143 deletions(-)

diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 851cc93315..106d52aaf4 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -381,7 +381,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
         }
     }
 
-    coordSys_ = cylindricalCS("rotorCoordSys", origin, axis, refDir, false);
+    coordSys_ = cylindricalCS("rotorCS", origin, axis, refDir);
 
     const scalar sumArea = gSum(area_);
     const scalar diameter = Foam::sqrt(4.0*sumArea/mathematical::pi);
@@ -483,7 +483,7 @@ Foam::fv::rotorDiskSource::rotorDiskSource
     R_(cells_.size(), I),
     invR_(cells_.size(), I),
     area_(cells_.size(), 0.0),
-    coordSys_(false),
+    coordSys_(),
     cylindrical_(),
     rMax_(0.0),
     trim_(trimModel::New(*this, coeffs_)),
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index 611a26b775..f63916bf22 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -196,7 +196,7 @@ protected:
         //- Area [m2]
         List<scalar> area_;
 
-        //- Rotor local cylindrical coordinate system (r, theta, z)
+        //- Rotor local cylindrical coordinate system (r-theta-z)
         cylindricalCS coordSys_;
 
         //- Rotor transformation coordinate system
@@ -279,7 +279,7 @@ public:
             // (Cylindrical r, theta, z)
             inline const List<point>& x() const;
 
-            //- Return the rotor coordinate system (r, theta, z)
+            //- Return the rotor coordinate system (r-theta-z)
             inline const cylindricalCS& coordSys() const;
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 988eca02c4..42613d5e8b 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -207,7 +207,7 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
     faces_.setSize(nFace);
     area_.setSize(nFace);
 
-    coordSys_ = cylindricalCS("coordSys", origin, normal_[0], refDir, false);
+    coordSys_ = cylindricalCS("collector", origin, normal_[0], refDir);
 
     List<label> ptIDs(identity(nPointPerRadius));
 
@@ -539,7 +539,7 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
     faceTris_(),
     nSector_(0),
     radius_(),
-    coordSys_(false),
+    coordSys_(),
     normal_(),
     negateParcelsOppositeNormal_
     (
diff --git a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
index 0de1a2f906..190f3938a4 100644
--- a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
+++ b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
@@ -98,8 +98,8 @@ Foam::cylindricalCS Foam::blockEdges::arcEdge::calcAngle()
 
     radius_ = mag(r3);
 
-    // The corresponding local cylindrical coordinate system (degrees)
-    return cylindricalCS("arcEdgeCS", centre, arcAxis, r1, true);
+    // The corresponding local cylindrical coordinate system (radians)
+    return cylindricalCS("arc", centre, arcAxis, r1);
 }
 
 
@@ -158,13 +158,14 @@ Foam::point Foam::blockEdges::arcEdge::position(const scalar lambda) const
         return p3_;
     }
 
-    return cs_.globalPosition(vector(radius_, lambda*angle_, 0.0));
+    // The angle is degrees, the coordinate system in radians
+    return cs_.globalPosition(vector(radius_, degToRad(lambda*angle_), 0));
 }
 
 
 Foam::scalar Foam::blockEdges::arcEdge::length() const
 {
-    return degToRad(angle_*radius_);
+    return degToRad(radius_*angle_);
 }
 
 
diff --git a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
index 3b1062ea96..52a122226e 100644
--- a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
+++ b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
@@ -64,7 +64,7 @@ class arcEdge
         //- The arc radius
         scalar radius_;
 
-        //- The local cylindrical coordinate system (degrees)
+        //- The local cylindrical coordinate system
         cylindricalCS cs_;
 
 
diff --git a/src/meshTools/coordinate/systems/cylindricalCS.C b/src/meshTools/coordinate/systems/cylindricalCS.C
index fda455545a..dac22e62d3 100644
--- a/src/meshTools/coordinate/systems/cylindricalCS.C
+++ b/src/meshTools/coordinate/systems/cylindricalCS.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,41 +24,69 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cylindricalCS.H"
-
-#include "one.H"
-#include "mathematicalConstants.H"
 #include "addToRunTimeSelectionTable.H"
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Issue warning if 'degrees' keyword was specified and true.
+// Compatibility change after 1806.
+
+static inline void warnCompatDegrees(const Foam::dictionary& dict)
+{
+    if (Pstream::parRun() ? Pstream::master() : true)
+    {
+        std::cerr
+            << "--> FOAM IOWarning :" << nl
+            << "    Found [v1806] 'degrees' keyword in dictionary \""
+            << dict.name().c_str() << "\"    Ignored, now radians only." << nl
+            << std::endl;
+    }
+}
+
+
+//- Convert from Cartesian (to Cylindrical)
+static inline vector fromCartesian(const vector& v)
+{
+    return vector(hypot(v.x(), v.y()), atan2(v.y(), v.x()), v.z());
+}
+
+
+//- Convert to Cartesian (from Cylindrical)
+static inline vector toCartesian(const vector& v)
+{
+    return vector(v.x()*cos(v.y()), v.x()*sin(v.y()), v.z());
+}
+
+} // End namespace Foam
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cylindricalCS::cylindricalCS(const bool inDegrees)
+Foam::cylindricalCS::cylindricalCS()
 :
-    coordinateSystem(),
-    inDegrees_(inDegrees)
+    coordinateSystem()
 {}
 
 
 Foam::cylindricalCS::cylindricalCS
 (
-    const coordinateSystem& cs,
-    const bool inDegrees
+    const coordinateSystem& cs
 )
 :
-    coordinateSystem(cs),
-    inDegrees_(inDegrees)
+    coordinateSystem(cs)
 {}
 
 
 Foam::cylindricalCS::cylindricalCS
 (
     const word& name,
-    const coordinateSystem& cs,
-    const bool inDegrees
+    const coordinateSystem& cs
 )
 :
-    coordinateSystem(name, cs),
-    inDegrees_(inDegrees)
+    coordinateSystem(name, cs)
 {}
 
 
@@ -66,12 +94,10 @@ Foam::cylindricalCS::cylindricalCS
 (
     const word& name,
     const point& origin,
-    const coordinateRotation& cr,
-    const bool inDegrees
+    const coordinateRotation& cr
 )
 :
-    coordinateSystem(name, origin, cr),
-    inDegrees_(inDegrees)
+    coordinateSystem(name, origin, cr)
 {}
 
 
@@ -80,12 +106,10 @@ Foam::cylindricalCS::cylindricalCS
     const word& name,
     const point& origin,
     const vector& axis,
-    const vector& dirn,
-    const bool inDegrees
+    const vector& dirn
 )
 :
-    coordinateSystem(name, origin, axis, dirn),
-    inDegrees_(inDegrees)
+    coordinateSystem(name, origin, axis, dirn)
 {}
 
 
@@ -95,9 +119,13 @@ Foam::cylindricalCS::cylindricalCS
     const dictionary& dict
 )
 :
-    coordinateSystem(name, dict),
-    inDegrees_(dict.lookupOrDefault("degrees", true))
-{}
+    coordinateSystem(name, dict)
+{
+    if (dict.lookupOrDefault("degrees", false))
+    {
+        warnCompatDegrees(dict);
+    }
+}
 
 
 Foam::cylindricalCS::cylindricalCS
@@ -106,45 +134,26 @@ Foam::cylindricalCS::cylindricalCS
     const dictionary& dict
 )
 :
-    coordinateSystem(obr, dict),
-    inDegrees_(dict.lookupOrDefault("degrees", true))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::cylindricalCS::~cylindricalCS()
-{}
+    coordinateSystem(obr, dict)
+{
+    if (dict.lookupOrDefault("degrees", false))
+    {
+        warnCompatDegrees(dict);
+    }
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::cylindricalCS::inDegrees() const
-{
-    return inDegrees_;
-}
-
-
-bool& Foam::cylindricalCS::inDegrees()
-{
-    return inDegrees_;
-}
-
-
 Foam::vector Foam::cylindricalCS::localToGlobal
 (
     const vector& local,
     bool translate
 ) const
 {
-    scalar theta
-    (
-        local.y()*(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
-    );
-
     return coordinateSystem::localToGlobal
     (
-        vector(local.x()*cos(theta), local.x()*sin(theta), local.z()),
+        toCartesian(local),
         translate
     );
 }
@@ -156,19 +165,22 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::localToGlobal
     bool translate
 ) const
 {
-    scalarField theta
-    (
-        local.component(vector::Y)
-       *(inDegrees_ ? constant::mathematical::pi/180.0 : 1.0)
-    );
+    const label len = local.size();
 
+    auto tresult = tmp<vectorField>::New(len);
+    auto& result = tresult.ref();
 
-    vectorField lc(local.size());
-    lc.replace(vector::X, local.component(vector::X)*cos(theta));
-    lc.replace(vector::Y, local.component(vector::X)*sin(theta));
-    lc.replace(vector::Z, local.component(vector::Z));
+    for (label i=0; i<len; ++i)
+    {
+        result[i] =
+            coordinateSystem::localToGlobal
+            (
+                toCartesian(local[i]),
+                translate
+            );
+    }
 
-    return coordinateSystem::localToGlobal(lc, translate);
+    return tresult;
 }
 
 
@@ -178,21 +190,10 @@ Foam::vector Foam::cylindricalCS::globalToLocal
     bool translate
 ) const
 {
-    const vector lc
+    return fromCartesian
     (
         coordinateSystem::globalToLocal(global, translate)
     );
-
-    return vector
-    (
-        sqrt(sqr(lc.x()) + sqr(lc.y())),
-        atan2
-        (
-            lc.y(),
-            lc.x()
-        )*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0),
-        lc.z()
-    );
 }
 
 
@@ -202,31 +203,18 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
     bool translate
 ) const
 {
-    const vectorField lc
+    const label len = global.size();
+
+    tmp<vectorField> tresult
     (
         coordinateSystem::globalToLocal(global, translate)
     );
+    auto& result = tresult.ref();
 
-    tmp<vectorField> tresult(new vectorField(lc.size()));
-    vectorField& result = tresult.ref();
-
-    result.replace
-    (
-        vector::X,
-        sqrt(sqr(lc.component(vector::X)) + sqr(lc.component(vector::Y)))
-    );
-
-    result.replace
-    (
-        vector::Y,
-        atan2
-        (
-            lc.component(vector::Y),
-            lc.component(vector::X)
-        )*(inDegrees_ ? 180.0/constant::mathematical::pi : 1.0)
-    );
-
-    result.replace(vector::Z, lc.component(vector::Z));
+    for (label i=0; i<len; ++i)
+    {
+        result[i] = fromCartesian(result[i]);
+    }
 
     return tresult;
 }
diff --git a/src/meshTools/coordinate/systems/cylindricalCS.H b/src/meshTools/coordinate/systems/cylindricalCS.H
index 4504231cae..ef34b9e15b 100644
--- a/src/meshTools/coordinate/systems/cylindricalCS.H
+++ b/src/meshTools/coordinate/systems/cylindricalCS.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,7 +25,7 @@ Class
     Foam::cylindricalCS
 
 Description
-    Cylindrical coordinate system
+    Cylindrical coordinate system, always in radians.
 
 SourceFiles
     cylindricalCS.C
@@ -50,12 +50,6 @@ class cylindricalCS
 :
     public coordinateSystem
 {
-    // Private data members
-
-        //- Are angles in degrees? (default = true)
-        bool inDegrees_;
-
-
 protected:
 
     // Protected Member Functions
@@ -92,21 +86,19 @@ public:
     // Constructors
 
         //- Construct null
-        cylindricalCS(const bool inDegrees=true);
+        cylindricalCS();
 
         //- Construct copy
         cylindricalCS
         (
-            const coordinateSystem&,
-            const bool inDegrees=true
+            const coordinateSystem&
         );
 
         //- Construct copy with a different name
         cylindricalCS
         (
             const word& name,
-            const coordinateSystem&,
-            const bool inDegrees=true
+            const coordinateSystem&
         );
 
         //- Construct from origin and rotation
@@ -114,8 +106,7 @@ public:
         (
             const word& name,
             const point& origin,
-            const coordinateRotation&,
-            const bool inDegrees=true
+            const coordinateRotation&
         );
 
         //- Construct from origin and 2 axes
@@ -124,8 +115,7 @@ public:
             const word& name,
             const point& origin,
             const vector& axis,
-            const vector& dirn,
-            const bool inDegrees=true
+            const vector& dirn
         );
 
         //- Construct from dictionary and name
@@ -136,16 +126,7 @@ public:
 
 
     //- Destructor
-    virtual ~cylindricalCS();
-
-
-    // Member Functions
-
-        //- Are angles in degrees?
-        bool inDegrees() const;
-
-        //- Non-const access to inDegrees
-        bool& inDegrees();
+    virtual ~cylindricalCS() = default;
 };
 
 
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index d613e33906..1c8de7f563 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -269,13 +269,10 @@ Foam::mixerFvMesh::mixerFvMesh
     ),
     csPtr_
     (
-        coordinateSystem::New
-        (
-            "coordinateSystem",
-            motionDict_.subDict("coordinateSystem")
-        )
+        // Caution: must be a cylindricalCS
+        coordinateSystem::New(*this, motionDict_, "coordinateSystem")
     ),
-    rpm_(readScalar(motionDict_.lookup("rpm"))),
+    rpm_(motionDict_.get<scalar>("rpm")),
     movingPointsMaskPtr_(nullptr)
 {
     addZonesAndModifiers();
@@ -294,6 +291,7 @@ Foam::mixerFvMesh::~mixerFvMesh()
     deleteDemandDrivenData(movingPointsMaskPtr_);
 }
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 // Return moving points mask.  Moving points marked with 1
@@ -310,13 +308,15 @@ const Foam::scalarField& Foam::mixerFvMesh::movingPointsMask() const
 
 bool Foam::mixerFvMesh::update()
 {
-    // Rotational speed needs to be converted from rpm
+    // The tangential sweep (radians)
+    const vector theta(0, rpmToRads(rpm_)*time().deltaTValue(), 0);
+
     movePoints
     (
         csPtr_->globalPosition
         (
             csPtr_->localPosition(points())
-          + vector(0, rpm_*360.0*time().deltaTValue()/60.0, 0)
+          + theta
             *movingPointsMask()
         )
     );
@@ -339,7 +339,7 @@ bool Foam::mixerFvMesh::update()
         csPtr_->globalPosition
         (
             csPtr_->localPosition(oldPoints())
-          + vector(0, rpm_*360.0*time().deltaTValue()/60.0, 0)
+          + theta
             *movingPointsMask()
         )
     );

From e7a6095aaf9b1b10767dbba692710acbbf5016c9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 24 Sep 2018 17:55:37 +0200
Subject: [PATCH 02/43] ENH: avoid duplicate bookkeeping of rotation tensors in
 rotorDiskSource

---
 .../sources/derived/rotorDiskSource/rotorDiskSource.C     | 8 +++-----
 .../sources/derived/rotorDiskSource/rotorDiskSource.H     | 5 +----
 .../derived/rotorDiskSource/rotorDiskSourceTemplates.C    | 5 +++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 106d52aaf4..0d518f551b 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -422,8 +422,7 @@ void Foam::fv::rotorDiskSource::constructGeometry()
             // rotor cone system
             scalar c = cos(beta);
             scalar s = sin(beta);
-            R_[i] = tensor(c, 0, -s, 0, 1, 0, s, 0, c);
-            invR_[i] = R_[i].T();
+            Rcone_[i] = tensor(c, 0, -s, 0, 1, 0, s, 0, c);
         }
     }
 }
@@ -480,9 +479,8 @@ Foam::fv::rotorDiskSource::rotorDiskSource
     tipEffect_(1.0),
     flap_(),
     x_(cells_.size(), Zero),
-    R_(cells_.size(), I),
-    invR_(cells_.size(), I),
-    area_(cells_.size(), 0.0),
+    Rcone_(cells_.size(), I),
+    area_(cells_.size(), Zero),
     coordSys_(),
     cylindrical_(),
     rMax_(0.0),
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index f63916bf22..ec293d7eda 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -188,10 +188,7 @@ protected:
         List<point> x_;
 
         //- Rotation tensor for flap angle
-        List<tensor> R_;
-
-        //- Inverse rotation tensor for flap angle
-        List<tensor> invR_;
+        List<tensor> Rcone_;
 
         //- Area [m2]
         List<scalar> area_;
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index bcec1750a0..c5cab4d847 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -26,6 +26,7 @@ License
 #include "rotorDiskSource.H"
 #include "volFields.H"
 #include "unitConversion.H"
+#include "transform.H"
 
 using namespace Foam::constant;
 
@@ -62,7 +63,7 @@ void Foam::fv::rotorDiskSource::calculate
             vector Uc = cylindrical_->invTransform(U[celli], i);
 
             // Transform velocity into local coning system
-            Uc = R_[i] & Uc;
+            Uc = transform(Rcone_[i], Uc);
 
             // Set radial component of velocity to zero
             Uc.x() = 0.0;
@@ -129,7 +130,7 @@ void Foam::fv::rotorDiskSource::calculate
             liftEff += rhoRef_*localForce.z();
 
             // Transform force from local coning system into rotor cylindrical
-            localForce = invR_[i] & localForce;
+            localForce = invTransform(Rcone_[i], localForce);
 
             // Transform force into global Cartesian co-ordinate system
             force[celli] = cylindrical_->transform(localForce, i);

From 6697bb4735e94a720210b3e248237eea184abb46 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 1 Oct 2018 13:54:10 +0200
Subject: [PATCH 03/43] ENH: improve, simplify, rationalize coordinate system
 handling (issue #863)

Previously the coordinate system functionality was split between
coordinateSystem and coordinateRotation. The coordinateRotation stored
the rotation tensor and handled all tensor transformations.

The functionality has now been revised and consolidated into the
coordinateSystem classes. The sole purpose of coordinateRotation
is now just to provide a selectable mechanism of how to define the
rotation tensor (eg, axis-angle, euler angles, local axes) for user
input, but after providing the appropriate rotation tensor it has
no further influence on the transformations.

--

The coordinateSystem class now contains an origin and a base rotation
tensor directly and various transformation methods.

  - The origin represents the "shift" for a local coordinate system.

  - The base rotation tensor represents the "tilt" or orientation
    of the local coordinate system in general (eg, for mapping
    positions), but may require position-dependent tensors when
    transforming vectors and tensors.

For some coordinate systems (currently the cylindrical coordinate system),
the rotation tensor required for rotating a vector or tensor is
position-dependent.

The new coordinateSystem and its derivates (cartesian, cylindrical,
indirect) now provide a uniform() method to define if the rotation
tensor is position dependent/independent.

The coordinateSystem transform and invTransform methods are now
available in two-parameter forms for obtaining position-dependent
rotation tensors. Eg,

      ... = cs.transform(globalPt, someVector);

In some cases it can be useful to use query uniform() to avoid
storage of redundant values.

      if (cs.uniform())
      {
          vector xx = cs.transform(someVector);
      }
      else
      {
          List<vector> xx = cs.transform(manyPoints, someVector);
      }

Support transform/invTransform for common data types:
   (scalar, vector, sphericalTensor, symmTensor, tensor).

====================
  Breaking Changes
====================

- These changes to coordinate systems and rotations may represent
  a breaking change for existing user coding.

- Relocating the rotation tensor into coordinateSystem itself means
  that the coordinate system 'R()' method now returns the rotation
  directly instead of the coordinateRotation. The method name 'R()'
  was chosen for consistency with other low-level entities (eg,
  quaternion).

  The following changes will be needed in coding:

      Old:  tensor rot = cs.R().R();
      New:  tensor rot = cs.R();

      Old:  cs.R().transform(...);
      New:  cs.transform(...);

  Accessing the runTime selectable coordinateRotation
  has moved to the rotation() method:

      Old:  Info<< "Rotation input: " << cs.R() << nl;
      New:  Info<< "Rotation input: " << cs.rotation() << nl;

- Naming consistency changes may also cause code to break.

      Old:  transformVector()
      New:  transformPrincipal()

  The old method name transformTensor() now simply becomes transform().

====================
  New methods
====================

For operations requiring caching of the coordinate rotations, the
'R()' method can be used with multiple input points:

       tensorField rots(cs.R(somePoints));

   and later

       Foam::transformList(rots, someVectors);

The rotation() method can also be used to change the rotation tensor
via a new coordinateRotation definition (issue #879).

The new methods transformPoint/invTransformPoint provide
transformations with an origin offset using Cartesian for both local
and global points. These can be used to determine the local position
based on the origin/rotation without interpreting it as a r-theta-z
value, for example.

================
  Input format
================

- Streamline dictionary input requirements

  * The default type is cartesian.
  * The default rotation type is the commonly used axes rotation
    specification (with e1/e2/3), which is assumed if the 'rotation'
    sub-dictionary does not exist.

    Example,

    Compact specification:

        coordinateSystem
        {
            origin  (0 0 0);
            e2      (0 1 0);
            e3      (0.5 0 0.866025);
        }

    Full specification (also accepts the longer 'coordinateRotation'
    sub-dictionary name):

        coordinateSystem
        {
            type    cartesian;
            origin  (0 0 0);

            rotation
            {
                type    axes;
                e2      (0 1 0);
                e3      (0.5 0 0.866025);
            }
        }

   This simplifies the input for many cases.

- Additional rotation specification 'none' (an identity rotation):

      coordinateSystem
      {
          origin  (0 0 0);
          rotation { type none; }
      }

- Additional rotation specification 'axisAngle', which is similar
  to the -rotate-angle option for transforming points (issue #660).
  For some cases this can be more intuitive.

  For example,

      rotation
      {
          type    axisAngle;
          axis    (0 1 0);
          angle   30;
      }
  vs.
      rotation
      {
          type    axes;
          e2      (0 1 0);
          e3      (0.5 0 0.866025);
      }

- shorter names (or older longer names) for the coordinate rotation
  specification.

     euler         EulerRotation
     starcd        STARCDRotation
     axes          axesRotation

================
  Coding Style
================
- use Foam::coordSystem namespace for categories of coordinate systems
  (cartesian, cylindrical, indirect). This reduces potential name
  clashes and makes a clearer declaration. Eg,

      coordSystem::cartesian csys_;

  The older names (eg, cartesianCS, etc) remain available via typedefs.

- added coordinateRotations namespace for better organization and
  reduce potential name clashes.
---
 .../solid/createSolidFields.H                 |  13 +-
 .../solid/setRegionSolidFields.H              |   7 +-
 .../coordinateSystem/Test-coordinateSystem.C  | 131 +++-
 .../testCase0/constant/coordinateSystems      |  32 +
 .../testCase0/system/controlDict              |  48 ++
 .../testCase1/constant/coordinateSystems      |  86 +++
 .../testCase1/system/controlDict              |  48 ++
 .../coordinateSystem/{testDict1 => testCsys1} |  91 ++-
 applications/test/coordinateSystem/testCsys2  |  59 ++
 .../general/coordinateSystem/cartesianXY      |   6 +-
 .../general/coordinateSystem/cartesianXZ      |   6 +-
 .../general/coordinateSystem/cartesianYZ      |   8 +-
 .../general/coordinateSystem/cylindrical      |   5 +-
 etc/controlDict                               |  13 +-
 src/OpenFOAM/primitives/Tensor/Tensor.H       |   5 -
 src/OpenFOAM/primitives/Tensor/TensorI.H      |  23 -
 src/OpenFOAM/primitives/Tensor2D/Tensor2D.H   |   5 -
 src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H  |  17 -
 ...tkAtmRoughWallFunctionFvPatchScalarField.H |   2 +-
 .../meshCut/directions/directions.C           |   2 +-
 .../points0/points0MotionSolver.C             |   4 +-
 src/engine/enginePiston/enginePiston.C        |  19 +-
 src/engine/enginePiston/enginePiston.H        |   7 +-
 src/engine/engineValve/engineValve.C          |  29 +-
 src/engine/engineValve/engineValve.H          |  15 +-
 .../faMesh/faMeshDemandDrivenData.C           |  21 +-
 .../DarcyForchheimer/DarcyForchheimer.C       | 128 ++--
 .../DarcyForchheimer/DarcyForchheimer.H       |   4 +-
 .../porosityModel/fixedCoeff/fixedCoeff.C     |  75 +-
 .../porosityModel/fixedCoeff/fixedCoeff.H     |   2 +-
 .../porosityModel/IOporosityModelList.C       |  10 +-
 .../porosityModel/IOporosityModelList.H       |   5 +-
 .../porosityModel/porosityModel.C             |  51 +-
 .../porosityModel/porosityModel.H             |  13 +-
 .../porosityModel/porosityModelI.H            |  16 +
 .../porosityModel/porosityModelList.C         |  15 +-
 .../porosityModel/porosityModelList.H         |   6 +-
 .../porosityModel/porosityModelNew.C          |   4 +-
 .../general/porosityModel/powerLaw/powerLaw.C |  14 +-
 .../general/porosityModel/powerLaw/powerLaw.H |   2 +-
 .../powerLaw/powerLawTemplates.C              |  18 +-
 .../solidification/solidification.C           |   4 +-
 .../solidification/solidification.H           |   9 +-
 .../solidification/solidificationTemplates.C  |  22 +-
 ...lindricalInletVelocityFvPatchVectorField.H |   2 +-
 ...aseHydrostaticPressureFvPatchScalarField.H |   2 +-
 .../rotatingWallVelocityFvPatchVectorField.H  |   2 +-
 .../swirlInletVelocityFvPatchVectorField.H    |   2 +-
 .../derived/turbulentDFSEMInlet/eddy/eddy.H   |  11 +-
 ...ityHydrostaticPressureFvPatchScalarField.H |   2 +-
 .../cellPointWeight/cellPointWeight.H         |   2 +-
 .../interpolationPointMVC/pointMVCWeight.H    |   2 +-
 .../fieldCoordinateSystemTransform.C          |  16 +-
 .../fieldCoordinateSystemTransform.H          |  20 +-
 .../fieldCoordinateSystemTransformTemplates.C |   9 +-
 .../postProcessingDict                        |   8 +-
 .../regionSizeDistribution.C                  |  19 +-
 .../regionSizeDistribution.H                  |   6 +-
 src/functionObjects/forces/forces/forces.C    |  20 +-
 src/functionObjects/forces/forces/forces.H    |  36 +-
 .../explicitPorositySource.H                  |   9 +-
 .../jouleHeatingSource/jouleHeatingSource.C   |  33 +-
 .../jouleHeatingSource/jouleHeatingSource.H   |  21 +-
 .../derived/rotorDiskSource/rotorDiskSource.C |  42 +-
 .../derived/rotorDiskSource/rotorDiskSource.H |  13 +-
 .../rotorDiskSource/rotorDiskSourceI.H        |   9 +-
 .../rotorDiskSourceTemplates.C                |  19 +-
 .../trimModel/targetCoeff/targetCoeffTrim.C   |   6 +-
 .../interRegionExplicitPorositySource.H       |  10 +-
 .../injectedParticle/injectedParticleIO.C     |   2 +-
 .../ParticleCollector/ParticleCollector.C     |   4 +-
 .../ParticleCollector/ParticleCollector.H     |   4 +-
 .../KinematicLookupTableInjection.H           |   2 +-
 .../ReactingLookupTableInjection.H            |   2 +-
 .../ReactingMultiphaseLookupTableInjection.H  |   2 +-
 .../ThermoLookupTableInjection.H              |   2 +-
 .../lumpedPointStateWriter.C                  |  17 +-
 .../blockMesh/blockEdges/arcEdge/arcEdge.C    |   4 +-
 .../blockMesh/blockEdges/arcEdge/arcEdge.H    |   6 +-
 src/meshTools/Make/files                      |   9 +-
 .../rotation/EulerCoordinateRotation.C        | 244 +++---
 .../rotation/EulerCoordinateRotation.H        | 172 ++---
 .../rotation/STARCDCoordinateRotation.C       | 242 +++---
 .../rotation/STARCDCoordinateRotation.H       | 165 ++---
 .../coordinate/rotation/axesRotation.C        | 279 ++++---
 .../coordinate/rotation/axesRotation.H        | 206 ++---
 .../coordinate/rotation/axisAngleRotation.C   | 167 +++++
 .../coordinate/rotation/axisAngleRotation.H   | 156 ++++
 .../coordinate/rotation/coordinateRotation.C  |  53 +-
 .../coordinate/rotation/coordinateRotation.H  | 154 +---
 .../rotation/coordinateRotationNew.C          |  76 --
 .../coordinate/rotation/cylindrical.C         | 360 ---------
 .../coordinate/rotation/cylindrical.H         | 251 -------
 .../coordinate/rotation/cylindricalRotation.C | 101 +++
 .../coordinate/rotation/cylindricalRotation.H | 122 +++
 .../coordinate/rotation/identityRotation.C    |  99 +++
 .../coordinate/rotation/identityRotation.H    | 124 ++++
 .../coordinate/systems/cartesianCS.C          | 120 ++-
 .../coordinate/systems/cartesianCS.H          | 124 ++--
 .../coordinate/systems/coordinateSystem.C     | 456 +++++++-----
 .../coordinate/systems/coordinateSystem.H     | 701 +++++++++++++-----
 .../coordinate/systems/coordinateSystemNew.C  | 160 +++-
 .../systems/coordinateSystemTemplates.C       | 161 ++++
 .../systems/coordinateSystemTransform.C       | 217 ++++++
 .../coordinate/systems/coordinateSystems.C    | 181 ++++-
 .../coordinate/systems/coordinateSystems.H    |  70 +-
 .../coordinate/systems/cylindricalCS.C        | 130 +++-
 .../coordinate/systems/cylindricalCS.H        | 144 +++-
 src/meshTools/coordinate/systems/indirectCS.C | 113 +++
 src/meshTools/coordinate/systems/indirectCS.H | 298 ++++++++
 .../searchableRotatedBox.C                    |   1 -
 .../searchableSurfaceCollection.C             |   5 +-
 src/sampling/sampledSet/array/arraySet.C      |  10 +-
 src/sampling/sampledSet/circle/circleSet.H    |   4 +-
 .../readers/ensight/ensightSurfaceReader.C    |   2 +-
 .../sampledPlane/sampledPlane.C               |   3 +-
 .../plane/surfMeshSamplePlane.C               |   3 +-
 .../solarCalculator/solarCalculator.C         |   2 +-
 .../mixerFvMesh/mixerFvMesh.C                 |  40 +-
 .../mixerFvMesh/mixerFvMesh.H                 |  12 +-
 src/waveModels/waveModel/waveModel.C          |   4 +-
 src/waveModels/waveModel/waveModel.H          |   6 +-
 .../RAS/angledDuct/constant/fvOptions         |   9 +-
 .../RAS/angledDuctLTS/constant/fvOptions      |   9 +-
 .../RAS/mixerVessel2D/constant/fvOptions      |   9 +-
 .../common/constant/porosityProperties        |   9 +-
 .../constant/fvOptions                        |   9 +-
 .../iglooWithFridges/system/snappyHexMeshDict |  30 +-
 .../heatExchanger/constant/air/fvOptions      |   9 +-
 .../laminar/porousBlockage/constant/fvOptions |   9 +-
 .../common/constant/porosityProperties        |   9 +-
 .../constant/porosityProperties               |   9 +-
 .../simpleFoam/simpleCar/system/fvOptions     |  11 +-
 .../filter/constant/fvOptions                 |   9 +-
 .../mesh/parallel/filter/system/fvOptions     |   9 +-
 .../RAS/angledDuct/constant/fvOptions         |   9 +-
 .../schemes/divergenceExample/README          |   2 +-
 wmake/rules/General/general                   |   2 +-
 138 files changed, 4552 insertions(+), 3014 deletions(-)
 create mode 100644 applications/test/coordinateSystem/testCase0/constant/coordinateSystems
 create mode 100644 applications/test/coordinateSystem/testCase0/system/controlDict
 create mode 100644 applications/test/coordinateSystem/testCase1/constant/coordinateSystems
 create mode 100644 applications/test/coordinateSystem/testCase1/system/controlDict
 rename applications/test/coordinateSystem/{testDict1 => testCsys1} (58%)
 create mode 100644 applications/test/coordinateSystem/testCsys2
 create mode 100644 src/meshTools/coordinate/rotation/axisAngleRotation.C
 create mode 100644 src/meshTools/coordinate/rotation/axisAngleRotation.H
 delete mode 100644 src/meshTools/coordinate/rotation/coordinateRotationNew.C
 delete mode 100644 src/meshTools/coordinate/rotation/cylindrical.C
 delete mode 100644 src/meshTools/coordinate/rotation/cylindrical.H
 create mode 100644 src/meshTools/coordinate/rotation/cylindricalRotation.C
 create mode 100644 src/meshTools/coordinate/rotation/cylindricalRotation.H
 create mode 100644 src/meshTools/coordinate/rotation/identityRotation.C
 create mode 100644 src/meshTools/coordinate/rotation/identityRotation.H
 create mode 100644 src/meshTools/coordinate/systems/coordinateSystemTemplates.C
 create mode 100644 src/meshTools/coordinate/systems/coordinateSystemTransform.C
 create mode 100644 src/meshTools/coordinate/systems/indirectCS.C
 create mode 100644 src/meshTools/coordinate/systems/indirectCS.H

diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
index 2cc60f7b9b..fa5966905b 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@@ -31,7 +31,12 @@
             coordinates.set
             (
                 i,
-                coordinateSystem::New(solidRegions[i], thermos[i])
+                coordinateSystem::New
+                (
+                    solidRegions[i],
+                    thermos[i],
+                    coordinateSystem::typeName_()
+                )
             );
 
             tmp<volVectorField> tkappaByCp =
@@ -57,7 +62,11 @@
             );
 
             aniAlphas[i].primitiveFieldRef() =
-                coordinates[i].R().transformVector(tkappaByCp());
+                coordinates[i].transformPrincipal
+                (
+                    solidRegions[i].cellCentres(),
+                    tkappaByCp()
+                );
             aniAlphas[i].correctBoundaryConditions();
 
         }
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
index 98b081952c..7790ac9659 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
@@ -15,7 +15,12 @@ if (!thermo.isotropic())
     const coordinateSystem& coodSys = coordinates[i];
 
     aniAlpha.primitiveFieldRef() =
-        coodSys.R().transformVector(tkappaByCp());
+        coodSys.transformPrincipal
+        (
+            mesh.cellCentres(),
+            tkappaByCp()
+        );
+
     aniAlpha.correctBoundaryConditions();
 
     taniAlpha = tmp<volSymmTensorField>
diff --git a/applications/test/coordinateSystem/Test-coordinateSystem.C b/applications/test/coordinateSystem/Test-coordinateSystem.C
index 3f68919a52..d8ea6c3e0e 100644
--- a/applications/test/coordinateSystem/Test-coordinateSystem.C
+++ b/applications/test/coordinateSystem/Test-coordinateSystem.C
@@ -30,12 +30,68 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "coordinateSystem.H"
+#include "Time.H"
+#include "coordinateSystems.H"
+#include "identityRotation.H"
+#include "indirectCS.H"
 #include "Fstream.H"
 #include "IOstreams.H"
+#include "transform.H"
 
 using namespace Foam;
 
+
+template<class T>
+void testTransform(const coordinateSystem& cs, const point& p, const T& val)
+{
+    Info<< "    " << pTraits<T>::typeName << ": " << val
+        << " transform: " << cs.transform(p, val)
+        << " invTransform: " << cs.invTransform(p, val) << nl;
+
+    // Info<< " both: " << cs.invTransform(p, cs.transform(p, val)) << nl;
+}
+
+
+void basicTests(const coordinateSystem& cs)
+{
+    cs.writeEntry(cs.name(), Info);
+
+    if (isA<coordSystem::indirect>(cs))
+    {
+        Info<< "indirect from:" << nl;
+        dynamicCast<const coordSystem::indirect>(cs).cs()
+            .writeEntry(cs.name(), Info);
+    }
+
+
+    Info<< "rotation: " << cs.R() << nl;
+
+    List<point> testPoints
+    ({
+        {1,0,0}, {0,1,0}, {0,0,1}, {1,1,1},
+    });
+
+
+    for (const point& p : testPoints)
+    {
+        Info<< nl
+            << "  test point: " << p
+            << " = local point " << cs.transformPoint(p)
+            << " = local coord " << cs.localPosition(p) << nl;
+
+        const vector v1(1, 1, 1);
+        const tensor t1(tensor::I);
+        const tensor t2(1, 2, 3, 4, 5, 6, 7, 8, 9);
+
+        testTransform(cs, p, v1);
+        testTransform(cs, p, t1);
+        testTransform(cs, p, t2);
+    }
+
+    Info<< nl;
+}
+
+
 void doTest(const dictionary& dict)
 {
     Info<< dict.dictName() << dict << nl;
@@ -43,18 +99,42 @@ void doTest(const dictionary& dict)
     // Could fail?
     const bool throwingIOError = FatalIOError.throwExceptions();
     const bool throwingError = FatalError.throwExceptions();
+
     try
     {
-        coordinateSystem cs1(dict.dictName(), dict);
+        auto cs1ptr = coordinateSystem::New(dict, "");
+        coordinateSystem& cs1 = *cs1ptr;
+        cs1.rename(dict.dictName());
 
-        coordinateSystem cs2;
+        basicTests(cs1);
+    }
+    catch (Foam::IOerror& err)
+    {
+        Info<< "Caught FatalIOError " << err << nl << endl;
+    }
+    catch (Foam::error& err)
+    {
+        Info<< "Caught FatalError " << err << nl << endl;
+    }
+    FatalError.throwExceptions(throwingError);
+    FatalIOError.throwExceptions(throwingIOError);
+}
 
-        // Move assign
-        cs2 = std::move(cs1);
 
-        // Info<<cs2 << nl;
-        cs2.writeDict(Info, true);
-        Info<< nl;
+void doTest(const objectRegistry& obr, const dictionary& dict)
+{
+    Info<< dict.dictName() << dict << nl;
+
+    // Could fail?
+    const bool throwingIOError = FatalIOError.throwExceptions();
+    const bool throwingError = FatalError.throwExceptions();
+
+    try
+    {
+        auto cs1ptr = coordinateSystem::New(obr, dict, word::null);
+        coordinateSystem& cs1 = *cs1ptr;
+
+        basicTests(cs1);
     }
     catch (Foam::IOerror& err)
     {
@@ -78,7 +158,40 @@ int main(int argc, char *argv[])
     argList::addArgument("dict .. dictN");
     argList args(argc, argv, false, true);
 
-    if (args.size() <= 1)
+    if (args.found("case"))
+    {
+        Info<<"using case for tests" << nl;
+
+        #include "createTime.H"
+
+        const coordinateSystems& systems = coordinateSystems::New(runTime);
+
+        Info<< systems.size() << " global systems" << nl;
+
+        for (const coordinateSystem& cs : systems)
+        {
+            basicTests(cs);
+        }
+
+        // systems.write();
+
+        for (label argi=1; argi < args.size(); ++argi)
+        {
+            const string& dictFile = args[argi];
+            IFstream is(dictFile);
+
+            dictionary inputDict(is);
+
+            forAllConstIters(inputDict, iter)
+            {
+                if (iter().isDict())
+                {
+                    doTest(runTime, iter().dict());
+                }
+            }
+        }
+    }
+    else if (args.size() <= 1)
     {
         Info<<"no coordinateSystem dictionaries to expand" << nl;
     }
diff --git a/applications/test/coordinateSystem/testCase0/constant/coordinateSystems b/applications/test/coordinateSystem/testCase0/constant/coordinateSystems
new file mode 100644
index 0000000000..514ade0ee1
--- /dev/null
+++ b/applications/test/coordinateSystem/testCase0/constant/coordinateSystems
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       IOPtrList<coordinateSystem>;       //<-- Older name
+    object      coordinateSystems;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+(
+cs1
+{
+    type    cartesian;
+    origin  (1 2 3);
+    coordinateRotation
+    {
+        type    axes;
+        e1      (0 0 1);
+        e2      (0 1 0);
+    }
+}
+
+)
+
+// ************************************************************************* //
diff --git a/applications/test/coordinateSystem/testCase0/system/controlDict b/applications/test/coordinateSystem/testCase0/system/controlDict
new file mode 100644
index 0000000000..4173430aa1
--- /dev/null
+++ b/applications/test/coordinateSystem/testCase0/system/controlDict
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     simpleFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         4;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   100;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/applications/test/coordinateSystem/testCase1/constant/coordinateSystems b/applications/test/coordinateSystem/testCase1/constant/coordinateSystems
new file mode 100644
index 0000000000..7facad08d3
--- /dev/null
+++ b/applications/test/coordinateSystem/testCase1/constant/coordinateSystems
@@ -0,0 +1,86 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+//OLD  class       IOPtrList<coordinateSystem>;
+    class       coordinateSystems;
+    object      coordinateSystems;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+(
+cs1
+{
+    type    cartesian;
+    origin  (1 2 3);
+    rotation
+    {
+        type    axes;
+        e1      (0 0 1);
+        e2      (0 1 0);
+    }
+}
+
+cs2
+{
+    type    cartesian;
+    origin  (0 3 5);
+    e1      (1 2 0);
+    e2      (2 0 2);
+}
+
+cs3
+{
+    type    cartesian;
+    origin  (0 3 5);
+    coordinateRotation  // older name
+    {
+        type    euler;
+        angles  (90 0 0);
+    }
+}
+
+cs4
+{
+    type    cylindrical;
+    origin  (0 3 5);
+    rotation
+    {
+        type    euler;
+        angles  (90 0 0);
+    }
+}
+
+cyl
+{
+    type    cylindrical;
+    origin  (0 0 0);
+    degrees false;
+
+    rotation
+    {
+        type    axisAngle;
+        axis    (0 0 1);
+        angle   90;
+    }
+}
+
+ident
+{
+    origin  (0 0 0);
+    rotation
+    {
+        type    none;
+    }
+}
+
+)
+
+// ************************************************************************* //
diff --git a/applications/test/coordinateSystem/testCase1/system/controlDict b/applications/test/coordinateSystem/testCase1/system/controlDict
new file mode 100644
index 0000000000..4173430aa1
--- /dev/null
+++ b/applications/test/coordinateSystem/testCase1/system/controlDict
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     simpleFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         4;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   100;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable true;
+
+
+// ************************************************************************* //
diff --git a/applications/test/coordinateSystem/testDict1 b/applications/test/coordinateSystem/testCsys1
similarity index 58%
rename from applications/test/coordinateSystem/testDict1
rename to applications/test/coordinateSystem/testCsys1
index 2fa9cdb21b..320fb21b7a 100644
--- a/applications/test/coordinateSystem/testDict1
+++ b/applications/test/coordinateSystem/testCsys1
@@ -10,12 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      testDict;
+    object      testCsys1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // Rotate 90 deg around x: y -> z, z -> -y
 
+rot_x90
+{
+    origin  (0 0 0);
+    e1      (1 0 0);
+    e3      (0 -1 0);
+}
+
 rot_x90_axesRotation
 {
     origin  (0 0 0);
@@ -27,13 +34,24 @@ rot_x90_axesRotation
     }
 }
 
+rot_x90_axisAngle
+{
+    origin  (0 0 0);
+    coordinateRotation
+    {
+        type    axisAngle;
+        axis    (1 0 0);        // non-unit also OK
+        angle   90;
+    }
+}
+
 rot_x90_euler
 {
     origin  (0 0 0);
     coordinateRotation
     {
-        type    EulerRotation;
-        rotation (0 90 0);      // z-x'-z''
+        type    euler;
+        angles  (0 90 0);      // z-x'-z''
     }
 }
 
@@ -51,18 +69,40 @@ rot_z45_axesRotation
     }
 }
 
+rot_z45_axisAngle
+{
+    origin  (0 0 0);
+    coordinateRotation
+    {
+        type    axisAngle;
+        axis    (0 0 10);       // non-unit also OK
+        angle   45;
+    }
+}
+
 rot_z45_euler
 {
     origin  (0 0 0);
     coordinateRotation
     {
-        type    EulerRotation;
-        rotation (45 0 0);      // z-x'-z''
+        type    euler;
+        angles  (45 0 0);      // z-x'-z''
+    }
+}
+
+rot_z45_starcd
+{
+    origin  (0 0 0);
+    coordinateRotation
+    {
+        type    starcd;
+        angles  (45 0 0);      // z-x'-y''
     }
 }
 
 
 // Rotate -45 deg around z: x -> (1 -1 0), y = (1 1 0)
+
 rot_zm45_axesRotation
 {
     origin  (0 0 0);
@@ -74,13 +114,24 @@ rot_zm45_axesRotation
     }
 }
 
+rot_zm45_axisAngle
+{
+    origin  (0 0 0);
+    coordinateRotation
+    {
+        type    axisAngle;
+        axis    (0 0 10);       // non-unit also OK
+        angle   -45;
+    }
+}
+
 rot_zm45_euler
 {
     origin  (0 0 0);
     coordinateRotation
     {
-        type    EulerRotation;
-        rotation (-45 0 0);      // z-x'-z''
+        type    euler;
+        angles  (-45 0 0);      // z-x'-z''
     }
 }
 
@@ -98,13 +149,35 @@ null_axesRotation
     }
 }
 
+null_axisAngle0
+{
+    origin  (0 0 0);
+    coordinateRotation
+    {
+        type    axisAngle;
+        axis    (0 0 0);       // non-unit also OK
+        angle   0;
+    }
+}
+
+null_axisAngle1
+{
+    origin  (0 0 0);
+    coordinateRotation
+    {
+        type    axisAngle;
+        axis    (1 1 1);       // non-unit also OK
+        angle   0;
+    }
+}
+
 null_euler
 {
     origin  (0 0 0);
     coordinateRotation
     {
-        type    EulerRotation;
-        rotation (0 0 0);      // z-x'-z''
+        type    euler;
+        angles  (0 0 0);      // z-x'-z''
     }
 }
 
diff --git a/applications/test/coordinateSystem/testCsys2 b/applications/test/coordinateSystem/testCsys2
new file mode 100644
index 0000000000..13caeacd5a
--- /dev/null
+++ b/applications/test/coordinateSystem/testCsys2
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testCsys1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// This dictionary only works in combination with constant/coordinateSystems
+
+mycs1
+{
+    type   indirect;
+    name   cs1;
+}
+
+mycs2
+{
+    type   indirect;
+    name   cs2;
+}
+
+mycs3
+{
+    type   indirect;
+    name   cs3;
+}
+
+mycyl
+{
+    type   indirect;
+    name   cyl;
+}
+
+
+mycy2
+{
+    coordinateSystem
+    {
+        type   indirect;
+        name   cyl;
+    }
+}
+
+mycy3
+{
+    coordinateSystem cyl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianXY b/etc/caseDicts/general/coordinateSystem/cartesianXY
index 2fe0d38a5e..ffea8c2b9c 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianXY
+++ b/etc/caseDicts/general/coordinateSystem/cartesianXY
@@ -15,10 +15,12 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type      cartesian;
+
 origin    (0 0 0);
-coordinateRotation
+
+rotation
 {
-    type  axesRotation;
+    type  axes;
     e1    $x;
     e2    $y;
 }
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianXZ b/etc/caseDicts/general/coordinateSystem/cartesianXZ
index 4915e791bd..dc26fd49fc 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianXZ
+++ b/etc/caseDicts/general/coordinateSystem/cartesianXZ
@@ -15,10 +15,12 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type      cartesian;
+
 origin    (0 0 0);
-coordinateRotation
+
+rotation
 {
-    type  axesRotation;
+    type  axes;
     e1    $x;
     e3    $z;
 }
diff --git a/etc/caseDicts/general/coordinateSystem/cartesianYZ b/etc/caseDicts/general/coordinateSystem/cartesianYZ
index 0452b239c1..b531dcf4d6 100644
--- a/etc/caseDicts/general/coordinateSystem/cartesianYZ
+++ b/etc/caseDicts/general/coordinateSystem/cartesianYZ
@@ -15,12 +15,14 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 type      cartesian;
+
 origin    (0 0 0);
-coordinateRotation
+
+rotation
 {
-    type  axesRotation;
+    type  axes;
     e2    $y;
-    e3    $z
+    e3    $z;
 }
 
 //************************************************************************* //
diff --git a/etc/caseDicts/general/coordinateSystem/cylindrical b/etc/caseDicts/general/coordinateSystem/cylindrical
index 332e0f4a8f..1f20c75654 100644
--- a/etc/caseDicts/general/coordinateSystem/cylindrical
+++ b/etc/caseDicts/general/coordinateSystem/cylindrical
@@ -14,8 +14,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-type      cartesian;
-coordinateRotation
+type      cylindrical;
+
+rotation
 {
     type  cylindrical;
     e3    $axis;
diff --git a/etc/controlDict b/etc/controlDict
index 918ac112ca..950e5adc2b 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -208,7 +208,6 @@ DebugSwitches
     Ergun               0;
     Euler               0;
     EulerImplicit       0;
-    EulerRotation       0;
     extendedCellToFaceStencil 0;
     FDIC                0;
     FaceCellWave        0;
@@ -239,7 +238,6 @@ DebugSwitches
     IFstream            0;
     IOMap<dictionary>   0;
     IOPtrList<MRFZone>  0;
-    IOPtrList<coordinateSystem> 0;
     IOPtrList<injector> 0;
     IOPtrList<porousZone>   0;
     IOobject            0;
@@ -336,7 +334,6 @@ DebugSwitches
     SLTS                0;
     SRFModel            0;
     SRFVelocity         0;
-    STARCDRotation      0;
     Schaeffer           0;
     SchillerNaumann     0;
     SinclairJackson     0;
@@ -456,9 +453,7 @@ DebugSwitches
     constantAbsorptionEmission  0;
     constantAlphaContactAngle   0;
     constantScatter     0;
-    coordinateRotation  0;
     coordinateSystem    0;
-    coordinateSystems   0;
     corrected           0;
     coupled             0;
     cubeRootVol         0;
@@ -478,9 +473,9 @@ DebugSwitches
     diagonal            0;
     dictionary          0;
     dimensionSet        1;
-    mappedBase    0;
-    mappedPatch   0;
-    mappedVelocityFlux 0;
+    mappedBase          0;
+    mappedPatch         0;
+    mappedVelocityFlux  0;
     directionMixed      0;
     directional         0;
     disallowGenericFvPatchField 0;
@@ -745,7 +740,6 @@ DebugSwitches
     outletInlet         0;
     outletStabilised    0;
     pair                0;
-    parabolicCylindrical 0;
     parcel              0;
     partialSlip         0;
     passiveParticle     0;
@@ -1101,5 +1095,4 @@ DimensionSets
 }
 
 
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index d39f8b10e1..d3d635391d 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -242,11 +242,6 @@ public:
         //- Inner-product of this with another Tensor.
         inline Tensor<Cmpt> inner(const Tensor<Cmpt>& t2) const;
 
-        //- Inner-product of this with transpose of another Tensor.
-        //  Primarily useful for coordinate transformations
-        //  (where transpose is the same as the inverse).
-        inline Tensor<Cmpt> innerT(const Tensor<Cmpt>& t2) const;
-
         //- Schur-product of this with another Tensor.
         inline Tensor<Cmpt> schur(const Tensor<Cmpt>& t2) const;
 
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 933b39a5c2..78c59a0c37 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -504,29 +504,6 @@ Foam::Tensor<Cmpt>::inner(const Tensor<Cmpt>& t2) const
 }
 
 
-template<class Cmpt>
-inline Foam::Tensor<Cmpt>
-Foam::Tensor<Cmpt>::innerT(const Tensor<Cmpt>& t2) const
-{
-    const Tensor<Cmpt>& t1 = *this;
-
-    return Tensor<Cmpt>
-    (
-        t1.xx()*t2.xx() + t1.xy()*t2.xy() + t1.xz()*t2.xz(),
-        t1.xx()*t2.yx() + t1.xy()*t2.yy() + t1.xz()*t2.yz(),
-        t1.xx()*t2.zx() + t1.xy()*t2.zy() + t1.xz()*t2.zz(),
-
-        t1.yx()*t2.xx() + t1.yy()*t2.xy() + t1.yz()*t2.xz(),
-        t1.yx()*t2.yx() + t1.yy()*t2.yy() + t1.yz()*t2.yz(),
-        t1.yx()*t2.zx() + t1.yy()*t2.zy() + t1.yz()*t2.zz(),
-
-        t1.zx()*t2.xx() + t1.zy()*t2.xy() + t1.zz()*t2.xz(),
-        t1.zx()*t2.yx() + t1.zy()*t2.yy() + t1.zz()*t2.yz(),
-        t1.zx()*t2.zx() + t1.zy()*t2.zy() + t1.zz()*t2.zz()
-    );
-}
-
-
 template<class Cmpt>
 inline Foam::Tensor<Cmpt>
 Foam::Tensor<Cmpt>::schur(const Tensor<Cmpt>& t2) const
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index 38de0da433..8de4754acb 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -156,11 +156,6 @@ public:
         //- Inner-product of this with another Tensor2D.
         inline Tensor2D<Cmpt> inner(const Tensor2D<Cmpt>& t2) const;
 
-        //- Inner-product of this with transpose of another Tensor2D.
-        //  Primarily useful for coordinate transformations
-        //  (where transpose is the same as the inverse).
-        inline Tensor2D<Cmpt> innerT(const Tensor2D<Cmpt>& t2) const;
-
         //- Schur-product of this with another Tensor2D.
         inline Tensor2D<Cmpt> schur(const Tensor2D<Cmpt>& t2) const;
 
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
index 147155035f..fd253dd7ac 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
@@ -202,23 +202,6 @@ Foam::Tensor2D<Cmpt>::inner(const Tensor2D<Cmpt>& t2) const
 }
 
 
-template<class Cmpt>
-inline Foam::Tensor2D<Cmpt>
-Foam::Tensor2D<Cmpt>::innerT(const Tensor2D<Cmpt>& t2) const
-{
-    const Tensor2D<Cmpt>& t1 = *this;
-
-    return Tensor2D<Cmpt>
-    (
-        t1.xx()*t2.xx() + t1.xy()*t2.xy(),
-        t1.xx()*t2.yx() + t1.xy()*t2.yy(),
-
-        t1.yx()*t2.xx() + t1.yy()*t2.xy(),
-        t1.yx()*t2.yx() + t1.yy()*t2.yy()
-    );
-}
-
-
 template<class Cmpt>
 inline Foam::Tensor2D<Cmpt>
 Foam::Tensor2D<Cmpt>::schur(const Tensor2D<Cmpt>& t2) const
diff --git a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H
index 858ab1fd91..955fa72d7e 100644
--- a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H
+++ b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.H
@@ -43,7 +43,7 @@ Description
         U_f | frictional velocity
         K   | Von Karman's constant
         z_0 | surface roughness length
-        z   | vertical co-ordinate
+        z   | vertical coordinate
     \endvartable
 
 Usage
diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C
index 68deece254..b6a4db66e5 100644
--- a/src/dynamicMesh/meshCut/directions/directions.C
+++ b/src/dynamicMesh/meshCut/directions/directions.C
@@ -276,7 +276,7 @@ Foam::directions::directions
     List<vectorField>(wordList(dict.lookup("directions")).size())
 {
     const wordList wantedDirs(dict.lookup("directions"));
-    const word coordSystem(dict.lookup("coordinateSystem"));
+    const word coordSystem(dict.get<word>("coordinateSystem"));
 
     bool wantNormal = false;
     bool wantTan1 = false;
diff --git a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
index 1a204d67a5..8af0c320c1 100644
--- a/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/displacement/points0/points0MotionSolver.C
@@ -230,8 +230,8 @@ void Foam::points0MotionSolver::updateMesh(const mapPolyMesh& mpm)
         else
         {
             FatalErrorInFunction
-                << "Cannot determine co-ordinates of introduced vertices."
-                << " New vertex " << pointi << " at co-ordinate "
+                << "Cannot determine coordinates of introduced vertices."
+                << " New vertex " << pointi << " at coordinate "
                 << points[pointi] << exit(FatalError);
         }
     }
diff --git a/src/engine/enginePiston/enginePiston.C b/src/engine/enginePiston/enginePiston.C
index 68be48ec08..3314e566a5 100644
--- a/src/engine/enginePiston/enginePiston.C
+++ b/src/engine/enginePiston/enginePiston.C
@@ -30,7 +30,6 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::enginePiston::enginePiston
 (
     const polyMesh& mesh,
@@ -43,13 +42,12 @@ Foam::enginePiston::enginePiston
     mesh_(mesh),
     engineDB_(refCast<const engineTime>(mesh.time())),
     patchID_(pistonPatchName, mesh.boundaryMesh()),
-    csPtr_(pistonCS),
+    csysPtr_(pistonCS),
     minLayer_(minLayer),
     maxLayer_(maxLayer)
 {}
 
 
-// Construct from dictionary
 Foam::enginePiston::enginePiston
 (
     const polyMesh& mesh,
@@ -59,22 +57,15 @@ Foam::enginePiston::enginePiston
     mesh_(mesh),
     engineDB_(refCast<const engineTime>(mesh_.time())),
     patchID_(dict.lookup("patch"), mesh.boundaryMesh()),
-    csPtr_
+    csysPtr_
     (
-        coordinateSystem::New
-        (
-            mesh_,
-            dict.subDict("coordinateSystem")
-        )
+        coordinateSystem::New(mesh_, dict, coordinateSystem::typeName_())
     ),
-    minLayer_(readScalar(dict.lookup("minLayer"))),
-    maxLayer_(readScalar(dict.lookup("maxLayer")))
+    minLayer_(dict.get<scalar>("minLayer")),
+    maxLayer_(dict.get<scalar>("maxLayer"))
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::enginePiston::writeDict(Ostream& os) const
diff --git a/src/engine/enginePiston/enginePiston.H b/src/engine/enginePiston/enginePiston.H
index 03c2291216..470b437411 100644
--- a/src/engine/enginePiston/enginePiston.H
+++ b/src/engine/enginePiston/enginePiston.H
@@ -65,7 +65,7 @@ class enginePiston
         polyPatchID patchID_;
 
         //- Coordinate system
-        autoPtr<coordinateSystem> csPtr_;
+        autoPtr<coordinateSystem> csysPtr_;
 
 
         // Piston layering data
@@ -112,7 +112,8 @@ public:
         );
 
 
-    // Destructor - default
+    //- Destructor
+    ~enginePiston() = default;
 
 
     // Member Functions
@@ -120,7 +121,7 @@ public:
         //- Return coordinate system
         const coordinateSystem& cs() const
         {
-            return *csPtr_;
+            return *csysPtr_;
         }
 
         //- Return ID of piston patch
diff --git a/src/engine/engineValve/engineValve.C b/src/engine/engineValve/engineValve.C
index 0be19c39f2..28b8572ab5 100644
--- a/src/engine/engineValve/engineValve.C
+++ b/src/engine/engineValve/engineValve.C
@@ -63,7 +63,6 @@ Foam::scalar Foam::engineValve::adjustCrankAngle(const scalar theta) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::engineValve::engineValve
 (
     const word& name,
@@ -89,7 +88,7 @@ Foam::engineValve::engineValve
     name_(name),
     mesh_(mesh),
     engineDB_(refCast<const engineTime>(mesh.time())),
-    csPtr_(valveCS),
+    csysPtr_(valveCS.clone()),
     bottomPatch_(bottomPatchName, mesh.boundaryMesh()),
     poppetPatch_(poppetPatchName, mesh.boundaryMesh()),
     stemPatch_(stemPatchName, mesh.boundaryMesh()),
@@ -110,7 +109,6 @@ Foam::engineValve::engineValve
 {}
 
 
-// Construct from dictionary
 Foam::engineValve::engineValve
 (
     const word& name,
@@ -121,13 +119,9 @@ Foam::engineValve::engineValve
     name_(name),
     mesh_(mesh),
     engineDB_(refCast<const engineTime>(mesh_.time())),
-    csPtr_
+    csysPtr_
     (
-        coordinateSystem::New
-        (
-            mesh_,
-            dict.subDict("coordinateSystem")
-        )
+        coordinateSystem::New(mesh_, dict, coordinateSystem::typeName_())
     ),
     bottomPatch_(dict.lookup("bottomPatch"), mesh.boundaryMesh()),
     poppetPatch_(dict.lookup("poppetPatch"), mesh.boundaryMesh()),
@@ -156,18 +150,15 @@ Foam::engineValve::engineValve
     liftProfile_("theta", "lift", name_, dict.lookup("liftProfile")),
     liftProfileStart_(min(liftProfile_.x())),
     liftProfileEnd_(max(liftProfile_.x())),
-    minLift_(readScalar(dict.lookup("minLift"))),
-    minTopLayer_(readScalar(dict.lookup("minTopLayer"))),
-    maxTopLayer_(readScalar(dict.lookup("maxTopLayer"))),
-    minBottomLayer_(readScalar(dict.lookup("minBottomLayer"))),
-    maxBottomLayer_(readScalar(dict.lookup("maxBottomLayer"))),
-    diameter_(readScalar(dict.lookup("diameter")))
+    minLift_(dict.get<scalar>("minLift")),
+    minTopLayer_(dict.get<scalar>("minTopLayer")),
+    maxTopLayer_(dict.get<scalar>("maxTopLayer")),
+    minBottomLayer_(dict.get<scalar>("minBottomLayer")),
+    maxBottomLayer_(dict.get<scalar>("maxBottomLayer")),
+    diameter_(dict.get<scalar>("diameter"))
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::scalar Foam::engineValve::lift(const scalar theta) const
@@ -238,7 +229,7 @@ void Foam::engineValve::writeDict(Ostream& os) const
 {
     os  << nl << name() << nl << token::BEGIN_BLOCK;
 
-    cs().writeDict(os);
+    cs().writeEntry(coordinateSystem::typeName_(), os);
 
     os  << "bottomPatch " << bottomPatch_.name() << token::END_STATEMENT << nl
         << "poppetPatch " << poppetPatch_.name() << token::END_STATEMENT << nl
diff --git a/src/engine/engineValve/engineValve.H b/src/engine/engineValve/engineValve.H
index e34b88f65f..9121ae45ea 100644
--- a/src/engine/engineValve/engineValve.H
+++ b/src/engine/engineValve/engineValve.H
@@ -45,7 +45,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward declarations
 class polyMesh;
 class engineTime;
 
@@ -67,7 +67,7 @@ class engineValve
         const engineTime& engineDB_;
 
         //- Coordinate system
-        autoPtr<coordinateSystem> csPtr_;
+        autoPtr<coordinateSystem> csysPtr_;
 
 
         // Patch and zone names
@@ -145,9 +145,6 @@ class engineValve
 
 public:
 
-    // Static data members
-
-
     // Constructors
 
         //- Construct from components
@@ -171,7 +168,6 @@ public:
             const scalar minBottomLayer,
             const scalar maxBottomLayer,
             const scalar diameter
-
         );
 
         //- Construct from dictionary
@@ -183,7 +179,8 @@ public:
         );
 
 
-    // Destructor - default
+    //- Destructor
+    ~engineValve() = default;
 
 
     // Member Functions
@@ -197,7 +194,7 @@ public:
         //- Return coordinate system
         const coordinateSystem& cs() const
         {
-            return *csPtr_;
+            return *csysPtr_;
         }
 
         //- Return lift profile
@@ -308,7 +305,7 @@ public:
 
 
         //- Write dictionary
-        void writeDict(Ostream&) const;
+        void writeDict(Ostream& os) const;
 };
 
 
diff --git a/src/finiteArea/faMesh/faMeshDemandDrivenData.C b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
index e4050c7610..a2c0dc14be 100644
--- a/src/finiteArea/faMesh/faMeshDemandDrivenData.C
+++ b/src/finiteArea/faMesh/faMeshDemandDrivenData.C
@@ -34,7 +34,7 @@ License
 #include "processorFaPatch.H"
 #include "wedgeFaPatch.H"
 #include "PstreamCombineReduceOps.H"
-#include "coordinateSystem.H"
+#include "cartesianCS.H"
 #include "scalarMatrices.H"
 #include "processorFaPatchFields.H"
 #include "emptyFaPatchFields.H"
@@ -1271,7 +1271,7 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit() const
             curPoints = pointSet.toc();
         }
 
-        vectorField allPoints(curPoints.size());
+        pointField allPoints(curPoints.size());
         scalarField W(curPoints.size(), 1.0);
         for (label i=0; i<curPoints.size(); ++i)
         {
@@ -1280,17 +1280,16 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit() const
         }
 
         // Transform points
-        const vector& origin = points[curPoint];
-        const vector axis = normalised(result[curPoint]);
-        vector dir(allPoints[0] - points[curPoint]);
-        dir -= axis*(axis&dir);
-        dir.normalise();
+        coordSystem::cartesian cs
+        (
+            points[curPoint],   // origin
+            result[curPoint],   // axis [e3] (normalized by constructor)
+            allPoints[0] - points[curPoint] // direction [e1]
+        );
 
-        coordinateSystem cs("cs", origin, axis, dir);
-
-        forAll(allPoints, pI)
+        for (point& p : allPoints)
         {
-            allPoints[pI] = cs.localPosition(allPoints[pI]);
+            p = cs.localPosition(p);
         }
 
         scalarRectangularMatrix M
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
index 35a9a246d1..86a76d6625 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,7 @@ License
 #include "DarcyForchheimer.H"
 #include "geometricOneField.H"
 #include "fvMatrices.H"
+#include "pointIndList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -67,69 +68,50 @@ Foam::porosityModels::DarcyForchheimer::DarcyForchheimer
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::porosityModels::DarcyForchheimer::~DarcyForchheimer()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
 {
-    if (coordSys_.R().uniform())
+    // The Darcy coefficient as a tensor
+    tensor darcyCoeff(Zero);
+    darcyCoeff.xx() = dXYZ_.value().x();
+    darcyCoeff.yy() = dXYZ_.value().y();
+    darcyCoeff.zz() = dXYZ_.value().z();
+
+    // The Forchheimer coefficient as a tensor
+    // - the leading 0.5 is from 1/2*rho
+    tensor forchCoeff(Zero);
+    forchCoeff.xx() = 0.5*fXYZ_.value().x();
+    forchCoeff.yy() = 0.5*fXYZ_.value().y();
+    forchCoeff.zz() = 0.5*fXYZ_.value().z();
+
+    if (csys().uniform())
     {
-        forAll(cellZoneIDs_, zoneI)
+        forAll(cellZoneIDs_, zonei)
         {
-            D_[zoneI].setSize(1);
-            F_[zoneI].setSize(1);
+            D_[zonei].resize(1);
+            F_[zonei].resize(1);
 
-            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();
-
-            D_[zoneI][0] = coordSys_.R().transformTensor(D_[zoneI][0]);
-
-            // leading 0.5 is from 1/2*rho
-            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();
-
-            F_[zoneI][0] = coordSys_.R().transformTensor(F_[zoneI][0]);
+            D_[zonei] = csys().transform(darcyCoeff);
+            F_[zonei] = csys().transform(forchCoeff);
         }
     }
     else
     {
-        forAll(cellZoneIDs_, zoneI)
+        forAll(cellZoneIDs_, zonei)
         {
-            const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+            const pointUIndList cc
+            (
+                mesh_.cellCentres(),
+                mesh_.cellZones()[cellZoneIDs_[zonei]]
+            );
 
-            D_[zoneI].setSize(cells.size());
-            F_[zoneI].setSize(cells.size());
-
-            forAll(cells, i)
-            {
-                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] = 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();
-            }
-
-            const coordinateRotation& R = coordSys_.R(mesh_, cells);
-
-            D_[zoneI] = R.transformTensor(D_[zoneI], cells);
-            F_[zoneI] = R.transformTensor(F_[zoneI], cells);
+            D_[zonei] = csys().transform(cc, darcyCoeff);
+            F_[zonei] = csys().transform(cc, forchCoeff);
         }
     }
 
+
     if (debug && mesh_.time().writeTime())
     {
         volTensorField Dout
@@ -159,8 +141,22 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData()
             dimensionedTensor(fXYZ_.dimensions(), Zero)
         );
 
-        UIndirectList<tensor>(Dout, mesh_.cellZones()[cellZoneIDs_[0]]) = D_[0];
-        UIndirectList<tensor>(Fout, mesh_.cellZones()[cellZoneIDs_[0]]) = F_[0];
+
+        forAll(cellZoneIDs_, zonei)
+        {
+            const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zonei]];
+
+            if (csys().uniform())
+            {
+                UIndirectList<tensor>(Dout, cells) = D_[zonei].first();
+                UIndirectList<tensor>(Fout, cells) = F_[zonei].first();
+            }
+            else
+            {
+                UIndirectList<tensor>(Dout, cells) = D_[zonei];
+                UIndirectList<tensor>(Fout, cells) = F_[zonei];
+            }
+        }
 
         Dout.write();
         Fout.write();
@@ -176,7 +172,7 @@ void Foam::porosityModels::DarcyForchheimer::calcForce
     vectorField& force
 ) const
 {
-    scalarField Udiag(U.size(), 0.0);
+    scalarField Udiag(U.size(), Zero);
     vectorField Usource(U.size(), Zero);
     const scalarField& V = mesh_.V();
 
@@ -202,19 +198,17 @@ void Foam::porosityModels::DarcyForchheimer::correct
 
     if (UEqn.dimensions() == dimForce)
     {
-        const volScalarField& rho = mesh_.lookupObject<volScalarField>(rhoName);
+        const auto& rho = mesh_.lookupObject<volScalarField>(rhoName);
 
         if (mesh_.foundObject<volScalarField>(muName))
         {
-            const volScalarField& mu =
-                mesh_.lookupObject<volScalarField>(muName);
+            const auto& mu = mesh_.lookupObject<volScalarField>(muName);
 
             apply(Udiag, Usource, V, rho, mu, U);
         }
         else
         {
-            const volScalarField& nu =
-                mesh_.lookupObject<volScalarField>(nuName);
+            const auto& nu = mesh_.lookupObject<volScalarField>(nuName);
 
             apply(Udiag, Usource, V, rho, rho*nu, U);
         }
@@ -223,17 +217,14 @@ void Foam::porosityModels::DarcyForchheimer::correct
     {
         if (mesh_.foundObject<volScalarField>(nuName))
         {
-            const volScalarField& nu =
-                mesh_.lookupObject<volScalarField>(nuName);
+            const auto& nu = mesh_.lookupObject<volScalarField>(nuName);
 
             apply(Udiag, Usource, V, geometricOneField(), nu, U);
         }
         else
         {
-            const volScalarField& rho =
-                mesh_.lookupObject<volScalarField>(rhoName);
-            const volScalarField& mu =
-                mesh_.lookupObject<volScalarField>(muName);
+            const auto& rho = mesh_.lookupObject<volScalarField>(rhoName);
+            const auto& mu = mesh_.lookupObject<volScalarField>(muName);
 
             apply(Udiag, Usource, V, geometricOneField(), mu/rho, U);
         }
@@ -271,8 +262,8 @@ void Foam::porosityModels::DarcyForchheimer::correct
 
     if (UEqn.dimensions() == dimForce)
     {
-        const volScalarField& rho = mesh_.lookupObject<volScalarField>(rhoName);
-        const volScalarField& mu = mesh_.lookupObject<volScalarField>(muName);
+        const auto& rho = mesh_.lookupObject<volScalarField>(rhoName);
+        const auto& mu = mesh_.lookupObject<volScalarField>(muName);
 
         apply(AU, rho, mu, U);
     }
@@ -280,17 +271,14 @@ void Foam::porosityModels::DarcyForchheimer::correct
     {
         if (mesh_.foundObject<volScalarField>(nuName))
         {
-            const volScalarField& nu =
-                mesh_.lookupObject<volScalarField>(nuName);
+            const auto& nu = mesh_.lookupObject<volScalarField>(nuName);
 
             apply(AU, geometricOneField(), nu, U);
         }
         else
         {
-            const volScalarField& rho =
-                mesh_.lookupObject<volScalarField>(rhoName);
-            const volScalarField& mu =
-                mesh_.lookupObject<volScalarField>(muName);
+            const auto& rho = mesh_.lookupObject<volScalarField>(rhoName);
+            const auto& mu = mesh_.lookupObject<volScalarField>(muName);
 
             apply(AU, geometricOneField(), mu/rho, U);
         }
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
index 96bcd160c6..038d951098 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.H
@@ -41,7 +41,7 @@ Description
     to specify a multiplier (of the max component).
 
     The orientation of the porous region is defined with the same notation as
-    a co-ordinate system, but only a Cartesian co-ordinate system is valid.
+    a coordinate system, but only a Cartesian coordinate system is valid.
 
 SourceFiles
     DarcyForchheimer.C
@@ -141,7 +141,7 @@ public:
     );
 
     //- Destructor
-    virtual ~DarcyForchheimer();
+    virtual ~DarcyForchheimer() = default;
 
 
     // Member Functions
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
index b94fbde938..bdea960dfe 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "fixedCoeff.H"
 #include "fvMatrices.H"
+#include "pointIndList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -78,7 +79,6 @@ void Foam::porosityModels::fixedCoeff::apply
     const scalar rho
 ) const
 {
-
     forAll(cellZoneIDs_, zoneI)
     {
         const tensorField& alphaZones = alpha_[zoneI];
@@ -123,62 +123,45 @@ Foam::porosityModels::fixedCoeff::fixedCoeff
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::porosityModels::fixedCoeff::~fixedCoeff()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::porosityModels::fixedCoeff::calcTransformModelData()
 {
-    if (coordSys_.R().uniform())
+    // The alpha coefficient as a tensor
+    tensor alphaCoeff(Zero);
+    alphaCoeff.xx() = alphaXYZ_.value().x();
+    alphaCoeff.yy() = alphaXYZ_.value().y();
+    alphaCoeff.zz() = alphaXYZ_.value().z();
+
+    // The beta coefficient as a tensor
+    tensor betaCoeff(Zero);
+    betaCoeff.xx() = betaXYZ_.value().x();
+    betaCoeff.yy() = betaXYZ_.value().y();
+    betaCoeff.zz() = betaXYZ_.value().z();
+
+    if (csys().uniform())
     {
-        forAll(cellZoneIDs_, zoneI)
+        forAll(cellZoneIDs_, zonei)
         {
-            alpha_[zoneI].setSize(1);
-            beta_[zoneI].setSize(1);
+            alpha_[zonei].resize(1);
+            beta_[zonei].resize(1);
 
-            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] = Zero;
-            beta_[zoneI][0].xx() = betaXYZ_.value().x();
-            beta_[zoneI][0].yy() = betaXYZ_.value().y();
-            beta_[zoneI][0].zz() = betaXYZ_.value().z();
-            beta_[zoneI][0] = coordSys_.R().transformTensor(beta_[zoneI][0]);
+            alpha_[zonei] = csys().transform(alphaCoeff);
+            beta_[zonei] = csys().transform(betaCoeff);
         }
     }
     else
     {
-        forAll(cellZoneIDs_, zoneI)
+        forAll(cellZoneIDs_, zonei)
         {
-            const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+            const pointUIndList cc
+            (
+                mesh_.cellCentres(),
+                mesh_.cellZones()[cellZoneIDs_[zonei]]
+            );
 
-            alpha_[zoneI].setSize(cells.size());
-            beta_[zoneI].setSize(cells.size());
-
-            forAll(cells, i)
-            {
-                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] = Zero;
-                beta_[zoneI][i].xx() = betaXYZ_.value().x();
-                beta_[zoneI][i].yy() = betaXYZ_.value().y();
-                beta_[zoneI][i].zz() = betaXYZ_.value().z();
-            }
-
-            const coordinateRotation& R = coordSys_.R(mesh_, cells);
-
-            alpha_[zoneI] = R.transformTensor(alpha_[zoneI], cells);
-            beta_[zoneI] = R.transformTensor(beta_[zoneI], cells);
+            alpha_[zonei] = csys().transform(cc, alphaCoeff);
+            beta_[zonei] = csys().transform(cc, betaCoeff);
         }
     }
 }
@@ -195,7 +178,7 @@ void Foam::porosityModels::fixedCoeff::calcForce
     scalarField Udiag(U.size(), 0.0);
     vectorField Usource(U.size(), Zero);
     const scalarField& V = mesh_.V();
-    scalar rhoRef = readScalar(coeffs_.lookup("rhoRef"));
+    const scalar rhoRef = coeffs_.get<scalar>("rhoRef");
 
     apply(Udiag, Usource, V, U, rhoRef);
 
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
index af67f523d4..1090eb5c8e 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/fixedCoeff/fixedCoeff.H
@@ -118,7 +118,7 @@ public:
     );
 
     //- Destructor
-    virtual ~fixedCoeff();
+    virtual ~fixedCoeff() = default;
 
 
     // Member Functions
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.C
index 0ed573c356..f6cab47ee1 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.C
@@ -48,15 +48,15 @@ Foam::IOobject Foam::IOporosityModelList::createIOobject
         Info<< "Creating porosity model list from " << io.name() << nl << endl;
 
         io.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
-        return io;
     }
     else
     {
         Info<< "No porosity models present" << nl << endl;
 
         io.readOpt() = IOobject::NO_READ;
-        return io;
     }
+
+    return io;
 }
 
 
@@ -79,10 +79,8 @@ bool Foam::IOporosityModelList::read()
         porosityModelList::read(*this);
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.H
index 62502570d1..8509897429 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/IOporosityModelList.H
@@ -71,12 +71,11 @@ public:
     // Constructors
 
         //- Construct from mesh
-        IOporosityModelList(const fvMesh& mesh);
+        explicit IOporosityModelList(const fvMesh& mesh);
 
 
         //- Destructor
-        virtual ~IOporosityModelList()
-        {}
+        virtual ~IOporosityModelList() = default;
 
 
     // Member Functions
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
index 19f9bbb3d4..781d53daa3 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.C
@@ -61,17 +61,6 @@ void Foam::porosityModel::adjustNegativeResistance(dimensionedVector& resist)
 }
 
 
-Foam::label Foam::porosityModel::fieldIndex(const label i) const
-{
-    label index = 0;
-    if (!coordSys_.R().uniform())
-    {
-        index = i;
-    }
-    return index;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::porosityModel::porosityModel
@@ -101,7 +90,10 @@ Foam::porosityModel::porosityModel
     active_(true),
     zoneName_(cellZoneName),
     cellZoneIDs_(),
-    coordSys_(*(coordinateSystem::New(mesh, coeffs_)))
+    csysPtr_
+    (
+        coordinateSystem::New(mesh, coeffs_, coordinateSystem::typeName_())
+    )
 {
     if (zoneName_ == word::null)
     {
@@ -123,45 +115,36 @@ Foam::porosityModel::porosityModel
             << exit(FatalError);
     }
 
-    Info<< incrIndent << indent << coordSys_ << decrIndent << endl;
+    Info<< incrIndent << indent << csys() << decrIndent << endl;
 
     const pointField& points = mesh_.points();
     const cellList& cells = mesh_.cells();
     const faceList& faces = mesh_.faces();
-    forAll(cellZoneIDs_, zoneI)
-    {
-        const cellZone& cZone = mesh_.cellZones()[cellZoneIDs_[zoneI]];
-        point bbMin = point::max;
-        point bbMax = point::min;
 
-        forAll(cZone, i)
+    for (const label zonei : cellZoneIDs_)
+    {
+        const cellZone& cZone = mesh_.cellZones()[zonei];
+
+        boundBox bb;
+
+        for (const label celli : cZone)
         {
-            const label cellI = cZone[i];
-            const cell& c = cells[cellI];
+            const cell& c = cells[celli];
             const pointField cellPoints(c.points(faces, points));
 
-            forAll(cellPoints, pointI)
+            for (const point& pt : cellPoints)
             {
-                const point pt = coordSys_.localPosition(cellPoints[pointI]);
-                bbMin = min(bbMin, pt);
-                bbMax = max(bbMax, pt);
+                bb.add(csys().localPosition(pt));
             }
         }
 
-        reduce(bbMin, minOp<point>());
-        reduce(bbMax, maxOp<point>());
+        bb.reduce();
 
-        Info<< "    local bounds: " << (bbMax - bbMin) << nl << endl;
+        Info<< "    local bounds: " << bb.span() << nl << endl;
     }
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::porosityModel::~porosityModel()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::porosityModel::transformModelData()
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
index f8dd0a31fb..8be1e311a1 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModel.H
@@ -91,13 +91,12 @@ protected:
         //- Cell zone IDs
         labelList cellZoneIDs_;
 
-        //- Local co-ordinate system
-        coordinateSystem coordSys_;
+        //- Local coordinate system
+        autoPtr<coordinateSystem> csysPtr_;
 
 
     // Protected Member Functions
 
-
         //- Transform the model data wrt mesh changes
         virtual void calcTransformModelData() = 0;
 
@@ -128,8 +127,12 @@ protected:
             volTensorField& AU
         ) const = 0;
 
+
+        //- Local coordinate system
+        inline const coordinateSystem& csys() const;
+
         //- Return label index
-        label fieldIndex(const label index) const;
+        inline label fieldIndex(const label index) const;
 
 
 public:
@@ -209,7 +212,7 @@ public:
     );
 
     //- Destructor
-    virtual ~porosityModel();
+    virtual ~porosityModel() = default;
 
 
     // Member Functions
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelI.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelI.H
index ecf384a274..26d3472744 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelI.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelI.H
@@ -23,6 +23,22 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+inline const Foam::coordinateSystem& Foam::porosityModel::csys() const
+{
+    return *csysPtr_;
+}
+
+
+inline Foam::label Foam::porosityModel::fieldIndex(const label i) const
+{
+    return (csysPtr_->uniform() ? 0 : i);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
 inline const Foam::word& Foam::porosityModel::name() const
 {
     return name_;
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.C
index bb39e24138..588624f71b 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.C
@@ -38,33 +38,26 @@ Foam::porosityModelList::porosityModelList
     mesh_(mesh)
 {
     reset(dict);
-
     active(true);
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::porosityModelList::~porosityModelList()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::porosityModelList::active(const bool warn) const
 {
-    bool a = false;
+    bool anyOk = false;
     forAll(*this, i)
     {
-        a = a || this->operator[](i).active();
+        anyOk = anyOk || this->operator[](i).active();
     }
 
-    if (warn && this->size() && !a)
+    if (warn && this->size() && !anyOk)
     {
         Info<< "No porosity models active" << endl;
     }
 
-    return a;
+    return anyOk;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.H b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.H
index fb48794662..4674865685 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelList.H
@@ -45,7 +45,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
+// Forward declarations
 class porosityModelList;
 Ostream& operator<<(Ostream& os, const porosityModelList& models);
 
@@ -82,13 +82,13 @@ public:
     porosityModelList(const fvMesh& mesh, const dictionary& dict);
 
     //- Destructor
-    ~porosityModelList();
+    ~porosityModelList() = default;
 
 
     // Member Functions
 
         //- Return active status
-        bool active(const bool active = false) const;
+        bool active(const bool warn = false) const;
 
         //- Reset the source list
         void reset(const dictionary& dict);
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
index 811023faaa..b1e05ae088 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/porosityModel/porosityModelNew.C
@@ -35,7 +35,7 @@ Foam::autoPtr<Foam::porosityModel> Foam::porosityModel::New
     const word& cellZoneName
 )
 {
-    const word modelType(dict.lookup("type"));
+    const word modelType(dict.get<word>("type"));
 
     Info<< "Porosity region " << name << ":" << nl
         << "    selecting model: " << modelType << endl;
@@ -46,7 +46,7 @@ Foam::autoPtr<Foam::porosityModel> Foam::porosityModel::New
     {
         FatalErrorInFunction
             << "Unknown " << typeName << " type " << modelType << nl << nl
-            << "Valid " << typeName << " types are:" << nl
+            << "Valid types are:" << nl
             << meshConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
index 280b0e4ba2..aca0860bbc 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.C
@@ -52,18 +52,12 @@ Foam::porosityModels::powerLaw::powerLaw
 )
 :
     porosityModel(name, modelType, mesh, dict, cellZoneName),
-    C0_(readScalar(coeffs_.lookup("C0"))),
-    C1_(readScalar(coeffs_.lookup("C1"))),
+    C0_(coeffs_.get<scalar>("C0")),
+    C1_(coeffs_.get<scalar>("C1")),
     rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho"))
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::porosityModels::powerLaw::~powerLaw()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::porosityModels::powerLaw::calcTransformModelData()
@@ -100,7 +94,7 @@ void Foam::porosityModels::powerLaw::correct
 
     if (UEqn.dimensions() == dimForce)
     {
-        const volScalarField& rho = mesh_.lookupObject<volScalarField>
+        const auto& rho = mesh_.lookupObject<volScalarField>
         (
             IOobject::groupName(rhoName_, U.group())
         );
@@ -139,7 +133,7 @@ void Foam::porosityModels::powerLaw::correct
 
     if (UEqn.dimensions() == dimForce)
     {
-        const volScalarField& rho = mesh_.lookupObject<volScalarField>
+        const auto& rho = mesh_.lookupObject<volScalarField>
         (
             IOobject::groupName(rhoName_, U.group())
         );
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
index 3d97f2786f..305e60e5e3 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLaw.H
@@ -119,7 +119,7 @@ public:
     );
 
     //- Destructor
-    virtual ~powerLaw();
+    virtual ~powerLaw() = default;
 
 
     // Member Functions
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLawTemplates.C b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLawTemplates.C
index 7ed3d2ead7..30df618f66 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLawTemplates.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/powerLaw/powerLawTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,14 +37,12 @@ void Foam::porosityModels::powerLaw::apply
     const scalar C0 = C0_;
     const scalar C1m1b2 = (C1_ - 1.0)/2.0;
 
-    forAll(cellZoneIDs_, zoneI)
+    for (const label zonei : cellZoneIDs_)
     {
-        const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+        const labelList& cells = mesh_.cellZones()[zonei];
 
-        forAll(cells, i)
+        for (const label celli : cells)
         {
-            const label celli = cells[i];
-
             Udiag[celli] +=
                 V[celli]*rho[celli]*C0*pow(magSqr(U[celli]), C1m1b2);
         }
@@ -63,14 +61,12 @@ void Foam::porosityModels::powerLaw::apply
     const scalar C0 = C0_;
     const scalar C1m1b2 = (C1_ - 1.0)/2.0;
 
-    forAll(cellZoneIDs_, zoneI)
+    for (const label zonei : cellZoneIDs_)
     {
-        const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+        const labelList& cells = mesh_.cellZones()[zonei];
 
-        forAll(cells, i)
+        for (const label celli : cells)
         {
-            const label celli = cells[i];
-
             AU[celli] =
                 AU[celli] + I*(rho[celli]*C0*pow(magSqr(U[celli]), C1m1b2));
         }
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
index 68d3edcf77..50276c115b 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
@@ -99,7 +99,7 @@ void Foam::porosityModels::solidification::correct
 
     if (UEqn.dimensions() == dimForce)
     {
-        const volScalarField& rho = mesh_.lookupObject<volScalarField>
+        const auto& rho = mesh_.lookupObject<volScalarField>
         (
             IOobject::groupName(rhoName_, U.group())
         );
@@ -138,7 +138,7 @@ void Foam::porosityModels::solidification::correct
 
     if (UEqn.dimensions() == dimForce)
     {
-        const volScalarField& rho = mesh_.lookupObject<volScalarField>
+        const auto& rho = mesh_.lookupObject<volScalarField>
         (
             IOobject::groupName(rhoName_, U.group())
         );
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
index 3922d54775..ee83b6ee7e 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.H
@@ -63,14 +63,9 @@ Description
             // use the global coordinate system
             coordinateSystem
             {
-                type    cartesian;
                 origin  (0 0 0);
-                coordinateRotation
-                {
-                    type    axesRotation;
-                    e1      (1 0 0);
-                    e2      (0 1 0);
-                }
+                e1      (1 0 0);
+                e2      (0 1 0);
             }
         }
     \endverbatim
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C
index d9ea04d59e..9abd56a62f 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidificationTemplates.C
@@ -38,18 +38,17 @@ void Foam::porosityModels::solidification::apply
     const volVectorField& U
 ) const
 {
-    const volScalarField& T = mesh_.lookupObject<volScalarField>
+    const auto& T = mesh_.lookupObject<volScalarField>
     (
         IOobject::groupName(TName_, U.group())
     );
 
-    forAll(cellZoneIDs_, zoneI)
+    for (const label zonei : cellZoneIDs_)
     {
-        const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+        const labelList& cells = mesh_.cellZones()[zonei];
 
-        forAll(cells, i)
+        for (const label celli : cells)
         {
-            const label celli = cells[i];
             Udiag[celli] +=
                 V[celli]*alpha[celli]*rho[celli]*D_->value(T[celli]);
         }
@@ -66,18 +65,17 @@ void Foam::porosityModels::solidification::apply
     const volVectorField& U
 ) const
 {
-    const volScalarField& T = mesh_.lookupObject<volScalarField>
+    const auto& T = mesh_.lookupObject<volScalarField>
     (
         IOobject::groupName(TName_, U.group())
     );
 
-    forAll(cellZoneIDs_, zoneI)
+    for (const label zonei : cellZoneIDs_)
     {
-        const labelList& cells = mesh_.cellZones()[cellZoneIDs_[zoneI]];
+        const labelList& cells = mesh_.cellZones()[zonei];
 
-        forAll(cells, i)
+        for (const label celli : cells)
         {
-            const label celli = cells[i];
             AU[celli] +=
                 tensor::I*alpha[celli]*rho[celli]*D_->value(T[celli]);
         }
@@ -100,7 +98,7 @@ void Foam::porosityModels::solidification::apply
     }
     else
     {
-        const volScalarField& alpha = mesh_.lookupObject<volScalarField>
+        const auto& alpha = mesh_.lookupObject<volScalarField>
         (
             IOobject::groupName(alphaName_, U.group())
         );
@@ -124,7 +122,7 @@ void Foam::porosityModels::solidification::apply
     }
     else
     {
-        const volScalarField& alpha = mesh_.lookupObject<volScalarField>
+        const auto& alpha = mesh_.lookupObject<volScalarField>
         (
             IOobject::groupName(alphaName_, U.group())
         );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
index 833714cce1..f97698335d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.H
@@ -29,7 +29,7 @@ Group
 
 Description
     This boundary condition describes an inlet vector boundary condition in
-    cylindrical co-ordinates given a central axis, central point, rpm, axial
+    cylindrical coordinates given a central axis, central point, rpm, axial
     and radial velocity.
 
 Usage
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
index 94b71defce..94ae12a9fd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.H
@@ -39,7 +39,7 @@ Description
     \vartable
         p_{hyd} | hyrostatic pressure [Pa]
         p_{ref} | reference pressure [Pa]
-        x_{ref} | reference point in Cartesian co-ordinates
+        x_{ref} | reference point in Cartesian coordinates
         \rho    | density (assumed uniform)
         g       | acceleration due to gravity [m/s2]
     \endtable
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
index 485a417bda..19e8508485 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.H
@@ -33,7 +33,7 @@ Description
 Usage
     \table
         Property     | Description             | Required    | Default value
-        origin       | origin of rotation in Cartesian co-ordinates | yes|
+        origin       | origin of rotation in Cartesian coordinates | yes|
         axis         | axis of rotation        | yes         |
         omega        | angular velocty of the frame [rad/s] | yes    |
     \endtable
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.H
index d56fcc8f2e..5b22c192b4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.H
@@ -29,7 +29,7 @@ Group
 
 Description
     This boundary condition describes an inlet vector boundary condition in
-    swirl co-ordinates given a central axis, central point, axial, radial and
+    swirl coordinates given a central axis, central point, axial, radial and
     tangential velocity profiles.
 
 Usage
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
index be527caa2f..c1c91145b7 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
@@ -42,19 +42,18 @@ SourceFiles
 #include "point.H"
 #include "tensor.H"
 #include "Random.H"
-#include "coordinateSystem.H"
+#include "boundBox.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward declarations
+class eddy;
 class Istream;
 class Ostream;
 
-// Forward declaration of friend functions and operators
-class eddy;
 bool operator==(const eddy& a, const eddy& b);
 bool operator!=(const eddy& a, const eddy& b);
 Istream& operator>>(Istream& is, eddy& e);
@@ -87,7 +86,7 @@ class eddy
         //- Time-averaged intensity
         vector alpha_;
 
-        //- Co-ordinate system transformation from local to global axes
+        //- Coordinate system transformation from local to global axes
         //  X-direction aligned with max stress eigenvalue
         tensor Rpg_;
 
@@ -161,7 +160,7 @@ public:
             //- Return the time-averaged intensity
             inline const vector& alpha() const;
 
-            //- Return the co-ordinate system transformation from local
+            //- Return the coordinate system transformation from local
             //  principal to global axes
             inline const tensor& Rpg() const;
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H
index fb61f2f014..7497873c39 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.H
@@ -39,7 +39,7 @@ Description
     \vartable
         p_{hyd} | hyrostatic pressure [Pa]
         p_{ref} | reference pressure [Pa]
-        x_{ref} | reference point in Cartesian co-ordinates
+        x_{ref} | reference point in Cartesian coordinates
         \rho    | density (assumed uniform)
         g       | acceleration due to gravity [m/s2]
     \endtable
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
index ed064281c1..80b2e5a835 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/cellPointWeight/cellPointWeight.H
@@ -89,7 +89,7 @@ public:
     //- Debug switch
     static int debug;
 
-    //- Tolerance used in calculating barycentric co-ordinates
+    //- Tolerance used in calculating barycentric coordinates
     //  (applied to normalised values)
     static scalar tol;
 
diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.H b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.H
index a76fc7f951..2228f1a5b3 100644
--- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.H
+++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeight.H
@@ -107,7 +107,7 @@ public:
     //- Debug switch
     static int debug;
 
-    //- Tolerance used in calculating barycentric co-ordinates
+    //- Tolerance used in calculating barycentric coordinates
     //  (applied to normalised values)
     static scalar tol;
 
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
index 2c4ea97f34..eefc9ca268 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,23 +56,19 @@ fieldCoordinateSystemTransform
 :
     fvMeshFunctionObject(name, runTime, dict),
     fieldSet_(mesh_),
-    coordSys_(mesh_, dict.subDict("coordinateSystem"))
+    csysPtr_
+    (
+        coordinateSystem::New(mesh_, dict, coordinateSystem::typeName_())
+    )
 {
     read(dict);
 
     Info<< type() << " " << name << ":" << nl
         << "   Applying transformation from global Cartesian to local "
-        << coordSys_ << nl << endl;
+        << *csysPtr_ << nl << endl;
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::functionObjects::fieldCoordinateSystemTransform::
-~fieldCoordinateSystemTransform()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::word
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index dbc0446cb7..5f68d09f8b 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,7 +29,7 @@ Group
 
 Description
     Transforms a user-specified selection of fields from global Cartesian
-    co-ordinates to a local co-ordinate system.  The fields are run-time
+    coordinates to a local coordinate system.  The fields are run-time
     modifiable.
 
 Usage
@@ -50,11 +50,11 @@ Usage
         coordinateSystem
         {
             origin      (0.001 0 0);
-            coordinateRotation
+            rotation
             {
-                type        axesRotation;
-                e1          (1      0.15    0);
-                e3          (0      0      -1);
+                type    axes;
+                e1      (1 0.15 0);
+                e3      (0 0 -1);
             }
         }
     }
@@ -65,7 +65,7 @@ Usage
         Property     | Description             | Required    | Default value
         type         | type name: fieldCoordinateSystemTransform | yes |
         fields       | list of fields to be transformed |yes |
-        coordinateSystem | local co-ordinate system | yes    |
+        coordinateSystem | local coordinate system | yes    |
     \endtable
 
 See also
@@ -107,8 +107,8 @@ protected:
         //- Fields to transform
         volFieldSelection fieldSet_;
 
-        //- Co-ordinate system to transform to
-        coordinateSystem coordSys_;
+        //- Coordinate system to transform to
+        autoPtr<coordinateSystem> csysPtr_;
 
 
     // Protected Member Functions
@@ -143,7 +143,7 @@ public:
 
 
     //- Destructor
-    virtual ~fieldCoordinateSystemTransform();
+    virtual ~fieldCoordinateSystemTransform() = default;
 
 
     // Member Functions
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
index 2e26c96343..2cf380522b 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,7 +41,7 @@ void Foam::functionObjects::fieldCoordinateSystemTransform::transformField
     store
     (
         transFieldName,
-        Foam::transform(dimensionedTensor(coordSys_.R().R()), field)
+        Foam::transform(dimensionedTensor(csysPtr_->R()), field)
     );
 }
 
@@ -61,7 +61,10 @@ void Foam::functionObjects::fieldCoordinateSystemTransform::transform
             << type() << ": Field " << fieldName << " already in database"
             << endl;
 
-        transformField<VolFieldType>(lookupObject<VolFieldType>(fieldName));
+        transformField<VolFieldType>
+        (
+            lookupObject<VolFieldType>(fieldName)
+        );
     }
     else if (foundObject<SurfaceFieldType>(fieldName))
     {
diff --git a/src/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict b/src/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
index c1ffcfcb73..d2604fe002 100644
--- a/src/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
+++ b/src/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict
@@ -41,12 +41,8 @@ functions
         coordinateSystem
         {
             origin  (0 0 0);
-            coordinateRotation
-            {
-                type    axesRotation;
-                e1      (1  0.15  0);
-                e3      (0  0    -1);
-            }
+            e1      (1 0.15 0);
+            e3      (0 0 -1);
         }
     }
 }
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index 98aa128897..ef509267b8 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -350,12 +350,19 @@ bool Foam::functionObjects::regionSizeDistribution::read(const dictionary& dict)
     const word format(dict.get<word>("setFormat"));
     formatterPtr_ = writer<scalar>::New(format);
 
-    if (dict.found("coordinateSystem"))
+    if (dict.found(coordinateSystem::typeName_()))
     {
-        coordSysPtr_.reset(new coordinateSystem(obr_, dict));
+        csysPtr_.reset
+        (
+            coordinateSystem::New(obr_, dict, coordinateSystem::typeName_())
+        );
 
         Info<< "Transforming all vectorFields with coordinate system "
-            << coordSysPtr_().name() << endl;
+            << csysPtr_->name() << endl;
+    }
+    else
+    {
+        csysPtr_.clear();
     }
 
     if (isoPlanes_)
@@ -897,14 +904,14 @@ bool Foam::functionObjects::regionSizeDistribution::write()
                     volVectorField
                 >(fldName).primitiveField();
 
-                if (coordSysPtr_.valid())
+                if (csysPtr_.valid())
                 {
                     Log << "Transforming vector field " << fldName
                         << " with coordinate system "
-                        << coordSysPtr_().name()
+                        << csysPtr_->name()
                         << endl;
 
-                    fld = coordSysPtr_().localVector(fld);
+                    fld = csysPtr_->localVector(fld);
                 }
 
 
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index 1ab6800d10..6110888cab 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -113,8 +113,8 @@ Usage
         maxDiameter  | maximum region equivalent diameter | yes |
         minDiameter  | minimum region equivalent diameter | no  | 0
         setFormat    | writing format          | yes         |
-        origin       | origin of local co-ordinate system | yes    |
-        coordinateRoation | orientation of local co-ordinate system | no
+        origin       | origin of local coordinate system | yes    |
+        coordinateRoation | orientation of local coordinate system | no
         log          | Log to standard output  | no          | yes
         isoPlanes    | switch for isoPlanes    | no          | false
         origin       | origin of the plane when isoPlanes is used | no | none
@@ -198,7 +198,7 @@ class regionSizeDistribution
         autoPtr<writer<scalar>> formatterPtr_;
 
         //- Optional coordinate system
-        autoPtr<coordinateSystem> coordSysPtr_;
+        autoPtr<coordinateSystem> csysPtr_;
 
         // Optional extra definition of bins on planes downstream to the origin
         // point and maximum diameter
diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index cc166499ea..ece9acc17d 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -29,6 +29,7 @@ License
 #include "turbulentTransportModel.H"
 #include "turbulentFluidThermoModel.H"
 #include "addToRunTimeSelectionTable.H"
+#include "cartesianCS.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -37,7 +38,6 @@ namespace Foam
 namespace functionObjects
 {
     defineTypeNameAndDebug(forces, 0);
-
     addToRunTimeSelectionTable(functionObject, forces, dictionary);
 }
 }
@@ -857,7 +857,23 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
     // specified directly, from coordinate system, or implicitly (0 0 0)
     if (!dict.readIfPresent<point>("CofR", coordSys_.origin()))
     {
-        coordSys_ = coordinateSystem(obr_, dict);
+        // The 'coordinateSystem' sub-dictionary is optional,
+        // but enforce use of a cartesian system.
+
+        if (dict.found(coordinateSystem::typeName_()))
+        {
+            // New() for access to indirect (global) coordinate system
+            coordSys_ =
+                coordinateSystem::New
+                (
+                    obr_, dict, coordinateSystem::typeName_()
+                );
+        }
+        else
+        {
+            coordSys_ = coordSystem::cartesian(dict);
+        }
+
         localSystem_ = true;
     }
 
diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H
index 4a27514c6a..94b89a5635 100644
--- a/src/functionObjects/forces/forces/forces.H
+++ b/src/functionObjects/forces/forces/forces.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -32,21 +32,21 @@ Description
     skin-friction forces over a given list of patches, and the resistance
     from porous zones.
 
-    Forces and moments are calculated, with optional co-ordinate system and
+    Forces and moments are calculated, with optional coordinate system and
     writing of binned data, where force and moment contributions are collected
     into a user-defined number of bins that span the input geometries for a
     user-defined direction vector.
 
     Data is written into multiple files in the
     postProcessing/\<functionObjectName\> directory:
-    - force.dat          : forces in global Cartesian co-ordinate system
-    - moment.dat         : moments in global Cartesian co-ordinate system
-    - forceBin.dat       : force bins in global Cartesian co-ordinate system
-    - momentBin.dat      : moment bins in global Cartesian co-ordinate system
-    - localForce.dat     : forces in local co-ordinate system
-    - localMoment.dat    : moments in local co-ordinate system
-    - localForceBin.dat  : force bins in local co-ordinate system
-    - localMomentBin.dat : moment bins in local co-ordinate system
+    - force.dat          : forces in global Cartesian coordinate system
+    - moment.dat         : moments in global Cartesian coordinate system
+    - forceBin.dat       : force bins in global Cartesian coordinate system
+    - momentBin.dat      : moment bins in global Cartesian coordinate system
+    - localForce.dat     : forces in local Cartesian coordinate system
+    - localMoment.dat    : moments in local Cartesian coordinate system
+    - localForceBin.dat  : force bins in local Cartesian coordinate system
+    - localMomentBin.dat : moment bins in local Cartesian coordinate system
 
 Usage
     Example of function object specification:
@@ -107,13 +107,19 @@ Note
         CofR        (0 0 0);
     \endverbatim
     or
+    \verbatim
+        origin  (0 0 0);
+        e1      (0 1 0);
+        e3      (0 0 1);
+    \endverbatim
+    or
     \verbatim
         coordinateSystem
         {
             origin  (0 0 0);
-            coordinateRotation
+            rotation
             {
-                type    axesRotation;
+                type    axes;
                 e3      (0 0 1);
                 e1      (1 0 0);
             }
@@ -136,7 +142,7 @@ SourceFiles
 
 #include "fvMeshFunctionObject.H"
 #include "writeFile.H"
-#include "coordinateSystem.H"
+#include "cartesianCS.H"
 #include "volFieldsFwd.H"
 #include "HashSet.H"
 #include "Tuple2.H"
@@ -224,9 +230,9 @@ protected:
             scalar pRef_;
 
             //- Coordinate system used when evaluting forces/moments
-            coordinateSystem coordSys_;
+            coordSystem::cartesian coordSys_;
 
-            //- Flag to indicate whether we are using a local co-ordinate sys
+            //- Flag to indicate whether we are using a local coordinates
             bool localSystem_;
 
             //- Flag to include porosity effects
diff --git a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
index 4b17b17174..74afb15cbc 100644
--- a/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
+++ b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
@@ -44,14 +44,9 @@ Usage
 
             coordinateSystem
             {
-                type    cartesian;
                 origin  (0 0 0);
-                coordinateRotation
-                {
-                    type    axesRotation;
-                    e1  (0.70710678 0.70710678 0);
-                    e2  (0 0 1);
-                }
+                e1      (0.70710678 0.70710678 0);
+                e2      (0 0 1);
             }
         }
     }
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index 0ecc8d31dd..b2f4df5343 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,16 +53,16 @@ const Foam::word Foam::fv::jouleHeatingSource::sigmaName(typeName + ":sigma");
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-const Foam::coordinateSystem& Foam::fv::jouleHeatingSource::coordSys() const
+const Foam::coordinateSystem& Foam::fv::jouleHeatingSource::csys() const
 {
-    if (!coordSysPtr_.valid())
+    if (!csysPtr_ || !csysPtr_.valid())
     {
         FatalErrorInFunction
-            << "Co-ordinate system invalid"
+            << "Coordinate system invalid"
             << abort(FatalError);
     }
 
-    return *coordSysPtr_;
+    return *csysPtr_;
 }
 
 
@@ -87,10 +87,18 @@ Foam::fv::jouleHeatingSource::transformSigma
         dimensionedSymmTensor(sigmaLocal.dimensions(), Zero),
         zeroGradientFvPatchField<symmTensor>::typeName
     );
-
     auto& sigma = tsigma.ref();
 
-    sigma.primitiveFieldRef() = coordSys().R().transformVector(sigmaLocal);
+    if (csys().uniform())
+    {
+        sigma.primitiveFieldRef() =
+            csys().transformPrincipal(sigmaLocal);
+    }
+    else
+    {
+        sigma.primitiveFieldRef() =
+            csys().transformPrincipal(mesh_.cellCentres(), sigmaLocal);
+    }
 
     sigma.correctBoundaryConditions();
 
@@ -125,7 +133,7 @@ Foam::fv::jouleHeatingSource::jouleHeatingSource
     anisotropicElectricalConductivity_(false),
     scalarSigmaVsTPtr_(nullptr),
     vectorSigmaVsTPtr_(nullptr),
-    coordSysPtr_(nullptr),
+    csysPtr_(nullptr),
     curTimeIndex_(-1)
 {
     // Set the field name to that of the energy field from which the temperature
@@ -223,7 +231,14 @@ bool Foam::fv::jouleHeatingSource::read(const dictionary& dict)
             Info<< "    Using vector electrical conductivity" << endl;
 
             initialiseSigma(coeffs_, vectorSigmaVsTPtr_);
-            coordSysPtr_ = coordinateSystem::New(mesh_, coeffs_);
+
+            csysPtr_ =
+                coordinateSystem::New
+                (
+                    mesh_,
+                    coeffs_,
+                    coordinateSystem::typeName_()
+                );
         }
         else
         {
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
index 4842cfa1ed..02e003975f 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
@@ -91,15 +91,9 @@ Usage
 
         coordinateSystem
         {
-            type        cartesian;
-            origin      (0 0 0);
-
-            coordinateRotation
-            {
-                type        axesRotation;
-                e1          (1 0 0);
-                e3          (0 0 1);
-            }
+            origin  (0 0 0);
+            e1      (1 0 0);
+            e3      (0 0 1);
         }
 
         // Optionally specify sigma as a function of temperature
@@ -179,8 +173,8 @@ class jouleHeatingSource
         //- Electrical conductivity as a vector function of temperature
         autoPtr<Function1<vector>> vectorSigmaVsTPtr_;
 
-        //- Co-ordinate system - used for vectorial electrical conductivity
-        autoPtr<coordinateSystem> coordSysPtr_;
+        //- Coordinate system - used for vectorial electrical conductivity
+        autoPtr<coordinateSystem> csysPtr_;
 
         //- Current time index (used for updating)
         label curTimeIndex_;
@@ -194,9 +188,8 @@ class jouleHeatingSource
         //- No copy assignment
         void operator=(const jouleHeatingSource&) = delete;
 
-        //- Return the co-ordinate system for anisotropic electrical
-        //  conductivity
-        const coordinateSystem& coordSys() const;
+        //- The coordinate system for anisotropic electrical conductivity
+        const coordinateSystem& csys() const;
 
         //- Transform the anisotropic electrical conductivity into global system
         tmp<volSymmTensorField> transformSigma
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
index 0d518f551b..77c13c70d9 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
@@ -91,7 +91,7 @@ void Foam::fv::rotorDiskSource::checkData()
                 case ifSurfaceNormal:
                 {
                     scalar UIn(coeffs_.get<scalar>("inletNormalVelocity"));
-                    inletVelocity_ = -coordSys_.R().e3()*UIn;
+                    inletVelocity_ = -coordSys_.e3()*UIn;
                     break;
                 }
                 case ifLocal:
@@ -333,17 +333,6 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
 
             coeffs_.readEntry("refDirection", refDir);
 
-            cylindrical_.reset
-            (
-                new cylindrical
-                (
-                    mesh_,
-                    axis,
-                    origin,
-                    cells_
-                )
-            );
-
             // Set the face areas and apply correction to calculated axis
             // e.g. if cellZone is more than a single layer in thickness
             setFaceArea(axis, true);
@@ -356,17 +345,6 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
             coeffs_.readEntry("axis", axis);
             coeffs_.readEntry("refDirection", refDir);
 
-            cylindrical_.reset
-            (
-                new cylindrical
-                (
-                    mesh_,
-                    axis,
-                    origin,
-                    cells_
-                )
-            );
-
             setFaceArea(axis, false);
 
             break;
@@ -381,7 +359,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
         }
     }
 
-    coordSys_ = cylindricalCS("rotorCS", origin, axis, refDir);
+    coordSys_ = coordSystem::cylindrical(origin, axis, refDir);
 
     const scalar sumArea = gSum(area_);
     const scalar diameter = Foam::sqrt(4.0*sumArea/mathematical::pi);
@@ -389,24 +367,25 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
         << "    - disk diameter = " << diameter << nl
         << "    - disk area     = " << sumArea << nl
         << "    - origin        = " << coordSys_.origin() << nl
-        << "    - r-axis        = " << coordSys_.R().e1() << nl
-        << "    - psi-axis      = " << coordSys_.R().e2() << nl
-        << "    - z-axis        = " << coordSys_.R().e3() << endl;
+        << "    - r-axis        = " << coordSys_.e1() << nl
+        << "    - psi-axis      = " << coordSys_.e2() << nl
+        << "    - z-axis        = " << coordSys_.e3() << endl;
 }
 
 
 void Foam::fv::rotorDiskSource::constructGeometry()
 {
-    const vectorField& C = mesh_.C();
+    const pointUIndList cc(mesh_.C(), cells_);
+
+    // Optional: for later transform(), invTransform()
+    /// Rcyl_.reset(coordSys_.R(cc).ptr());
 
     forAll(cells_, i)
     {
         if (area_[i] > ROOTVSMALL)
         {
-            const label celli = cells_[i];
-
             // Position in (planar) rotor coordinate system
-            x_[i] = coordSys_.localPosition(C[celli]);
+            x_[i] = coordSys_.localPosition(cc[i]);
 
             // Cache max radius
             rMax_ = max(rMax_, x_[i].x());
@@ -482,7 +461,6 @@ Foam::fv::rotorDiskSource::rotorDiskSource
     Rcone_(cells_.size(), I),
     area_(cells_.size(), Zero),
     coordSys_(),
-    cylindrical_(),
     rMax_(0.0),
     trim_(trimModel::New(*this, coeffs_)),
     blade_(coeffs_.subDict("blade")),
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
index ec293d7eda..9a607d7c04 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
@@ -102,7 +102,6 @@ SourceFiles
 
 #include "cellSetOption.H"
 #include "cylindricalCS.H"
-#include "cylindrical.H"
 #include "Enum.H"
 #include "bladeModel.H"
 #include "profileModelList.H"
@@ -184,7 +183,7 @@ protected:
         flapData flap_;
 
         //- Cell centre positions in local rotor frame
-        //  (Cylindrical r, theta, z)
+        //  (Cylindrical r-theta-z)
         List<point> x_;
 
         //- Rotation tensor for flap angle
@@ -194,10 +193,10 @@ protected:
         List<scalar> area_;
 
         //- Rotor local cylindrical coordinate system (r-theta-z)
-        cylindricalCS coordSys_;
+        coordSystem::cylindrical coordSys_;
 
-        //- Rotor transformation coordinate system
-        autoPtr<cylindrical> cylindrical_;
+        //- Cached rotation tensors for cylindrical coordinates
+        autoPtr<tensorField> Rcyl_;
 
         //- Maximum radius
         scalar rMax_;
@@ -273,11 +272,11 @@ public:
             inline scalar omega() const;
 
             //- Return the cell centre positions in local rotor frame
-            // (Cylindrical r, theta, z)
+            //  (Cylindrical r-theta-z)
             inline const List<point>& x() const;
 
             //- Return the rotor coordinate system (r-theta-z)
-            inline const cylindricalCS& coordSys() const;
+            inline const coordSystem::cylindrical& coordSys() const;
 
 
         // Evaluation
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceI.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceI.H
index e923790514..2e8a4581b4 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceI.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceI.H
@@ -27,25 +27,26 @@ License
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::scalar Foam::fv::rotorDiskSource::rhoRef() const
+inline Foam::scalar Foam::fv::rotorDiskSource::rhoRef() const
 {
     return rhoRef_;
 }
 
 
-Foam::scalar Foam::fv::rotorDiskSource::omega() const
+inline Foam::scalar Foam::fv::rotorDiskSource::omega() const
 {
     return omega_;
 }
 
 
-const Foam::List<Foam::point>& Foam::fv::rotorDiskSource::x() const
+inline const Foam::List<Foam::point>& Foam::fv::rotorDiskSource::x() const
 {
     return x_;
 }
 
 
-const Foam::cylindricalCS& Foam::fv::rotorDiskSource::coordSys() const
+inline const Foam::coordSystem::cylindrical&
+Foam::fv::rotorDiskSource::coordSys() const
 {
     return coordSys_;
 }
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
index c5cab4d847..89eabc7fa6 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,7 +26,6 @@ License
 #include "rotorDiskSource.H"
 #include "volFields.H"
 #include "unitConversion.H"
-#include "transform.H"
 
 using namespace Foam::constant;
 
@@ -51,6 +50,9 @@ void Foam::fv::rotorDiskSource::calculate
     scalar AOAmin = GREAT;
     scalar AOAmax = -GREAT;
 
+    // Cached position-dependent rotations available?
+    const bool hasCache = Rcyl_.valid();
+
     forAll(cells_, i)
     {
         if (area_[i] > ROOTVSMALL)
@@ -59,8 +61,15 @@ void Foam::fv::rotorDiskSource::calculate
 
             const scalar radius = x_[i].x();
 
+            const tensor Rcyl =
+            (
+                hasCache
+              ? (*Rcyl_)[i]
+              : coordSys_.R(mesh_.C()[celli])
+            );
+
             // Transform velocity into local cylindrical reference frame
-            vector Uc = cylindrical_->invTransform(U[celli], i);
+            vector Uc = invTransform(Rcyl, U[celli]);
 
             // Transform velocity into local coning system
             Uc = transform(Rcone_[i], Uc);
@@ -132,8 +141,8 @@ void Foam::fv::rotorDiskSource::calculate
             // Transform force from local coning system into rotor cylindrical
             localForce = invTransform(Rcone_[i], localForce);
 
-            // Transform force into global Cartesian co-ordinate system
-            force[celli] = cylindrical_->transform(localForce, i);
+            // Transform force into global Cartesian coordinate system
+            force[celli] = transform(Rcyl, localForce);
 
             if (divideVolume)
             {
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
index bfc457b95f..fd2d7a82ed 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@@ -57,9 +57,9 @@ Foam::vector Foam::targetCoeffTrim::calcCoeffs
     const List<point>& x = rotor_.x();
 
     const vector& origin = rotor_.coordSys().origin();
-    const vector& rollAxis = rotor_.coordSys().R().e1();
-    const vector& pitchAxis = rotor_.coordSys().R().e2();
-    const vector& yawAxis = rotor_.coordSys().R().e3();
+    const vector& rollAxis = rotor_.coordSys().e1();
+    const vector& pitchAxis = rotor_.coordSys().e2();
+    const vector& yawAxis = rotor_.coordSys().e3();
 
     scalar coeff1 = alpha_*sqr(rotor_.omega())*mathematical::pi;
 
diff --git a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
index c8d7602a7f..2946c9801f 100644
--- a/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
+++ b/src/fvOptions/sources/interRegion/interRegionExplicitPorositySource/interRegionExplicitPorositySource.H
@@ -43,13 +43,9 @@ Description
 
             coordinateSystem
             {
-                origin      (0 0 0);
-                coordinateRotation
-                {
-                    type axesRotation;
-                    e1  (0.70710678 0.70710678 0);
-                    e2  (0 0 1);
-                }
+                origin  (0 0 0);
+                e1      (0.70710678 0.70710678 0);
+                e2      (0 0 1);
             }
         }
     }
diff --git a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
index 9c5842682b..4fa325b9e4 100644
--- a/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
+++ b/src/lagrangian/basic/injectedParticle/injectedParticleIO.C
@@ -63,7 +63,7 @@ Foam::injectedParticle::injectedParticle
     if (readFields)
     {
         // After the base particle class has read the fields from file and
-        // constructed the necessary barycentric co-ordinates we can update the
+        // constructed the necessary barycentric coordinates we can update the
         // particle position on this mesh
         position_ = particle::position();
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 42613d5e8b..593da83866 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -207,7 +207,7 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
     faces_.setSize(nFace);
     area_.setSize(nFace);
 
-    coordSys_ = cylindricalCS("collector", origin, normal_[0], refDir);
+    coordSys_ = coordSystem::cylindrical(origin, normal_[0], refDir);
 
     List<label> ptIDs(identity(nPointPerRadius));
 
@@ -356,7 +356,7 @@ void Foam::ParticleCollector<CloudType>::collectParcelConcentricCircles
         return;
     }
 
-    // Intersection point in cylindrical co-ordinate system
+    // Intersection point in cylindrical coordinate system
     const point pCyl = coordSys_.localPosition(p1 + (d1/(d1 - d2))*(p2 - p1));
 
     scalar r = pCyl[0];
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
index 12a13129ec..3dfedad222 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.H
@@ -160,8 +160,8 @@ private:
             //- List of radii
             List<scalar> radius_;
 
-            //- Cylindrical co-ordinate system
-            cylindricalCS coordSys_;
+            //- Cylindrical coordinate system
+            coordSystem::cylindrical coordSys_;
 
 
         //- Face areas
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
index 343e46dc1e..18ae20461a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -42,7 +42,7 @@ Description
 
     where:
     \plaintable
-        x, y, z | global cartesian co-ordinates [m]
+        x, y, z | global cartesian coordinates [m]
         u, v, w | global cartesian velocity components [m/s]
         d       | diameter [m]
         rho     | density [kg/m3]
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
index dfe38af74c..152d5fe952 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -39,7 +39,7 @@ Description
     );
 
     where:
-        x, y, z = global cartesian co-ordinates [m]
+        x, y, z = global cartesian coordinates [m]
         u, v, w = global cartesian velocity components [m/s]
         d       = diameter [m]
         rho     = density [kg/m3]
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
index 2541f65755..e02579fb8d 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -39,7 +39,7 @@ Description
     );
 
     where:
-        x, y, z  = global cartesian co-ordinates [m]
+        x, y, z  = global cartesian coordinates [m]
         u, v, w  = global cartesian velocity components [m/s]
         d        = diameter [m]
         rho      = density [kg/m3]
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
index 7ef9b9227c..8c312b8eab 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -39,7 +39,7 @@ Description
     );
 
     where:
-        x, y, z = global cartesian co-ordinates [m]
+        x, y, z = global cartesian coordinates [m]
         u, v, w = global cartesian velocity components [m/s]
         d       = diameter [m]
         rho     = density [kg/m3]
diff --git a/src/lumpedPointMotion/lumpedPointStateWriter.C b/src/lumpedPointMotion/lumpedPointStateWriter.C
index 22ad1b893c..2340d08761 100644
--- a/src/lumpedPointMotion/lumpedPointStateWriter.C
+++ b/src/lumpedPointMotion/lumpedPointStateWriter.C
@@ -26,7 +26,7 @@ License
 #include "lumpedPointState.H"
 #include "OFstream.H"
 #include "axesRotation.H"
-
+#include "coordinateSystem.H"
 #include "foamVtkOutput.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -183,14 +183,17 @@ void Foam::lumpedPointState::writeVTP
     }
 
     // Standard corners in local axis
-    const axesRotation cornerTransform(axis);
-
     FixedList<point, 4> corners;
-    forAll(standardCorners, corni)
-    {
-        corners[corni] = cornerTransform.transform(standardCorners[corni]);
-    }
 
+    {
+        coordinateRotations::axes orient(axis);
+        coordinateSystem cornerTransform(orient);
+
+        forAll(standardCorners, corni)
+        {
+            corners[corni] = cornerTransform.transform(standardCorners[corni]);
+        }
+    }
 
     //
     // Planes to visualize location/rotation
diff --git a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
index 190f3938a4..ec5519f56d 100644
--- a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
+++ b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.C
@@ -41,7 +41,7 @@ namespace blockEdges
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::cylindricalCS Foam::blockEdges::arcEdge::calcAngle()
+Foam::coordSystem::cylindrical Foam::blockEdges::arcEdge::calcAngle()
 {
     const vector a = p2_ - p1_;
     const vector b = p3_ - p1_;
@@ -99,7 +99,7 @@ Foam::cylindricalCS Foam::blockEdges::arcEdge::calcAngle()
     radius_ = mag(r3);
 
     // The corresponding local cylindrical coordinate system (radians)
-    return cylindricalCS("arc", centre, arcAxis, r1);
+    return coordSystem::cylindrical("arc", centre, arcAxis, r1);
 }
 
 
diff --git a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
index 52a122226e..267795a300 100644
--- a/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
+++ b/src/mesh/blockMesh/blockEdges/arcEdge/arcEdge.H
@@ -65,14 +65,14 @@ class arcEdge
         scalar radius_;
 
         //- The local cylindrical coordinate system
-        cylindricalCS cs_;
+        coordSystem::cylindrical cs_;
 
 
     // Private Member Functions
 
         //- Calculate the angle, radius and axis
-        //  \return the coordinate system
-        cylindricalCS calcAngle();
+        //  \return the cylindrical coordinate system
+        coordSystem::cylindrical calcAngle();
 
         //- No copy construct
         arcEdge(const arcEdge&) = delete;
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 83d30309b7..1759739ff9 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -59,17 +59,20 @@ cellFeatures/cellFeatures.C
 csys = coordinate/systems
 $(csys)/coordinateSystem.C
 $(csys)/coordinateSystemNew.C
+$(csys)/coordinateSystemTransform.C
 $(csys)/coordinateSystems.C
-$(csys)/cylindricalCS.C
 $(csys)/cartesianCS.C
+$(csys)/cylindricalCS.C
+$(csys)/indirectCS.C
 
 crot = coordinate/rotation
 $(crot)/axesRotation.C
+$(crot)/axisAngleRotation.C
 $(crot)/coordinateRotation.C
-$(crot)/coordinateRotationNew.C
+$(crot)/cylindricalRotation.C
+$(crot)/identityRotation.C
 $(crot)/EulerCoordinateRotation.C
 $(crot)/STARCDCoordinateRotation.C
-$(crot)/cylindrical.C
 
 polyMeshZipUpCells/polyMeshZipUpCells.C
 primitiveMeshGeometry/primitiveMeshGeometry.C
diff --git a/src/meshTools/coordinate/rotation/EulerCoordinateRotation.C b/src/meshTools/coordinate/rotation/EulerCoordinateRotation.C
index 495adc57d0..d9f76803ae 100644
--- a/src/meshTools/coordinate/rotation/EulerCoordinateRotation.C
+++ b/src/meshTools/coordinate/rotation/EulerCoordinateRotation.C
@@ -31,24 +31,34 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(EulerCoordinateRotation, 0);
-    addToRunTimeSelectionTable
-    (
-        coordinateRotation,
-        EulerCoordinateRotation,
-        dictionary
-    );
-    addToRunTimeSelectionTable
-    (
-        coordinateRotation,
-        EulerCoordinateRotation,
-        objectRegistry
-    );
+    namespace coordinateRotations
+    {
+        defineTypeName(euler);
+
+        // Standard short name
+        addNamedToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            euler,
+            dictionary,
+            euler
+        );
+
+        // Longer name - Compat 1806
+        addNamedToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            euler,
+            dictionary,
+            EulerRotation
+        );
+    }
 }
 
+
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::tensor Foam::EulerCoordinateRotation::rotation
+Foam::tensor Foam::coordinateRotations::euler::rotation
 (
     const vector& angles,
     bool degrees
@@ -84,174 +94,96 @@ Foam::tensor Foam::EulerCoordinateRotation::rotation
 }
 
 
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-Foam::vector Foam::EulerCoordinateRotation::transform(const vector& st) const
-{
-    return (R_ & st);
-}
-
-
-Foam::vector Foam::EulerCoordinateRotation::invTransform
-(
-    const vector& st
-) const
-{
-    return (Rtr_ & st);
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::EulerCoordinateRotation::transform
-(
-    const vectorField& st
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::EulerCoordinateRotation::invTransform
-(
-    const vectorField& st
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-const Foam::tensorField& Foam::EulerCoordinateRotation::Tr() const
-{
-    NotImplemented;
-    return NullObjectRef<tensorField>();
-}
-
-
-Foam::tmp<Foam::tensorField> Foam::EulerCoordinateRotation::transformTensor
-(
-    const tensorField& st
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-Foam::tensor Foam::EulerCoordinateRotation::transformTensor
-(
-    const tensor& st
-) const
-{
-    return (R_ & st & Rtr_);
-}
-
-
-Foam::tmp<Foam::tensorField> Foam::EulerCoordinateRotation::transformTensor
-(
-    const tensorField& st,
-    const labelList& cellMap
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-Foam::tmp<Foam::symmTensorField> Foam::EulerCoordinateRotation::
-transformVector
-(
-    const vectorField& st
-) const
-{
-    tmp<symmTensorField> tfld(new symmTensorField(st.size()));
-    symmTensorField& fld = tfld.ref();
-
-    forAll(fld, i)
-    {
-        fld[i] = transformPrincipal(R_, st[i]);
-    }
-    return tfld;
-}
-
-
-Foam::symmTensor Foam::EulerCoordinateRotation::transformVector
-(
-    const vector& st
-) const
-{
-    return transformPrincipal(R_, st);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::EulerCoordinateRotation::EulerCoordinateRotation()
+Foam::coordinateRotations::euler::euler()
 :
-    R_(sphericalTensor::I),
-    Rtr_(sphericalTensor::I)
+    coordinateRotation(),
+    angles_(Zero),
+    degrees_(true)
 {}
 
 
-Foam::EulerCoordinateRotation::EulerCoordinateRotation
-(
-    const EulerCoordinateRotation& r
-)
+Foam::coordinateRotations::euler::euler(const euler& crot)
 :
-    R_(r.R_),
-    Rtr_(r.Rtr_)
+    coordinateRotation(crot),
+    angles_(crot.angles_),
+    degrees_(crot.degrees_)
 {}
 
 
-Foam::EulerCoordinateRotation::EulerCoordinateRotation
+Foam::coordinateRotations::euler::euler
 (
     const vector& phiThetaPsi,
-    const bool degrees
+    bool degrees
 )
 :
-    R_(rotation(phiThetaPsi, degrees)),
-    Rtr_(R_.T())
+    coordinateRotation(),
+    angles_(phiThetaPsi),
+    degrees_(degrees)
 {}
 
 
-Foam::EulerCoordinateRotation::EulerCoordinateRotation
+Foam::coordinateRotations::euler::euler
 (
-    const scalar phi,
-    const scalar theta,
-    const scalar psi,
-    const bool degrees
+    scalar phi,
+    scalar theta,
+    scalar psi,
+    bool degrees
 )
 :
-    R_(rotation(vector(phi, theta, psi), degrees)),
-    Rtr_(R_.T())
+    coordinateRotation(),
+    angles_(phi, theta, psi),
+    degrees_(degrees)
 {}
 
 
-Foam::EulerCoordinateRotation::EulerCoordinateRotation
+Foam::coordinateRotations::euler::euler(const dictionary& dict)
+:
+    coordinateRotation(),
+    angles_(dict.getCompat<vector>("angles", {{"rotation", 1806}})),
+    degrees_(dict.lookupOrDefault("degrees", true))
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::coordinateRotations::euler::clear()
+{
+    angles_ = Zero;
+    degrees_ = true;
+}
+
+
+Foam::tensor Foam::coordinateRotations::euler::R() const
+{
+    return euler::rotation(angles_, degrees_);
+}
+
+
+void Foam::coordinateRotations::euler::write(Ostream& os) const
+{
+    os  << "euler-angles(" << (degrees_ ? "deg" : "rad") << "): " << angles_;
+}
+
+
+void Foam::coordinateRotations::euler::writeEntry
 (
-    const dictionary& dict
-)
-:
-    R_
-    (
-        rotation
-        (
-            dict.get<vector>("rotation"),
-            dict.lookupOrDefault("degrees", true)
-        )
-    ),
-    Rtr_(R_.T())
-{}
+    const word& keyword,
+    Ostream& os
+) const
+{
+    os.beginBlock(keyword);
 
+    os.writeEntry("type", type());
+    os.writeEntry("angles", angles_);
+    if (!degrees_)
+    {
+        os.writeEntry("degrees", "false");
+    }
 
-Foam::EulerCoordinateRotation::EulerCoordinateRotation
-(
-    const dictionary& dict,
-    const objectRegistry&
-)
-:
-    EulerCoordinateRotation(dict)
-{}
+    os.endBlock();
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinate/rotation/EulerCoordinateRotation.H b/src/meshTools/coordinate/rotation/EulerCoordinateRotation.H
index 4a60558ff5..e30529a53d 100644
--- a/src/meshTools/coordinate/rotation/EulerCoordinateRotation.H
+++ b/src/meshTools/coordinate/rotation/EulerCoordinateRotation.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::EulerCoordinateRotation
+    Foam::coordinateRotations::euler
 
 Description
     A coordinateRotation defined in the z-x-z (intrinsic) Euler convention.
@@ -34,24 +34,29 @@ Description
     For reference and illustration, see
     https://en.wikipedia.org/wiki/Euler_angles
 
-    The rotation angles are in degrees, unless otherwise explicitly specified:
-
     \verbatim
     coordinateRotation
     {
-        type        EulerRotation;
-        degrees     false;
-        rotation    (0 0 3.141592654);
+        type    euler;
+        angles  (0 0 180);
     }
     \endverbatim
 
+    \heading Dictionary entries
+    \table
+        Property    | Description                           | Required | Default
+        type        | Type name: euler (or EulerRotation)   | yes   |
+        angles      | The z-x-z rotation angles             | yes   |
+        degrees     | Angles are in degrees                 | no    | true
+    \endtable
+
 SourceFiles
     EulerCoordinateRotation.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef EulerCoordinateRotation_H
-#define EulerCoordinateRotation_H
+#ifndef coordinateRotations_euler_H
+#define coordinateRotations_euler_H
 
 #include "coordinateRotation.H"
 
@@ -59,73 +64,62 @@ SourceFiles
 
 namespace Foam
 {
+namespace coordinateRotations
+{
 
 /*---------------------------------------------------------------------------*\
-                   Class EulerCoordinateRotation Declaration
+                 Class coordinateRotations::euler Declaration
 \*---------------------------------------------------------------------------*/
 
-class EulerCoordinateRotation
+class euler
 :
     public coordinateRotation
 {
-    // Private Member Data
+    // Private Data
 
-        //- Local-to-global transformation tensor
-        tensor R_;
+        //- The rotation angles
+        vector angles_;
 
-        //- Global-to-Local transformation tensor
-        tensor Rtr_;
+        //- Angles measured in degrees
+        bool degrees_;
 
 
 public:
 
     //- Runtime type information
-    TypeName("EulerRotation");
+    TypeNameNoDebug("euler");
 
 
     // Constructors
 
-        //- Construct null
-        EulerCoordinateRotation();
+        //- Construct null - an identity transform
+        euler();
 
-        //- Construct as copy
-        EulerCoordinateRotation(const EulerCoordinateRotation& r);
+        //- Copy construct
+        euler(const euler& crot);
 
-        //- Construct from rotation vector
-        EulerCoordinateRotation
-        (
-            const vector& phiThetaPsi,
-            const bool degrees
-        );
+        //- Construct from Euler rotation angles (z-x-z)
+        euler(const vector& phiThetaPsi, bool degrees);
 
-        //- Construct from components of rotation vector
-        EulerCoordinateRotation
-        (
-            const scalar phi,
-            const scalar theta,
-            const scalar psi,
-            const bool degrees
-        );
+        //- Construct from Euler rotation angles (z-x-z)
+        euler(scalar phi, scalar theta, scalar psi, bool degrees);
 
         //- Construct from dictionary
-        explicit EulerCoordinateRotation(const dictionary& dict);
-
-        //- Construct from dictionary and a registry (typically a mesh)
-        EulerCoordinateRotation
-        (
-            const dictionary& dict,
-            const objectRegistry& unused
-        );
+        explicit euler(const dictionary& dict);
 
         //- Return clone
         autoPtr<coordinateRotation> clone() const
         {
             return
                 autoPtr<coordinateRotation>::NewFrom
-                <EulerCoordinateRotation>(*this);
+                <coordinateRotations::euler>(*this);
         }
 
 
+    //- Destructor
+    virtual ~euler() = default;
+
+
     // Static Member Functions
 
         //- The rotation tensor calculated for the specified Euler angles
@@ -135,91 +129,29 @@ public:
 
     // Member Functions
 
-        //- Reset rotation to an identity rotation
-        virtual void clear()
-        {
-            R_ = sphericalTensor::I;
-            Rtr_ = sphericalTensor::I;
-        }
+        //- Reset specification
+        virtual void clear();
 
-        //- Update the rotation for a list of cells
-        virtual void updateCells(const polyMesh&, const labelList&)
-        {}
+        //- The rotation tensor calculated for the specified Euler angles.
+        virtual tensor R() const;
 
-        //- Return local-to-global transformation tensor
-        virtual const tensor& R() const
-        {
-            return R_;
-        }
+        //- Write information
+        virtual void write(Ostream& os) const;
 
-        //- Return global-to-local transformation tensor
-        virtual const tensor& Rtr() const
-        {
-            return Rtr_;
-        };
-
-        //- Return local Cartesian x-axis in global coordinates
-        virtual const vector e1() const
-        {
-            return Rtr_.x();
-        }
-
-        //- Return local Cartesian y-axis in global coordinates
-        virtual const vector e2() const
-        {
-            return Rtr_.y();
-        }
-
-        //- Return local Cartesian z-axis in global coordinates
-        virtual const vector e3() const
-        {
-            return Rtr_.z();
-        }
-
-        //- Return transformation tensor field
-        virtual const tensorField& Tr() const;
-
-        //- Transform vectorField using transformation tensor field
-        virtual tmp<vectorField> transform(const vectorField& st) const;
-
-        //- Transform vector using transformation tensor
-        virtual vector transform(const vector& st) const;
-
-        //- Inverse transform vectorField using transformation tensor field
-        virtual tmp<vectorField> invTransform(const vectorField& st) const;
-
-        //- Inverse transform vector using transformation tensor
-        virtual vector invTransform(const vector& st) const;
-
-        //- Transform tensor field using transformation tensorField
-        virtual tmp<tensorField> transformTensor(const tensorField& st) const;
-
-        //- Transform tensor using transformation tensorField
-        virtual tensor transformTensor(const tensor& st) const;
-
-        //- Transform tensor sub-field using transformation tensorField
-        virtual tmp<tensorField> transformTensor
-        (
-            const tensorField& st,
-            const labelList& cellMap
-        ) const;
-
-        //- Transform vectorField using transformation tensorField and return
-        // symmetrical tensorField
-        virtual tmp<symmTensorField> transformVector
-        (
-            const vectorField& st
-        ) const;
-
-        //- Transform vector using transformation tensor and return
-        // symmetrical tensor
-        virtual symmTensor transformVector(const vector& st) const;
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const;
 
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace coordinateRotations
+
+
+//- Compatibility typedef 1806
+typedef coordinateRotations::euler EulerCoordinateRotation;
+
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.C b/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.C
index 00276ca92d..0074ce3250 100644
--- a/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.C
+++ b/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.C
@@ -31,128 +31,37 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(STARCDCoordinateRotation, 0);
-    addToRunTimeSelectionTable
-    (
-        coordinateRotation,
-        STARCDCoordinateRotation,
-        dictionary
-    );
-    addToRunTimeSelectionTable
-    (
-        coordinateRotation,
-        STARCDCoordinateRotation,
-        objectRegistry
-    );
-}
-
-
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-Foam::vector Foam::STARCDCoordinateRotation::transform(const vector& st) const
-{
-    return (R_ & st);
-}
-
-
-Foam::vector Foam::STARCDCoordinateRotation::invTransform
-(
-    const vector& st
-) const
-{
-    return (Rtr_ & st);
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::STARCDCoordinateRotation::transform
-(
-    const vectorField& st
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::STARCDCoordinateRotation::invTransform
-(
-    const vectorField& st
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-const Foam::tensorField& Foam::STARCDCoordinateRotation::Tr() const
-{
-    NotImplemented;
-    return NullObjectRef<tensorField>();
-}
-
-
-Foam::tmp<Foam::tensorField> Foam::STARCDCoordinateRotation::transformTensor
-(
-    const tensorField& st
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-Foam::tensor Foam::STARCDCoordinateRotation::transformTensor
-(
-    const tensor& st
-) const
-{
-    return (R_ & st & Rtr_);
-}
-
-
-Foam::tmp<Foam::tensorField> Foam::STARCDCoordinateRotation::transformTensor
-(
-    const tensorField& st,
-    const labelList& cellMap
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-Foam::tmp<Foam::symmTensorField> Foam::STARCDCoordinateRotation::
-transformVector
-(
-    const vectorField& st
-) const
-{
-    tmp<symmTensorField> tfld(new symmTensorField(st.size()));
-    symmTensorField& fld = tfld.ref();
-
-    forAll(fld, i)
+    namespace coordinateRotations
     {
-        fld[i] = transformPrincipal(R_, st[i]);
+        defineTypeName(starcd);
+
+        // Standard short name
+        addNamedToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            starcd,
+            dictionary,
+            starcd
+        );
+
+        // Longer name - Compat 1806
+        addNamedToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            starcd,
+            dictionary,
+            STARCDRotation
+        );
     }
-    return tfld;
-}
-
-
-Foam::symmTensor Foam::STARCDCoordinateRotation::transformVector
-(
-    const vector& st
-) const
-{
-    return transformPrincipal(R_, st);
 }
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::tensor Foam::STARCDCoordinateRotation::rotation
+Foam::tensor Foam::coordinateRotations::starcd::rotation
 (
     const vector& angles,
-    const bool degrees
+    bool degrees
 )
 {
     scalar z = angles.component(vector::X);    // 1. Rotate about Z
@@ -170,7 +79,6 @@ Foam::tensor Foam::STARCDCoordinateRotation::rotation
     const scalar cy = cos(y);  const scalar sy = sin(y);
     const scalar cz = cos(z);  const scalar sz = sin(z);
 
-
     return
         tensor
         (
@@ -183,72 +91,94 @@ Foam::tensor Foam::STARCDCoordinateRotation::rotation
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::STARCDCoordinateRotation::STARCDCoordinateRotation()
+Foam::coordinateRotations::starcd::starcd()
 :
-    R_(sphericalTensor::I),
-    Rtr_(sphericalTensor::I)
+    coordinateRotation(),
+    angles_(Zero),
+    degrees_(true)
 {}
 
 
-Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
-(
-    const STARCDCoordinateRotation& r
-)
+Foam::coordinateRotations::starcd::starcd(const starcd& crot)
 :
-    R_(r.R_),
-    Rtr_(r.Rtr_)
+    coordinateRotation(crot),
+    angles_(crot.angles_),
+    degrees_(crot.degrees_)
 {}
 
 
-Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
+Foam::coordinateRotations::starcd::starcd
 (
     const vector& rotZrotXrotY,
-    const bool degrees
+    bool degrees
 )
 :
-    R_(rotation(rotZrotXrotY, degrees)),
-    Rtr_(R_.T())
+    coordinateRotation(),
+    angles_(rotZrotXrotY),
+    degrees_(degrees)
 {}
 
 
-Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
+Foam::coordinateRotations::starcd::starcd
 (
-    const scalar rotZ,
-    const scalar rotX,
-    const scalar rotY,
-    const bool degrees
+    scalar rotZ,
+    scalar rotX,
+    scalar rotY,
+    bool degrees
 )
 :
-    R_(rotation(vector(rotZ, rotX, rotY), degrees)),
-    Rtr_(R_.T())
+    coordinateRotation(),
+    angles_(rotZ, rotX, rotY),
+    degrees_(degrees)
 {}
 
 
-Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
+Foam::coordinateRotations::starcd::starcd(const dictionary& dict)
+:
+    coordinateRotation(),
+    angles_(dict.getCompat<vector>("angles", {{"rotation", 1806}})),
+    degrees_(dict.lookupOrDefault("degrees", true))
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::coordinateRotations::starcd::clear()
+{
+    angles_ = Zero;
+    degrees_ = true;
+}
+
+
+Foam::tensor Foam::coordinateRotations::starcd::R() const
+{
+    return starcd::rotation(angles_, degrees_);
+}
+
+
+void Foam::coordinateRotations::starcd::write(Ostream& os) const
+{
+    os  << "starcd-angles(" << (degrees_ ? "deg" : "rad") << "): " << angles_;
+}
+
+
+void Foam::coordinateRotations::starcd::writeEntry
 (
-    const dictionary& dict
-)
-:
-    R_
-    (
-        rotation
-        (
-            dict.get<vector>("rotation"),
-            dict.lookupOrDefault("degrees", true)
-        )
-    ),
-    Rtr_(R_.T())
-{}
+    const word& keyword,
+    Ostream& os
+) const
+{
+    os.beginBlock(keyword);
 
+    os.writeEntry("type", type());
+    os.writeEntry("angles", angles_);
+    if (!degrees_)
+    {
+        os.writeEntry("degrees", "false");
+    }
 
-Foam::STARCDCoordinateRotation::STARCDCoordinateRotation
-(
-    const dictionary& dict,
-    const objectRegistry&
-)
-:
-    STARCDCoordinateRotation(dict)
-{}
+    os.endBlock();
+}
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.H b/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.H
index a6094a8653..f10ac9f80f 100644
--- a/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.H
+++ b/src/meshTools/coordinate/rotation/STARCDCoordinateRotation.H
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::STARCDCoordinateRotation
+    Foam::coordinateRotations::starcd
 
 Description
     A coordinateRotation defined by the STAR-CD convention.
@@ -36,19 +36,26 @@ Description
     \verbatim
     coordinateRotation
     {
-        type        STARCDRotation;
-        degrees     false;
-        rotation    (0 0 3.141592654);
+        type    starcd;
+        angles  (0 0 180);
     }
     \endverbatim
 
+    \heading Dictionary entries
+    \table
+        Property    | Description                           | Required | Default
+        type        | Type name: starcd (or STARCDRotation) | yes   |
+        angles      | The z-x-y rotation angles             | yes   |
+        degrees     | Angles are in degrees                 | no    | true
+    \endtable
+
 SourceFiles
     STARCDCoordinateRotation.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef STARCDCoordinateRotation_H
-#define STARCDCoordinateRotation_H
+#ifndef coordinateRotations_starcd_H
+#define coordinateRotations_starcd_H
 
 #include "coordinateRotation.H"
 
@@ -56,74 +63,62 @@ SourceFiles
 
 namespace Foam
 {
+namespace coordinateRotations
+{
 
 /*---------------------------------------------------------------------------*\
-                  Class STARCDCoordinateRotation Declaration
+                 Class coordinateRotations::starcd Declaration
 \*---------------------------------------------------------------------------*/
 
-class STARCDCoordinateRotation
+class starcd
 :
     public coordinateRotation
 {
-    // Private Member Data
+    // Private Data
 
-        //- Local-to-Global transformation tensor
-        tensor R_;
+        //- The rotation angles
+        vector angles_;
 
-        //- Global-to-Local transformation tensor
-        tensor Rtr_;
+        //- Angles measured in degrees
+        bool degrees_;
 
 
 public:
 
     //- Runtime type information
-    TypeName("STARCDRotation");
+    TypeNameNoDebug("starcd");
 
 
     // Constructors
 
-        //- Construct null
-        STARCDCoordinateRotation();
+        //- Construct null - an identity transform
+        starcd();
 
-        //- Construct as copy
-        STARCDCoordinateRotation(const STARCDCoordinateRotation& r);
+        //- Copy construct
+        starcd(const starcd& crot);
 
         //- Construct from rotation vector
-        STARCDCoordinateRotation
-        (
-            const vector& rotZrotXrotY,
-            const bool degrees
-        );
+        starcd(const vector& rotZrotXrotY, bool degrees);
 
         //- Construct from components of rotation vector
-        STARCDCoordinateRotation
-        (
-            const scalar rotZ,
-            const scalar rotX,
-            const scalar rotY,
-            const bool degrees
-        );
+        starcd(scalar rotZ, scalar rotX, scalar rotY, bool degrees);
 
         //- Construct from dictionary
-        explicit STARCDCoordinateRotation(const dictionary& dict);
-
-        //- Construct from dictionary and a registry (typically a mesh)
-        STARCDCoordinateRotation
-        (
-            const dictionary& dict,
-            const objectRegistry& unused
-        );
-
+        explicit starcd(const dictionary& dict);
 
         //- Return clone
         autoPtr<coordinateRotation> clone() const
         {
             return
                 autoPtr<coordinateRotation>::NewFrom
-                <STARCDCoordinateRotation>(*this);
+                <coordinateRotations::starcd>(*this);
         }
 
 
+    //- Destructor
+    virtual ~starcd() = default;
+
+
     // Static Member Functions
 
         //- The rotation tensor calculated for the specified STARCD angles
@@ -133,91 +128,29 @@ public:
 
     // Member Functions
 
-        //- Reset rotation to an identity rotation
-        virtual void clear()
-        {
-            R_ = sphericalTensor::I;
-            Rtr_ = sphericalTensor::I;
-        }
+        //- Reset specification
+        virtual void clear();
 
-        //- Update the rotation for a list of cells
-        virtual void updateCells(const polyMesh&, const labelList&)
-        {}
+        //- The rotation tensor calculated for the specified STARCD angles.
+        virtual tensor R() const;
 
-        //- Return local-to-global transformation tensor
-        virtual const tensor& R() const
-        {
-            return R_;
-        }
+        //- Write information
+        virtual void write(Ostream& os) const;
 
-        //- Return global-to-local transformation tensor
-        virtual const tensor& Rtr() const
-        {
-            return Rtr_;
-        };
-
-        //- Return local Cartesian x-axis in global coordinates
-        virtual const vector e1() const
-        {
-            return Rtr_.x();
-        }
-
-        //- Return local Cartesian y-axis in global coordinates
-        virtual const vector e2() const
-        {
-            return Rtr_.y();
-        }
-
-        //- Return local Cartesian z-axis in global coordinates
-        virtual const vector e3() const
-        {
-            return Rtr_.z();
-        }
-
-        //- Return transformation tensor field
-        virtual const tensorField& Tr() const;
-
-        //- Transform vectorField using transformation tensor field
-        virtual tmp<vectorField> transform(const vectorField& st) const;
-
-        //- Transform vector using transformation tensor
-        virtual vector transform(const vector& st) const;
-
-        //- Inverse transform vectorField using transformation tensor field
-        virtual tmp<vectorField> invTransform(const vectorField& st) const;
-
-        //- Inverse transform vector using transformation tensor
-        virtual vector invTransform(const vector& st) const;
-
-        //- Transform tensor field using transformation tensorField
-        virtual tmp<tensorField> transformTensor(const tensorField& st) const;
-
-        //- Transform tensor using transformation tensorField
-        virtual tensor transformTensor(const tensor& st) const;
-
-        //- Transform tensor sub-field using transformation tensorField
-        virtual tmp<tensorField> transformTensor
-        (
-            const tensorField& st,
-            const labelList& cellMap
-        ) const;
-
-        //- Transform vectorField using transformation tensorField and return
-        // symmetrical tensorField
-        virtual tmp<symmTensorField> transformVector
-        (
-            const vectorField& st
-        ) const;
-
-        //- Transform vector using transformation tensor and return
-        // symmetrical tensor
-        virtual symmTensor transformVector(const vector& st) const;
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const;
 
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace coordinateRotations
+
+
+//- Compatibility typedef 1806
+typedef coordinateRotations::starcd STARCDCoordinateRotation;
+
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinate/rotation/axesRotation.C b/src/meshTools/coordinate/rotation/axesRotation.C
index e40e11fe9e..8534d82460 100644
--- a/src/meshTools/coordinate/rotation/axesRotation.C
+++ b/src/meshTools/coordinate/rotation/axesRotation.C
@@ -31,25 +31,34 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(axesRotation, 0);
-    addToRunTimeSelectionTable
-    (
-        coordinateRotation,
-        axesRotation,
-        dictionary
-    );
-    addToRunTimeSelectionTable
-    (
-        coordinateRotation,
-        axesRotation,
-        objectRegistry
-    );
+    namespace coordinateRotations
+    {
+        defineTypeName(axes);
+
+        // Standard short name
+        addNamedToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            axes,
+            dictionary,
+            axes
+        );
+
+        // Longer name - Compat 1806
+        addNamedToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            axes,
+            dictionary,
+            axesRotation
+        );
+    }
 }
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::tensor Foam::axesRotation::rotation
+Foam::tensor Foam::coordinateRotations::axes::rotation
 (
     const vector& axis1,
     const vector& axis2,
@@ -143,221 +152,193 @@ Foam::tensor Foam::axesRotation::rotation
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::axesRotation::read(const dictionary& dict)
+void Foam::coordinateRotations::axes::read(const dictionary& dict)
 {
-    vector axis1, axis2;
-    axisOrder order = E3_E1;
-
     if
     (
-        dict.readIfPresent("e1", axis1)
-     && dict.readIfPresent("e2", axis2)
+        dict.readIfPresent("e1", axis1_)
+     && dict.readIfPresent("e2", axis2_)
     )
     {
-        order = E1_E2;
+        order_ = E1_E2;
     }
     else if
     (
-        dict.readIfPresent("e2", axis1)
-     && dict.readIfPresent("e3", axis2)
+        dict.readIfPresent("e2", axis1_)
+     && dict.readIfPresent("e3", axis2_)
     )
     {
-        order = E2_E3;
+        order_ = E2_E3;
     }
     else if
     (
-        dict.readIfPresent("e3", axis1)
-     && dict.readIfPresent("e1", axis2)
+        dict.readIfPresent("e3", axis1_)
+     && dict.readIfPresent("e1", axis2_)
     )
     {
-        order = E3_E1;
+        order_ = E3_E1;
     }
     else if
     (
-        dict.readIfPresent("axis", axis1)
-     && dict.readIfPresent("direction", axis2)
+        dict.readIfPresent("axis", axis1_)
+     && dict.readIfPresent("direction", axis2_)
     )
     {
-        order = E3_E1_COMPAT;
+        order_ = E3_E1_COMPAT;
     }
     else
     {
-        FatalErrorInFunction
+        FatalIOErrorInFunction(dict)
             << "No entries of the type (e1, e2) or (e2, e3) or (e3, e1) found"
-            << exit(FatalError);
+            << exit(FatalIOError);
     }
-
-    R_ = rotation(axis1, axis2, order);
-    Rtr_ = R_.T();
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::axesRotation::axesRotation()
+Foam::coordinateRotations::axes::axes()
 :
-    R_(sphericalTensor::I),
-    Rtr_(sphericalTensor::I)
+    coordinateRotation(),
+    axis1_(0,0,1),  // e3 = global Z
+    axis2_(1,0,0),  // e1 = global X
+    order_(E3_E1)
 {}
 
 
-Foam::axesRotation::axesRotation(const axesRotation& r)
+Foam::coordinateRotations::axes::axes(const axes& crot)
 :
-    R_(r.R_),
-    Rtr_(r.Rtr_)
+    coordinateRotation(crot),
+    axis1_(crot.axis1_),
+    axis2_(crot.axis2_),
+    order_(crot.order_)
 {}
 
 
-Foam::axesRotation::axesRotation(const tensor& R)
+Foam::coordinateRotations::axes::axes(axes&& crot)
 :
-    R_(R),
-    Rtr_(R_.T())
+    coordinateRotation(std::move(crot)),
+    axis1_(std::move(crot.axis1_)),
+    axis2_(std::move(crot.axis2_)),
+    order_(crot.order_)
 {}
 
 
-Foam::axesRotation::axesRotation
+Foam::coordinateRotations::axes::axes
 (
-    const vector& axis,
-    const vector& dir,
-    const axisOrder& order
+    const vector& axis1,
+    const vector& axis2,
+    axisOrder order
 )
 :
-    R_(rotation(axis, dir, order)),
-    Rtr_(R_.T())
+    coordinateRotation(),
+    axis1_(axis1),
+    axis2_(axis2),
+    order_(order)
 {}
 
 
-Foam::axesRotation::axesRotation
-(
-    const vector& axis
-)
+Foam::coordinateRotations::axes::axes(const vector& axis)
 :
-    R_(rotation(axis, findOrthogonal(axis), E3_E1)),
-    Rtr_(R_.T())
+    coordinateRotations::axes(axis, Zero, E3_E1_COMPAT)  // Guess second axis
 {}
 
 
-Foam::axesRotation::axesRotation
-(
-    const dictionary& dict
-)
+Foam::coordinateRotations::axes::axes(const dictionary& dict)
 :
-    R_(sphericalTensor::I),
-    Rtr_(sphericalTensor::I)
+    coordinateRotations::axes()
 {
     read(dict);
 }
 
 
-Foam::axesRotation::axesRotation
-(
-    const dictionary& dict,
-    const objectRegistry&
-)
-:
-    axesRotation(dict)
-{}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-const Foam::tensorField& Foam::axesRotation::Tr() const
+void Foam::coordinateRotations::axes::clear()
 {
-    NotImplemented;
-    return NullObjectRef<tensorField>();
+    axis1_ = vector(0,0,1);  // e3 = global Z
+    axis2_ = vector(1,0,0);  // e1 = global X
+    order_ = E3_E1;
 }
 
 
-Foam::tmp<Foam::vectorField> Foam::axesRotation::transform
-(
-    const vectorField& st
-) const
+Foam::tensor Foam::coordinateRotations::axes::R() const
 {
-    return (R_ & st);
+    return axes::rotation(axis1_, axis2_, order_);
 }
 
 
-Foam::vector Foam::axesRotation::transform(const vector& st) const
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::coordinateRotations::axes::write(Ostream& os) const
 {
-    return (R_ & st);
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::axesRotation::invTransform
-(
-    const vectorField& st
-) const
-{
-    return (Rtr_ & st);
-}
-
-
-Foam::vector Foam::axesRotation::invTransform(const vector& st) const
-{
-    return (Rtr_ & st);
-}
-
-
-Foam::tmp<Foam::tensorField> Foam::axesRotation::transformTensor
-(
-    const tensorField& st
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-Foam::tensor Foam::axesRotation::transformTensor
-(
-    const tensor& st
-) const
-{
-    return (R_ & st & Rtr_);
-}
-
-
-Foam::tmp<Foam::tensorField> Foam::axesRotation::transformTensor
-(
-    const tensorField& st,
-    const labelList& cellMap
-) const
-{
-    NotImplemented;
-    return nullptr;
-}
-
-
-Foam::tmp<Foam::symmTensorField> Foam::axesRotation::transformVector
-(
-    const vectorField& st
-) const
-{
-    tmp<symmTensorField> tfld(new symmTensorField(st.size()));
-    symmTensorField& fld = tfld.ref();
-
-    forAll(fld, i)
+    switch (order_)
     {
-        fld[i] = transformPrincipal(R_, st[i]);
+        case E1_E2:
+            os << "e1: " << axis1_ << " e2: " << axis2_;
+            break;
+        case E2_E3:
+            os << "e2: " << axis1_ << " e3: " << axis2_;
+            break;
+        case E3_E1:
+            os << "e1: " << axis2_ << " e3: " << axis1_;
+            break;
+        case E3_E1_COMPAT:
+            os << "axis: " << axis1_ << " direction: " << axis2_;
+            break;
     }
-    return tfld;
 }
 
 
-Foam::symmTensor Foam::axesRotation::transformVector
+void Foam::coordinateRotations::axes::writeEntry
 (
-    const vector& st
+    const word& keyword,
+    Ostream& os
 ) const
 {
-    return transformPrincipal(R_, st);
-}
+    // We permit direct embedding of the axes specification without
+    // requiring a sub-dictionary.
 
+    const bool subDict = !keyword.empty();
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+    if (subDict)
+    {
+        os.beginBlock(keyword);
+        os.writeEntry("type", type());
+    }
 
-void Foam::axesRotation::operator=(const dictionary& dict)
-{
-    read(dict);
+    switch (order_)
+    {
+        case E1_E2:
+        {
+            os.writeEntry("e1", axis1_);
+            os.writeEntry("e2", axis2_);
+            break;
+        }
+        case E2_E3:
+        {
+            os.writeEntry("e2", axis1_);
+            os.writeEntry("e3", axis2_);
+            break;
+        }
+        case E3_E1:
+        {
+            os.writeEntry("e1", axis2_);
+            os.writeEntry("e3", axis1_);
+            break;
+        }
+        case E3_E1_COMPAT:
+        {
+            os.writeEntry("axis", axis1_);
+            os.writeEntry("direction", axis2_);
+            break;
+        }
+    }
+
+    if (subDict)
+    {
+        os.endBlock();
+    }
 }
 
 
diff --git a/src/meshTools/coordinate/rotation/axesRotation.H b/src/meshTools/coordinate/rotation/axesRotation.H
index 3a3583211b..cb5fcd3136 100644
--- a/src/meshTools/coordinate/rotation/axesRotation.H
+++ b/src/meshTools/coordinate/rotation/axesRotation.H
@@ -22,48 +22,59 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::axesRotation
+    Foam::coordinateRotations::axes
 
 Description
-    A coordinate rotation specified using global axes
+    A coordinateRotation specified using global axes.
 
     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. In terms of cylindrical coordinates, the 'axis' would
-    correspond to the \a z-axis and the 'direction' to the \a r-axis.
+    or (e3/e1). Any nonorthogonality is absorbed into the second vector.
 
     \verbatim
-    axesRotation
+    coordinateRotation
     {
-        type        axesRotation;
+        type        axes;
         e1          (1 0 0);
         e2          (0 1 0);
     }
     \endverbatim
 
+    \heading Dictionary entries
+    \table
+        Property    | Description                       | Required  | Default
+        type        | type name: axes (previously axesRotation)     | yes   |
+        e1          | local x-axis                      | partly    |
+        e2          | local y-axis                      | partly    |
+        e3          | local z-axis                      | partly    |
+    \endtable
+
+Note
+    It is also possible to specify in terms of \c axis and \c direction.
+    For cylindrical coordinates, the \c axis would correspond to the
+    \a z-axis and the \c direction to the \a r-axis.
+
 SourceFiles
     axesRotation.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef axesRotation_H
-#define axesRotation_H
+#ifndef coordinateRotations_axes_H
+#define coordinateRotations_axes_H
 
-#include "vector.H"
 #include "coordinateRotation.H"
-#include "dictionary.H"
-#include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace coordinateRotations
+{
 
 /*---------------------------------------------------------------------------*\
-                    Class axesRotation Declaration
+                  Class coordinateRotations::axes Declaration
 \*---------------------------------------------------------------------------*/
 
-class axesRotation
+class axes
 :
     public coordinateRotation
 {
@@ -76,19 +87,22 @@ public:
         E1_E2,  //!< The axis1 (dominant) is local X, axis2 is local Y.
         E2_E3,  //!< The axis1 (dominant) is local Y, axis2 is local Z.
         E3_E1,  //!< The axis1 (dominant) is local Z, axis2 is local X.
-        E3_E1_COMPAT, //!< E3_E1 specified as axis/direction.
+        E3_E1_COMPAT  //!< E3_E1 specified as axis/direction.
     };
 
 
-private:
+protected:
 
-    // Private data
+    // Protected Data
 
-        //- Local-to-Global transformation tensor
-        tensor R_;
+        //- The primary axis
+        vector axis1_;
 
-        //- Global-to-Local transformation tensor
-        tensor Rtr_;
+        //- The secondary axis
+        vector axis2_;
+
+        //- The axis order
+        axisOrder order_;
 
 
     // Protected Member Functions
@@ -100,67 +114,52 @@ private:
 public:
 
     //- Runtime type information
-    TypeName("axesRotation");
+    TypeNameNoDebug("axes");
+
 
     // Constructors
 
-        //- Construct null
-        axesRotation();
+        //- Construct null - an identity transform
+        axes();
 
-        //- Construct as copy
-        axesRotation(const axesRotation& r);
+        //- Copy construct
+        axes(const axes& crot);
 
-        //- Construct from local to global rotation matrix
-        explicit axesRotation(const tensor& R);
+        //- Move construct
+        axes(axes&& crot);
 
-        //- Construct from two axes (axis and direction)
-        axesRotation
-        (
-            const vector& axis,
-            const vector& dir,
-            const axisOrder& order = E3_E1
-        );
+        //- Construct from two axes
+        axes(const vector& axis1, const vector& axis2, axisOrder order=E3_E1);
 
-        //- Construct from a single axis using a best-guess for the second axis
-        //  For the best-guess, the largest component value and sign of the
-        //  axis determines the direction orientation.
-        explicit axesRotation(const vector& axis);
+        //- Construct from a single axis (as e3) using a best-guess for the
+        //- second axis.
+        //  The largest component and its sign are used when guessing
+        //  an appropriate orientation (direction).
+        explicit axes(const vector& axis);
 
         //- Construct from dictionary
-        explicit axesRotation(const dictionary& dict);
-
-        //- Construct from dictionary and a registry (typically a mesh)
-        axesRotation
-        (
-            const dictionary& dict,
-            const objectRegistry& unused
-        );
+        explicit axes(const dictionary& dict);
 
         //- Return clone
         autoPtr<coordinateRotation> clone() const
         {
-            return autoPtr<coordinateRotation>::NewFrom<axesRotation>(*this);
+            return
+                autoPtr<coordinateRotation>::NewFrom
+                <coordinateRotations::axes>(*this);
         }
 
 
     //- Destructor
-    virtual ~axesRotation() = default;
-
-
-    // Member Functions
-
-        //- Reset rotation to an identity rotation
-        virtual void clear()
-        {
-            R_ = sphericalTensor::I;
-            Rtr_ = sphericalTensor::I;
-        }
+    virtual ~axes() = default;
 
 
     // Static Member Functions
 
         //- The rotation tensor calculated from two axes and their order.
         //  The input axes will be normalised.
+        //  If axis2 is zero, an axis orthogonal to axis1 will be guessed.
+        //  The largest component and its sign are used when guessing
+        //  an appropriate orientation (direction).
         static tensor rotation
         (
             const vector& axis1,
@@ -169,90 +168,29 @@ public:
         );
 
 
-        //- Update the rotation for a list of cells
-        virtual void updateCells(const polyMesh&, const labelList&)
-        {}
+    // Member Functions
 
-        //- Return local-to-global transformation tensor
-        virtual const tensor& R() const
-        {
-            return R_;
-        }
+        //- Reset specification
+        virtual void clear();
 
-        //- Return global-to-local transformation tensor
-        virtual const tensor& Rtr() const
-        {
-            return Rtr_;
-        }
+        //- The rotation tensor calculated from the specified axes and order
+        virtual tensor R() const;
 
-        //- Return local Cartesian x-axis in global coordinates
-        virtual const vector e1() const
-        {
-            return Rtr_.x();
-        }
-
-        //- Return local Cartesian y-axis in global coordinates
-        virtual const vector e2() const
-        {
-            return Rtr_.y();
-        }
-
-        //- Return local Cartesian z-axis in global coordinates
-        virtual const vector e3() const
-        {
-            return Rtr_.z();
-        }
-
-        //- Return transformation tensor field
-        virtual const tensorField& Tr() const;
-
-        //- Transform vectorField using transformation tensor field
-        virtual tmp<vectorField> transform(const vectorField& st) const;
-
-        //- Transform vector using transformation tensor
-        virtual vector transform(const vector& st) const;
-
-        //- Inverse transform vectorField using transformation tensor field
-        virtual tmp<vectorField> invTransform(const vectorField& st) const;
-
-        //- Inverse transform vector using transformation tensor
-        virtual vector invTransform(const vector& st) const;
-
-        //- Transform tensor field using transformation tensorField
-        virtual tmp<tensorField> transformTensor(const tensorField& st) const;
-
-        //- Transform tensor using transformation tensorField
-        virtual tensor transformTensor(const tensor& st) const;
-
-        //- Transform tensor sub-field using transformation tensorField
-        virtual tmp<tensorField> transformTensor
-        (
-            const tensorField& st,
-            const labelList& cellMap
-        ) const;
-
-        //- Transform vectorField using transformation tensorField and return
-        //  symmetric tensorField
-        virtual tmp<symmTensorField> transformVector
-        (
-            const vectorField& st
-        ) const;
-
-        //- Transform vector using transformation tensor and return
-        //  symmetric tensor
-        virtual symmTensor transformVector(const vector& st) const;
-
-
-    // Member Operators
-
-        //- Assign from dictionary
-        void operator=(const dictionary& dict);
+        //- Write information
+        virtual void write(Ostream& os) const;
 
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace coordinateRotations
+
+// Compatibility typedef 1806
+typedef coordinateRotations::axes axesRotation;
+
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/coordinate/rotation/axisAngleRotation.C b/src/meshTools/coordinate/rotation/axisAngleRotation.C
new file mode 100644
index 0000000000..97a7f70d89
--- /dev/null
+++ b/src/meshTools/coordinate/rotation/axisAngleRotation.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "axisAngleRotation.H"
+#include "dictionary.H"
+#include "quaternion.H"
+#include "unitConversion.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace coordinateRotations
+    {
+        defineTypeName(axisAngle);
+        addToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            axisAngle,
+            dictionary
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::coordinateRotations::axisAngle::checkSpec()
+{
+    if (mag(angle_) < VSMALL || mag(axis_) < SMALL)
+    {
+        clear(); // identity rotation
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::coordinateRotations::axisAngle::axisAngle()
+:
+    coordinateRotation(),
+    axis_ (0,0,1),  // e3 = global Z
+    angle_(Zero),
+    degrees_(true)
+{}
+
+
+Foam::coordinateRotations::axisAngle::axisAngle(const axisAngle& crot)
+:
+    coordinateRotation(crot),
+    axis_(crot.axis_),
+    angle_(crot.angle_),
+    degrees_(crot.degrees_)
+{
+    checkSpec();
+}
+
+
+Foam::coordinateRotations::axisAngle::axisAngle(axisAngle&& crot)
+:
+    coordinateRotation(std::move(crot)),
+    axis_(std::move(crot.axis_)),
+    angle_(std::move(crot.angle_)),
+    degrees_(crot.degrees_)
+{
+    checkSpec();
+}
+
+
+Foam::coordinateRotations::axisAngle::axisAngle
+(
+    const vector& axis,
+    scalar angle,
+    bool degrees
+)
+:
+    coordinateRotation(),
+    axis_(axis),
+    angle_(angle),
+    degrees_(degrees)
+{
+    checkSpec();
+}
+
+
+Foam::coordinateRotations::axisAngle::axisAngle(const dictionary& dict)
+:
+    axisAngle
+    (
+        dict.get<vector>("axis"),
+        dict.get<scalar>("angle"),
+        dict.lookupOrDefault("degrees", true)
+    )
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::coordinateRotations::axisAngle::clear()
+{
+    axis_  = vector(0,0,1);  // e3 = global Z
+    angle_ = Zero;
+}
+
+
+Foam::tensor Foam::coordinateRotations::axisAngle::R() const
+{
+    if (mag(angle_) < VSMALL || mag(axis_) < SMALL)
+    {
+        return sphericalTensor::I; // identity rotation
+    }
+
+    return quaternion(axis_, (degrees_ ? degToRad(angle_) : angle_)).R();
+}
+
+
+void Foam::coordinateRotations::axisAngle::write(Ostream& os) const
+{
+    os  << "rotation axis: " << axis_
+        << " angle(" << (degrees_ ? "deg" : "rad") << "): " << angle_;
+}
+
+
+void Foam::coordinateRotations::axisAngle::writeEntry
+(
+    const word& keyword,
+    Ostream& os
+) const
+{
+    os.beginBlock(keyword);
+
+    os.writeEntry("type", type());
+    os.writeEntry("axis",  axis_);
+    os.writeEntry("angle", angle_);
+    if (!degrees_)
+    {
+        os.writeEntry("degrees", "false");
+    }
+
+    os.endBlock();
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/rotation/axisAngleRotation.H b/src/meshTools/coordinate/rotation/axisAngleRotation.H
new file mode 100644
index 0000000000..a08053400d
--- /dev/null
+++ b/src/meshTools/coordinate/rotation/axisAngleRotation.H
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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::coordinateRotations::axisAngle
+
+Description
+    A coordinateRotation specified by a rotation axis and a rotation angle
+    about that axis.
+
+    \verbatim
+    coordinateRotation
+    {
+        type        axisAngle;
+        axis        (1 0 0);
+        angle       90;
+    }
+    \endverbatim
+
+    \heading Dictionary entries
+    \table
+        Property    | Description                           | Required | Default
+        type        | Type name: axisAngle                  | yes   |
+        axis        | Axis of rotation (vector)             | yes   |
+        angle       | Rotation angle                        | yes   |
+        degrees     | The angle is in degrees               | no    | true
+    \endtable
+
+Note
+    The rotation axis will be normalized internally.
+
+SourceFiles
+    axisAngle.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef coordinateRotations_axisAngle_H
+#define coordinateRotations_axisAngle_H
+
+#include "coordinateRotation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace coordinateRotations
+{
+
+/*---------------------------------------------------------------------------*\
+               Class coordinateRotations::axisAngle Declaration
+\*---------------------------------------------------------------------------*/
+
+class axisAngle
+:
+    public coordinateRotation
+{
+    // Private Data
+
+        //- The rotation axis
+        vector axis_;
+
+        //- The rotation angle
+        scalar angle_;
+
+        //- Angle measured in degrees
+        bool degrees_;
+
+
+    // Private Member Functions
+
+        //- Check specification for an identity rotation
+        void checkSpec();
+
+
+public:
+
+    //- Runtime type information
+    TypeNameNoDebug("axisAngle");
+
+    // Constructors
+
+        //- Construct null
+        axisAngle();
+
+        //- Copy construct
+        axisAngle(const axisAngle& crot);
+
+        //- Move construct
+        axisAngle(axisAngle&& crot);
+
+        //- Construct from axis and angle
+        axisAngle(const vector& axis, scalar angle, bool degrees);
+
+        //- Construct from dictionary
+        explicit axisAngle(const dictionary& dict);
+
+        //- Return clone
+        autoPtr<coordinateRotation> clone() const
+        {
+            return
+                autoPtr<coordinateRotation>::NewFrom
+                <coordinateRotations::axisAngle>(*this);
+        }
+
+
+    //- Destructor
+    virtual ~axisAngle() = default;
+
+
+    // Member Functions
+
+        //- Reset specification
+        virtual void clear();
+
+        //- Calculate and return the rotation tensor
+        //- calculated from axis and angle
+        virtual tensor R() const;
+
+        //- Write information
+        virtual void write(Ostream& os) const;
+
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace coordinateRotations
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/rotation/coordinateRotation.C b/src/meshTools/coordinate/rotation/coordinateRotation.C
index 41892d013d..3cf52ef1a4 100644
--- a/src/meshTools/coordinate/rotation/coordinateRotation.C
+++ b/src/meshTools/coordinate/rotation/coordinateRotation.C
@@ -31,9 +31,8 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(coordinateRotation, 0);
+    defineTypeName(coordinateRotation);
     defineRunTimeSelectionTable(coordinateRotation, dictionary);
-    defineRunTimeSelectionTable(coordinateRotation, objectRegistry);
 }
 
 
@@ -64,46 +63,28 @@ Foam::vector Foam::coordinateRotation::findOrthogonal(const vector& axis)
 }
 
 
-Foam::symmTensor Foam::coordinateRotation::transformPrincipal
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
 (
-    const tensor& tt,
-    const vector& v
+    const dictionary& dict
 )
 {
-    return symmTensor
-    (
-        tt.xx()*v.x()*tt.xx()
-      + tt.xy()*v.y()*tt.xy()
-      + tt.xz()*v.z()*tt.xz(),
+    const word modelType(dict.get<word>("type"));
 
-        tt.xx()*v.x()*tt.yx()
-      + tt.xy()*v.y()*tt.yy()
-      + tt.xz()*v.z()*tt.yz(),
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
-        tt.xx()*v.x()*tt.zx()
-      + tt.xy()*v.y()*tt.zy()
-      + tt.xz()*v.z()*tt.zz(),
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInFunction(dict)
+            << "Unknown coordinateRotation type "
+            << modelType << nl << nl
+            << "Valid types: "
+            << flatOutput(dictionaryConstructorTablePtr_->sortedToc())
+            << exit(FatalIOError);
+    }
 
-        tt.yx()*v.x()*tt.yx()
-      + tt.yy()*v.y()*tt.yy()
-      + tt.yz()*v.z()*tt.yz(),
-
-        tt.yx()*v.x()*tt.zx()
-      + tt.yy()*v.y()*tt.zy()
-      + tt.yz()*v.z()*tt.zz(),
-
-        tt.zx()*v.x()*tt.zx()
-      + tt.zy()*v.y()*tt.zy()
-      + tt.zz()*v.z()*tt.zz()
-    );
-}
-
-
-void Foam::coordinateRotation::write(Ostream& os) const
-{
-     os.writeEntry("e1", e1());
-     os.writeEntry("e2", e2());
-     os.writeEntry("e3", e3());
+    return autoPtr<coordinateRotation>(cstrIter()(dict));
 }
 
 
diff --git a/src/meshTools/coordinate/rotation/coordinateRotation.H b/src/meshTools/coordinate/rotation/coordinateRotation.H
index 4c725756a1..bfb51b18c2 100644
--- a/src/meshTools/coordinate/rotation/coordinateRotation.H
+++ b/src/meshTools/coordinate/rotation/coordinateRotation.H
@@ -21,43 +21,47 @@ 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::coordinateRotations
+
+Description
+    Namespace for coordinate system rotations.
+
 Class
     Foam::coordinateRotation
 
 Description
-    Abstract base class for coordinate rotation
+    User specification of a coordinate rotation.
 
     \verbatim
     coordinateRotation
     {
-        type        axesRotation
-        e1          (1 0 0);
-        e2          (0 1 0);
+        type    axes
+        e1      (1 0 0);
+        e2      (0 1 0);
     }
     \endverbatim
 
-    Types of coordinateRotation:
-      -# axesRotation
-      -# STARCDRotation
-      -# cylindrical
-      -# EulerCoordinateRotation
+    Types of coordinateRotations:
+      -# \link coordinateRotations::identity none \endlink
+      -# \link coordinateRotations::axes axes \endlink
+      -# \link coordinateRotations::axisAngle axisAngle \endlink
+      -# \link coordinateRotations::cylindrical cylindrical \endlink
+      -# \link coordinateRotations::euler euler \endlink
+      -# \link coordinateRotations::starcd starcd \endlink
 
 SourceFiles
     coordinateRotation.C
-    coordinateRotationNew.C
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef coordinateRotation_H
 #define coordinateRotation_H
 
-#include "vector.H"
-#include "tensor.H"
+#include "vectorField.H"
 #include "tensorField.H"
 #include "dictionary.H"
 #include "runTimeSelectionTables.H"
-#include "objectRegistry.H"
-#include "polyMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,17 +69,14 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class coordinateRotation Declaration
+                     Class coordinateRotation Declaration
 \*---------------------------------------------------------------------------*/
 
 class coordinateRotation
 {
 protected:
 
-    // Protected member functions
-
-        //- Transform principal
-        static symmTensor transformPrincipal(const tensor&, const vector&);
+    // Protected Member Functions
 
         //- Determine best-guess for an orthogonal axis
         static vector findOrthogonal(const vector& axis);
@@ -84,25 +85,9 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("coordinateRotation");
+    TypeNameNoDebug("coordinateRotation");
 
-
-    // Declare run-time constructor selection table
-    // for constructors with dictionary and objectRegistry
-    declareRunTimeSelectionTable
-    (
-        autoPtr,
-        coordinateRotation,
-        objectRegistry,
-        (
-            const dictionary& dict, const objectRegistry& obr
-        ),
-        (dict, obr)
-    );
-
-
-    // Declare run-time constructor selection table
-    // for constructors with dictionary
+    // Declare run-time constructor selection table from dictionary
     declareRunTimeSelectionTable
     (
         autoPtr,
@@ -114,26 +99,19 @@ public:
         (dict)
     );
 
+
     // Constructors
 
+        // Uses all default constructors
+
         //- Construct and return a clone
         virtual autoPtr<coordinateRotation> clone() const = 0;
 
 
     // Selectors
 
-        //- Select constructed from dictionary and objectRegistry
-        static autoPtr<coordinateRotation> New
-        (
-            const dictionary& dict,
-            const objectRegistry& obr
-        );
-
         //- Select constructed from dictionary
-        static autoPtr<coordinateRotation> New
-        (
-            const dictionary& dict
-        );
+        static autoPtr<coordinateRotation> New(const dictionary& dict);
 
 
     //- Destructor
@@ -142,84 +120,20 @@ public:
 
     // Member Functions
 
-        //- Reset rotation to an identity rotation
+        //- Reset specification
         virtual void clear() = 0;
 
-        //- Update the rotation for a list of cells
-        virtual void updateCells
-        (
-            const polyMesh& mesh,
-            const labelList& cells
-        ) = 0;
-
-        //- Return local-to-global transformation tensor
-        virtual const tensor& R() const = 0;
-
-        //- Return global-to-local transformation tensor
-        virtual const tensor& Rtr() const = 0;
-
-        //- Return local Cartesian x-axis
-        virtual const vector e1() const = 0;
-
-        //- Return local Cartesian y-axis
-        virtual const vector e2() const = 0;
-
-        //- Return local Cartesian z-axis
-        virtual const vector e3() const = 0;
-
-        //- Return local-to-global transformation tensor
-        virtual const tensorField& Tr() const = 0;
-
-        //- Return true if the rotation tensor is uniform
-        virtual bool uniform() const
-        {
-            return true;
-        }
-
-        //- Transform vectorField using transformation tensor field
-        virtual tmp<vectorField> transform(const vectorField& st) const = 0;
-
-        //- Transform vector using transformation tensor
-        virtual vector transform(const vector& st) const = 0;
-
-        //- Inverse transform vectorField using transformation tensor field
-        virtual tmp<vectorField> invTransform(const vectorField& st) const = 0;
-
-        //- Inverse transform vector using transformation tensor
-        virtual vector invTransform(const vector& st) const = 0;
-
-        //- Transform tensor field using transformation tensorField
-        virtual tmp<tensorField> transformTensor
-        (
-            const tensorField& st
-        ) const = 0;
-
-        //- Transform tensor sub-field using transformation tensorField
-        virtual tmp<tensorField> transformTensor
-        (
-            const tensorField& st,
-            const labelList& cellMap
-        ) const = 0;
-
-        //- Transform tensor using transformation tensorField
-        virtual tensor transformTensor(const tensor& st) const = 0;
-
-        //- Transform vectorField using transformation tensorField and return
-        // symmetrical tensorField
-        virtual tmp<symmTensorField> transformVector
-        (
-            const vectorField& st
-        ) const = 0;
-
-        //- Transform vector using transformation tensor and return
-        // symmetrical tensor
-        virtual symmTensor transformVector(const vector& st) const = 0;
+        //- Calculate and return the rotation tensor
+        virtual tensor R() const = 0;
 
 
     // Write
 
-        //- Write coordinateRotation as e1,e2,e3 vectors
-        virtual void write(Ostream& os) const;
+        //- Write information
+        virtual void write(Ostream& os) const = 0;
+
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const = 0;
 
 };
 
diff --git a/src/meshTools/coordinate/rotation/coordinateRotationNew.C b/src/meshTools/coordinate/rotation/coordinateRotationNew.C
deleted file mode 100644
index f9ed1f1e00..0000000000
--- a/src/meshTools/coordinate/rotation/coordinateRotationNew.C
+++ /dev/null
@@ -1,76 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
--------------------------------------------------------------------------------
-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 "coordinateRotation.H"
-#include "objectRegistry.H"
-
-// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
-(
-    const dictionary& dict,
-    const objectRegistry& obr
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    auto cstrIter = objectRegistryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInFunction(dict)
-            << "Unknown coordinateRotation type " << modelType << nl << nl
-            << "Valid types:  "
-            << flatOutput(objectRegistryConstructorTablePtr_->sortedToc())
-            << exit(FatalIOError);
-    }
-
-    return autoPtr<coordinateRotation>(cstrIter()(dict, obr));
-}
-
-
-Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
-(
-    const dictionary& dict
-)
-{
-    const word modelType(dict.get<word>("type"));
-
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-
-    if (!cstrIter.found())
-    {
-        FatalIOErrorInFunction(dict)
-            << "Unknown coordinateRotation type " << modelType << nl << nl
-            << "Valid types:  "
-            << flatOutput(dictionaryConstructorTablePtr_->sortedToc())
-            << exit(FatalIOError);
-    }
-
-    return autoPtr<coordinateRotation>(cstrIter()(dict));
-}
-
-
-// ************************************************************************* //
diff --git a/src/meshTools/coordinate/rotation/cylindrical.C b/src/meshTools/coordinate/rotation/cylindrical.C
deleted file mode 100644
index d6253fd8a4..0000000000
--- a/src/meshTools/coordinate/rotation/cylindrical.C
+++ /dev/null
@@ -1,360 +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 "cylindrical.H"
-#include "axesRotation.H"
-#include "addToRunTimeSelectionTable.H"
-#include "polyMesh.H"
-#include "tensorIOField.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(cylindrical, 0);
-    addToRunTimeSelectionTable
-    (
-        coordinateRotation,
-        cylindrical,
-        dictionary
-    );
-    addToRunTimeSelectionTable
-    (
-        coordinateRotation,
-        cylindrical,
-        objectRegistry
-    );
-}
-
-
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-void Foam::cylindrical::init
-(
-    const objectRegistry& obr,
-    const labelUList& cells
-)
-{
-    const polyMesh& mesh = refCast<const polyMesh>(obr);
-    const vectorField& cc = mesh.cellCentres();
-
-    if (cells.size())
-    {
-        Rptr_.reset(new tensorField(cells.size()));
-
-        tensorField& R = Rptr_();
-        forAll(cells, i)
-        {
-            const label celli = cells[i];
-            vector dir = cc[celli] - origin_;
-            dir /= mag(dir) + VSMALL;
-
-            R[i] = axesRotation(e3_, dir).R();
-        }
-    }
-    else
-    {
-        Rptr_.reset(new tensorField(mesh.nCells()));
-
-        tensorField& R = Rptr_();
-        forAll(cc, celli)
-        {
-            vector dir = cc[celli] - origin_;
-            dir /= mag(dir) + VSMALL;
-
-            R[celli] = axesRotation(e3_, dir).R();
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::cylindrical::cylindrical(const cylindrical& r)
-:
-    Rptr_(r.Rptr_.clone()),
-    origin_(r.origin_),
-    e3_(r.e3_)
-{}
-
-
-Foam::cylindrical::cylindrical(const tensorField& R)
-:
-    Rptr_(),
-    origin_(Zero),
-    e3_(Zero)
-{
-    Rptr_() = R;
-}
-
-
-Foam::cylindrical::cylindrical(const dictionary& dict)
-:
-    Rptr_(),
-    origin_(Zero),
-    e3_(Zero)
-{
-    FatalErrorInFunction
-        << " cylindrical can not be constructed from dictionary "
-        << " use the constructor : "
-           "("
-           "    const dictionary&, const objectRegistry&"
-           ")"
-        << exit(FatalIOError);
-}
-
-
-Foam::cylindrical::cylindrical
-(
-    const dictionary& dict,
-    const objectRegistry& obr
-)
-:
-    Rptr_(),
-    origin_(Zero),
-    e3_(Zero)
-{
-    // If origin is specified in the coordinateSystem
-    dict.parent().readIfPresent("origin", origin_);
-
-    // Rotation axis
-    dict.readEntry("e3", e3_);
-
-    init(obr);
-}
-
-
-Foam::cylindrical::cylindrical
-(
-    const objectRegistry& obr,
-    const vector& axis,
-    const point& origin
-)
-:
-    Rptr_(),
-    origin_(origin),
-    e3_(axis)
-{
-    init(obr);
-}
-
-
-Foam::cylindrical::cylindrical
-(
-    const objectRegistry& obr,
-    const vector& axis,
-    const point& origin,
-    const List<label>& cells
-)
-:
-    Rptr_(),
-    origin_(origin),
-    e3_(axis)
-{
-    init(obr, cells);
-}
-
-
-// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
-
-void Foam::cylindrical::clear()
-{
-    Rptr_.clear();
-}
-
-
-void Foam::cylindrical::updateCells
-(
-    const polyMesh& mesh,
-    const labelList& cells
-)
-{
-    const vectorField& cc = mesh.cellCentres();
-    tensorField& R = Rptr_();
-
-    forAll(cells, i)
-    {
-        const label celli = cells[i];
-        vector dir = cc[celli] - origin_;
-        dir /= mag(dir) + VSMALL;
-
-        R[celli] = axesRotation(e3_, dir).R();
-    }
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::cylindrical::transform
-(
-    const vectorField& vf
-) const
-{
-    if (Rptr_->size() != vf.size())
-    {
-        FatalErrorInFunction
-            << "vectorField st has different size to tensorField "
-            << abort(FatalError);
-    }
-
-    return (Rptr_() & vf);
-}
-
-
-Foam::vector Foam::cylindrical::transform(const vector& v) const
-{
-    NotImplemented;
-    return Zero;
-}
-
-
-Foam::vector Foam::cylindrical::transform
-(
-    const vector& v,
-    const label cmptI
-) const
-{
-    return (Rptr_()[cmptI] & v);
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::cylindrical::invTransform
-(
-    const vectorField& vf
-) const
-{
-    return (Rptr_().T() & vf);
-}
-
-
-Foam::vector Foam::cylindrical::invTransform(const vector& v) const
-{
-    NotImplemented;
-    return Zero;
-}
-
-
-Foam::vector Foam::cylindrical::invTransform
-(
-    const vector& v,
-    const label cmptI
-) const
-{
-    return (Rptr_()[cmptI].T() & v);
-}
-
-
-Foam::tmp<Foam::tensorField> Foam::cylindrical::transformTensor
-(
-    const tensorField& tf
-) const
-{
-    if (Rptr_->size() != tf.size())
-    {
-        FatalErrorInFunction
-            << "tensorField st has different size to tensorField Tr"
-            << abort(FatalError);
-    }
-    return (Rptr_() & tf & Rptr_().T());
-}
-
-
-Foam::tensor Foam::cylindrical::transformTensor
-(
-    const tensor& t
-) const
-{
-    NotImplemented;
-
-    return Zero;
-}
-
-
-Foam::tmp<Foam::tensorField> Foam::cylindrical::transformTensor
-(
-    const tensorField& tf,
-    const labelList& cellMap
-) const
-{
-    if (cellMap.size() != tf.size())
-    {
-        FatalErrorInFunction
-            << "tensorField tf has different size to tensorField Tr"
-            << abort(FatalError);
-    }
-
-    const tensorField& R = Rptr_();
-    const tensorField Rtr(R.T());
-    tmp<tensorField> tt(new tensorField(cellMap.size()));
-    tensorField& t = tt.ref();
-    forAll(cellMap, i)
-    {
-        const label celli = cellMap[i];
-        t[i] = R[celli] & tf[i] & Rtr[celli];
-    }
-
-    return tt;
-}
-
-
-Foam::tmp<Foam::symmTensorField> Foam::cylindrical::transformVector
-(
-    const vectorField& vf
-) const
-{
-    if (Rptr_->size() != vf.size())
-    {
-        FatalErrorInFunction
-            << "tensorField vf has different size to tensorField Tr"
-            << abort(FatalError);
-    }
-
-    tmp<symmTensorField> tfld(new symmTensorField(Rptr_->size()));
-    symmTensorField& fld = tfld.ref();
-
-    const tensorField& R = Rptr_();
-    forAll(fld, i)
-    {
-        fld[i] = transformPrincipal(R[i], vf[i]);
-    }
-    return tfld;
-}
-
-
-Foam::symmTensor Foam::cylindrical::transformVector
-(
-    const vector& v
-) const
-{
-    NotImplemented;
-    return Zero;
-}
-
-
-void Foam::cylindrical::write(Ostream& os) const
-{
-     os.writeEntry("e3", e3());
-}
-
-
-// ************************************************************************* //
diff --git a/src/meshTools/coordinate/rotation/cylindrical.H b/src/meshTools/coordinate/rotation/cylindrical.H
deleted file mode 100644
index 9f7a2463e7..0000000000
--- a/src/meshTools/coordinate/rotation/cylindrical.H
+++ /dev/null
@@ -1,251 +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::cylindrical
-
-Description
-    A local coordinate rotation.
-
-    The cell based rotational field can be created in two ways:
-      -# 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). For example:
-          \verbatim
-          cylindrical
-          {
-              type        localAxes;
-              e3          (0 0 1);
-          }
-          \endverbatim
-
-      -# The rotational tensor field is provided at construction.
-
-SourceFiles
-    cylindrical.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cylindrical_H
-#define cylindrical_H
-
-#include "point.H"
-#include "vector.H"
-#include "ListOps.H"
-#include "coordinateRotation.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                         Class cylindrical Declaration
-\*---------------------------------------------------------------------------*/
-
-class cylindrical
-:
-    public coordinateRotation
-{
-    // Private data
-
-        //- An autoPtr to the transformation tensor
-        autoPtr<tensorField> Rptr_;
-
-        //- Origin of the coordinate system
-        point origin_;
-
-        //- Rotation axis
-        vector e3_;
-
-
-    // Private members
-
-        //- Init transformation tensor field
-        void init
-        (
-            const objectRegistry& obr,
-            const labelUList& cells = Foam::emptyLabelList
-        );
-
-
-public:
-
-    //- Runtime type information
-    TypeName("cylindrical");
-
-    // Constructors
-
-        //- Construct as copy
-        cylindrical(const cylindrical& r);
-
-        //- Construct from tensor Field
-        explicit cylindrical(const tensorField& R);
-
-        //- Construct from dictionary - for API compatibility only
-        explicit cylindrical(const dictionary& dict);
-
-        //- Construct from dictionary and objectRegistry
-        cylindrical(const dictionary& dict, const objectRegistry& obr);
-
-        //- Construct from components for all cells
-        cylindrical
-        (
-            const objectRegistry& obr,
-            const vector& axis,
-            const point& origin
-        );
-
-        //- Construct from components for list of cells
-        cylindrical
-        (
-            const objectRegistry& obr,
-            const vector& axis,
-            const point& origin,
-            const List<label>& cells
-        );
-
-        //- Return clone
-        autoPtr<coordinateRotation> clone() const
-        {
-            return autoPtr<coordinateRotation>::NewFrom<cylindrical>(*this);
-        }
-
-
-    //- Destructor
-    virtual ~cylindrical() = default;
-
-
-    // Member Functions
-
-        //- Reset rotation to an identity rotation
-        virtual void clear();
-
-        //- Update the rotation for a list of cells
-        virtual void updateCells(const polyMesh& mesh, const labelList& cells);
-
-        //- Return local-to-global transformation tensor
-        virtual const tensor& R() const
-        {
-            NotImplemented;
-            return tensor::zero;
-        }
-
-        //- Return global-to-local transformation tensor
-        virtual const tensor& Rtr() const
-        {
-             NotImplemented;
-             return tensor::zero;
-        }
-
-        //- Return local Cartesian x-axis in global coordinates
-        virtual const vector e1() const
-        {
-            NotImplemented;
-            return vector::zero;
-        }
-
-        //- Return local Cartesian y-axis in global coordinates
-        virtual const vector e2() const
-        {
-            NotImplemented;
-            return vector::zero;
-        }
-
-        //- Return local Cartesian z-axis in global coordinates
-        virtual const vector e3() const
-        {
-            return e3_;
-        }
-
-        virtual const tensorField& Tr() const
-        {
-            return *Rptr_;
-        }
-
-        //- Transform vectorField using transformation tensor field
-        virtual tmp<vectorField> transform(const vectorField& tf) const;
-
-        //- Transform vector using transformation tensor
-        virtual vector transform(const vector& v) const;
-
-        //- Transform vector using transformation tensor for component
-        virtual vector transform(const vector& v, const label cmptI) const;
-
-        //- Inverse transform vectorField using transformation tensor field
-        virtual tmp<vectorField> invTransform(const vectorField& vf) const;
-
-        //- Inverse transform vector using transformation tensor
-        virtual vector invTransform(const vector& v) const;
-
-        //- Inverse transform vector using transformation tensor for component
-        virtual vector invTransform(const vector& v, const label cmptI) const;
-
-        //- Return if the rotation is uniform
-        virtual bool uniform() const
-        {
-            return false;
-        }
-
-        //- Transform tensor field using transformation tensorField
-        virtual tmp<tensorField> transformTensor(const tensorField& tf) const;
-
-        //- Transform tensor using transformation tensorField
-        virtual tensor transformTensor(const tensor& t) const;
-
-        //- Transform tensor sub-field using transformation tensorField
-        virtual tmp<tensorField> transformTensor
-        (
-            const tensorField& tf,
-            const labelList& cellMap
-        ) const;
-
-        //- Transform vectorField using transformation tensorField and return
-        // symmetrical tensorField
-        virtual tmp<symmTensorField> transformVector
-        (
-            const vectorField& vf
-        ) const;
-
-        //- Transform vector using transformation tensor and return
-        // symmetrical tensor (R & st & R.T())
-        virtual symmTensor transformVector(const vector& v) const;
-
-
-    // Write
-
-        //- Write
-        virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/meshTools/coordinate/rotation/cylindricalRotation.C b/src/meshTools/coordinate/rotation/cylindricalRotation.C
new file mode 100644
index 0000000000..8086c1095c
--- /dev/null
+++ b/src/meshTools/coordinate/rotation/cylindricalRotation.C
@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "cylindricalRotation.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace coordinateRotations
+    {
+        defineTypeName(cylindrical);
+        addToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            cylindrical,
+            dictionary
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+Foam::tensor Foam::coordinateRotations::cylindrical::rotation
+(
+    const vector& axis
+)
+{
+    // Guess second axis
+    return axes::rotation(axis, Zero, E3_E1);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::coordinateRotations::cylindrical::cylindrical(const cylindrical& crot)
+:
+    coordinateRotations::axes(crot)
+{}
+
+
+Foam::coordinateRotations::cylindrical::cylindrical(const vector& axis)
+:
+    coordinateRotations::axes(axis)  // Guess second axis
+{}
+
+
+Foam::coordinateRotations::cylindrical::cylindrical(const dictionary& dict)
+:
+    cylindrical(dict.getCompat<vector>("axis", {{"e3", -1806}}))
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::coordinateRotations::cylindrical::write(Ostream& os) const
+{
+    os << type() << " axis: " << axis1_;
+}
+
+
+void Foam::coordinateRotations::cylindrical::writeEntry
+(
+    const word& keyword,
+    Ostream& os
+) const
+{
+    os.beginBlock(keyword);
+
+    os.writeEntry("type", type());
+    os.writeEntry("axis", axis1_);
+
+    os.endBlock();
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/rotation/cylindricalRotation.H b/src/meshTools/coordinate/rotation/cylindricalRotation.H
new file mode 100644
index 0000000000..488da8676f
--- /dev/null
+++ b/src/meshTools/coordinate/rotation/cylindricalRotation.H
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+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::coordinateRotations::cylindrical
+
+Description
+    A special purpose coordinateRotation that is generally for use in
+    combination with a cylindricalCS when only the orientation of the
+    local Z-axis is relevant.
+
+    \heading Dictionary entries
+    \table
+        Property    | Description                           | Required | Default
+        type        | Type name: cylindrical                | yes   |
+        axis        | The z-axis                            | yes   |
+        e3          | Alias for 'axis'                      | no    |
+    \endtable
+
+SourceFiles
+    cylindricalRotation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef coordinateRotations_cylindrical_H
+#define coordinateRotations_cylindrical_H
+
+#include "axesRotation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace coordinateRotations
+{
+
+/*---------------------------------------------------------------------------*\
+              Class coordinateRotations::cylindrical Declaration
+\*---------------------------------------------------------------------------*/
+
+class cylindrical
+:
+    public coordinateRotations::axes
+{
+public:
+
+    //- Runtime type information
+    TypeNameNoDebug("cylindrical");
+
+
+    // Constructors
+
+        //- Copy construct
+        cylindrical(const cylindrical& crot);
+
+        //- Construct from single axis (as e3) using best-guess for the
+        //- second axis.
+        explicit cylindrical(const vector& axis);
+
+        //- Construct from dictionary
+        explicit cylindrical(const dictionary& dict);
+
+        //- Return clone
+        autoPtr<coordinateRotation> clone() const
+        {
+            return
+                autoPtr<coordinateRotation>::NewFrom
+                <coordinateRotations::cylindrical>(*this);
+        }
+
+
+    //- Destructor
+    virtual ~cylindrical() = default;
+
+
+    // Static Member Functions
+
+        //- The rotation tensor calculated from axes and order.
+        //  The input axes will be normalised.
+        static tensor rotation(const vector& axis);
+
+
+    // Member Functions
+
+        //- Write information
+        virtual void write(Ostream& os) const;
+
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const;
+
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace coordinateRotations
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/rotation/identityRotation.C b/src/meshTools/coordinate/rotation/identityRotation.C
new file mode 100644
index 0000000000..f97a014e25
--- /dev/null
+++ b/src/meshTools/coordinate/rotation/identityRotation.C
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "identityRotation.H"
+#include "dictionary.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    namespace coordinateRotations
+    {
+        defineTypeName(identity);
+        addToRunTimeSelectionTable
+        (
+            coordinateRotation,
+            identity,
+            dictionary
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::coordinateRotations::identity::identity()
+:
+    coordinateRotation()
+{}
+
+
+Foam::coordinateRotations::identity::identity(const identity&)
+:
+    identity()
+{}
+
+
+Foam::coordinateRotations::identity::identity(const dictionary&)
+:
+    identity()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::coordinateRotations::identity::clear()
+{}
+
+
+Foam::tensor Foam::coordinateRotations::identity::R() const
+{
+    return sphericalTensor::I;
+}
+
+
+void Foam::coordinateRotations::identity::write(Ostream& os) const
+{
+    os << "identity rotation";
+}
+
+
+void Foam::coordinateRotations::identity::writeEntry
+(
+    const word& keyword,
+    Ostream& os
+) const
+{
+    os.beginBlock(keyword);
+
+    os.writeEntry("type", type());
+
+    os.endBlock();
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/rotation/identityRotation.H b/src/meshTools/coordinate/rotation/identityRotation.H
new file mode 100644
index 0000000000..b1243a02f7
--- /dev/null
+++ b/src/meshTools/coordinate/rotation/identityRotation.H
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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::coordinateRotations::identity
+
+Description
+    An identity coordinateRotation.
+
+    \verbatim
+    coordinateRotation
+    {
+        type    none;
+    }
+    \endverbatim
+
+    \heading Dictionary entries
+    \table
+        Property    | Description                           | Required | Default
+        type        | Type name: none                       | yes      |
+    \endtable
+
+SourceFiles
+    identityRotation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef coordinateRotations_identity_H
+#define coordinateRotations_identity_H
+
+#include "coordinateRotation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace coordinateRotations
+{
+
+/*---------------------------------------------------------------------------*\
+                Class coordinateRotations::identity Declaration
+\*---------------------------------------------------------------------------*/
+
+class identity
+:
+    public coordinateRotation
+{
+public:
+
+    //- Runtime type information
+    TypeNameNoDebug("none");
+
+
+    // Constructors
+
+        //- Construct null
+        identity();
+
+        //- Copy construct
+        identity(const identity& unused);
+
+        //- Construct from dictionary
+        explicit identity(const dictionary& unused);
+
+        //- Return clone
+        autoPtr<coordinateRotation> clone() const
+        {
+            return
+                autoPtr<coordinateRotation>::NewFrom
+                <coordinateRotations::identity>(*this);
+        }
+
+
+    //- Destructor
+    virtual ~identity() = default;
+
+
+    // Member Functions
+
+        //- Reset specification (no-op)
+        virtual void clear();
+
+        //- Return an identity rotation tensor
+        virtual tensor R() const;
+
+        //- Write information
+        virtual void write(Ostream& os) const;
+
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace coordinateRotations
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/systems/cartesianCS.C b/src/meshTools/coordinate/systems/cartesianCS.C
index f01bc18c22..2ecdc4891b 100644
--- a/src/meshTools/coordinate/systems/cartesianCS.C
+++ b/src/meshTools/coordinate/systems/cartesianCS.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -24,59 +24,68 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cartesianCS.H"
-
-#include "one.H"
-#include "mathematicalConstants.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(cartesianCS, 0);
-    addToRunTimeSelectionTable(coordinateSystem, cartesianCS, dictionary);
+namespace coordSystem
+{
+    defineTypeName(cartesian);
+    addToRunTimeSelectionTable(coordinateSystem, cartesian, dictionary);
+}
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cartesianCS::cartesianCS()
+Foam::coordSystem::cartesian::cartesian()
 :
     coordinateSystem()
 {}
 
 
-Foam::cartesianCS::cartesianCS
-(
-    const coordinateSystem& cs
-)
+Foam::coordSystem::cartesian::cartesian(const coordinateSystem& csys)
 :
-    coordinateSystem(cs)
+    coordinateSystem(csys)
 {}
 
 
-Foam::cartesianCS::cartesianCS
-(
-    const word& name,
-    const coordinateSystem& cs
-)
+Foam::coordSystem::cartesian::cartesian(coordinateSystem&& csys)
 :
-    coordinateSystem(name, cs)
+    coordinateSystem(std::move(csys))
 {}
 
 
-Foam::cartesianCS::cartesianCS
+Foam::coordSystem::cartesian::cartesian(autoPtr<coordinateSystem>&& csys)
+:
+    coordinateSystem(std::move(csys))
+{}
+
+
+Foam::coordSystem::cartesian::cartesian
 (
-    const word& name,
     const point& origin,
-    const coordinateRotation& cr
+    const coordinateRotation& crot
 )
 :
-    coordinateSystem(name, origin, cr)
+    coordinateSystem(origin, crot)
 {}
 
 
-Foam::cartesianCS::cartesianCS
+Foam::coordSystem::cartesian::cartesian
+(
+    const point& origin,
+    const vector& axis,
+    const vector& dirn
+)
+:
+    coordinateSystem(origin, axis, dirn)
+{}
+
+
+Foam::coordSystem::cartesian::cartesian
 (
     const word& name,
     const point& origin,
@@ -88,7 +97,7 @@ Foam::cartesianCS::cartesianCS
 {}
 
 
-Foam::cartesianCS::cartesianCS
+Foam::coordSystem::cartesian::cartesian
 (
     const word& name,
     const dictionary& dict
@@ -98,63 +107,20 @@ Foam::cartesianCS::cartesianCS
 {}
 
 
-Foam::cartesianCS::cartesianCS
+Foam::coordSystem::cartesian::cartesian(const dictionary& dict)
+:
+    coordinateSystem(dict)
+{}
+
+
+Foam::coordSystem::cartesian::cartesian
 (
-    const objectRegistry& obr,
-    const dictionary& dict
+    const dictionary& dict,
+    const word& dictName
 )
 :
-    coordinateSystem(obr, dict)
+    coordinateSystem(dict, dictName)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::cartesianCS::~cartesianCS()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
-Foam::vector Foam::cartesianCS::localToGlobal
-(
-    const vector& local,
-    bool translate
-) const
-{
-    return coordinateSystem::localToGlobal(local, translate);
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::cartesianCS::localToGlobal
-(
-    const vectorField& local,
-    bool translate
-) const
-{
-    return coordinateSystem::localToGlobal(local, translate);
-}
-
-
-Foam::vector Foam::cartesianCS::globalToLocal
-(
-    const vector& global,
-    bool translate
-) const
-{
-    return coordinateSystem::globalToLocal(global, translate);
-}
-
-
-Foam::tmp<Foam::vectorField> Foam::cartesianCS::globalToLocal
-(
-    const vectorField& global,
-    bool translate
-) const
-{
-    return coordinateSystem::globalToLocal(global, translate);
-}
-
-
 // ************************************************************************* //
diff --git a/src/meshTools/coordinate/systems/cartesianCS.H b/src/meshTools/coordinate/systems/cartesianCS.H
index d499f790b4..860cb6b800 100644
--- a/src/meshTools/coordinate/systems/cartesianCS.H
+++ b/src/meshTools/coordinate/systems/cartesianCS.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -22,10 +22,16 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::cartesianCS
+    Foam::coordSystem::cartesian
 
 Description
-    Cartesian coordinate system
+    A Cartesian coordinate system
+
+    \heading Dictionary entries
+    \table
+        Property    | Description                           | Required | Default
+        type        | Type name: cartesian                  | yes   |
+    \endtable
 
 SourceFiles
     cartesianCS.C
@@ -36,85 +42,61 @@ SourceFiles
 #define cartesianCS_H
 
 #include "coordinateSystem.H"
-#include "typeInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
+namespace coordSystem
+{
 
 /*---------------------------------------------------------------------------*\
-                        Class cartesianCS Declaration
+                   Class coordSystem::cartesian Declaration
 \*---------------------------------------------------------------------------*/
 
-class cartesianCS
+class cartesian
 :
     public coordinateSystem
 {
-protected:
-
-    // Protected Member Functions
-
-
-        //- Convert from local coordinate system to the global Cartesian system
-        //  with optional translation for the origin
-        virtual vector localToGlobal(const vector&, bool translate) const;
-
-        //- Convert from local coordinate system to the global Cartesian system
-        //  with optional translation for the origin
-        virtual tmp<vectorField> localToGlobal
-        (
-            const vectorField&,
-            bool translate
-        ) const;
-
-        //- Convert from global Cartesian system to the local coordinate system
-        //  with optional translation for the origin
-        virtual vector globalToLocal(const vector&, bool translate) const;
-
-        //- Convert from global Cartesian system to the local coordinate system
-        //  with optional translation for the origin
-        virtual tmp<vectorField> globalToLocal
-        (
-            const vectorField&,
-            bool translate
-        ) const;
-
-
 public:
 
     //- Runtime type information
-    TypeName("cartesian");
+    TypeNameNoDebug("cartesian");
 
 
     // Constructors
 
-        //- Construct null
-        cartesianCS();
+        //- Construct null. This is an identity coordinateSystem.
+        cartesian();
 
-        //- Construct copy
-        cartesianCS
-        (
-            const coordinateSystem&
-        );
+        //- Copy construct
+        cartesian(const cartesian& csys) = default;
 
-        //- Construct copy with a different name
-        cartesianCS
-        (
-            const word& name,
-            const coordinateSystem&
-        );
+        //- Move construct
+        cartesian(cartesian&& csys) = default;
+
+        //- Copy construct from another coordinateSystem type
+        explicit cartesian(const coordinateSystem& csys);
+
+        //- Move construct from another coordinateSystem type
+        explicit cartesian(coordinateSystem&& csys);
+
+        //- Move construct from autoPtr of another coordinateSystem type
+        explicit cartesian(autoPtr<coordinateSystem>&& csys);
 
         //- Construct from origin and rotation
-        cartesianCS
+        cartesian(const point& origin, const coordinateRotation& crot);
+
+        //- Construct from origin and 2 axes
+        cartesian
         (
-            const word& name,
             const point& origin,
-            const coordinateRotation&
+            const vector& axis,
+            const vector& dirn
         );
 
         //- Construct from origin and 2 axes
-        cartesianCS
+        cartesian
         (
             const word& name,
             const point& origin,
@@ -122,24 +104,48 @@ public:
             const vector& dirn
         );
 
-        //- Construct from dictionary
-        cartesianCS(const word&, const dictionary&);
+        //- Construct from dictionary with a given name
+        cartesian(const word& name, const dictionary& dict);
 
+        //- Construct from dictionary without a name
+        explicit cartesian(const dictionary& dict);
 
-        //- Construct from dictionary and objectRegistry
-        cartesianCS(const objectRegistry&, const dictionary&);
+        //- Construct from dictionary with optional subDict lookup.
+        //
+        //  \param dictName If non-empty, the sub-dictionary to use.
+        cartesian(const dictionary& dict, const word& dictName);
 
 
     //- Destructor
-    virtual ~cartesianCS();
+    virtual ~cartesian() = default;
 
+
+    // Member Operators
+
+        //- Copy assignment
+        cartesian& operator=(const cartesian&) = default;
+
+        //- Move assignment
+        cartesian& operator=(cartesian&&) = default;
+
+        //- Copy/move assignment from coordinateSystem, autoPtr
+        using coordinateSystem::operator=;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace coordSystem
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Compatibility typedef 1806
+typedef coordSystem::cartesian cartesianCS;
+
+
 } // End namespace Foam
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/meshTools/coordinate/systems/coordinateSystem.C b/src/meshTools/coordinate/systems/coordinateSystem.C
index 0428153c8e..1b6cb2911d 100644
--- a/src/meshTools/coordinate/systems/coordinateSystem.C
+++ b/src/meshTools/coordinate/systems/coordinateSystem.C
@@ -23,10 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "coordinateSystem.H"
+#include "cartesianCS.H"
 #include "IOstream.H"
 #include "axesRotation.H"
-#include "coordinateSystem.H"
-#include "coordinateSystems.H"
+#include "identityRotation.H"
+#include "transform.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -35,47 +37,157 @@ namespace Foam
 {
     defineTypeNameAndDebug(coordinateSystem, 0);
     defineRunTimeSelectionTable(coordinateSystem, dictionary);
+    defineRunTimeSelectionTable(coordinateSystem, registry);
 }
 
+Foam::coordinateSystem Foam::coordinateSystem::dummy_(nullptr);
+
+
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    //- Is it cartesian?
+    //  For output, can treat the base class as Cartesian too,
+    //  since it defaults to cartesian on input.
+    static inline bool isCartesian(const word& modelType)
+    {
+        return
+        (
+            modelType == coordinateSystem::typeName_()
+         || modelType == coordSystem::cartesian::typeName_()
+        );
+    }
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::coordinateSystem::assign(const dictionary& dict)
+{
+    dict.readEntry("origin", origin_);
+
+    note_.clear();
+    dict.readIfPresent("note", note_);
+
+    // Non-recursive, no pattern search for "rotation"
+    // or "coordinateRotation" (older) sub-dictionary.
+    // Don't warn about older naming for now (OCT-2018)
+
+    const auto finder = dict.csearchCompat
+    (
+        "rotation", {{"coordinateRotation", -1806}},
+        false, false
+    );
+
+    if (finder.isDict())
+    {
+        spec_ = coordinateRotation::New(finder.dict());
+    }
+    else
+    {
+        // Fall through to expecting e1/e2/e3 specification in the dictionary
+        spec_.reset(new coordinateRotations::axes(dict));
+    }
+
+    rot_ = spec_->R();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+Foam::coordinateSystem::coordinateSystem(std::nullptr_t)
+:
+    spec_(),
+    origin_(Zero),
+    rot_(sphericalTensor::I),
+    name_(),
+    note_()
+{}
+
+
 Foam::coordinateSystem::coordinateSystem()
 :
-    name_(),
-    note_(),
+    spec_(new coordinateRotations::identity()),
     origin_(Zero),
-    R_(new axesRotation(sphericalTensor::I))
+    rot_(sphericalTensor::I),
+    name_(),
+    note_()
 {}
 
 
-Foam::coordinateSystem::coordinateSystem(const coordinateSystem& cs)
+Foam::coordinateSystem::coordinateSystem(const coordinateRotation& crot)
 :
-    name_(cs.name_),
-    note_(cs.note_),
-    origin_(cs.origin_),
-    R_(cs.R_.clone())
+    coordinateSystem(word::null, point::zero, crot)
 {}
 
 
-Foam::coordinateSystem::coordinateSystem(coordinateSystem&& cs)
+Foam::coordinateSystem::coordinateSystem(coordinateRotation&& crot)
 :
-    name_(std::move(cs.name_)),
-    note_(std::move(cs.note_)),
-    origin_(std::move(cs.origin_)),
-    R_(std::move(cs.R_))
+    coordinateSystem(word::null, point::zero, std::move(crot))
 {}
 
 
+Foam::coordinateSystem::coordinateSystem(const coordinateSystem& csys)
+:
+    spec_(csys.spec_.clone()),
+    origin_(csys.origin_),
+    rot_(csys.rot_),
+    name_(csys.name_),
+    note_(csys.note_)
+{}
+
+
+Foam::coordinateSystem::coordinateSystem(coordinateSystem&& csys)
+:
+    spec_(std::move(csys.spec_)),
+    origin_(std::move(csys.origin_)),
+    rot_(std::move(csys.rot_)),
+    name_(std::move(csys.name_)),
+    note_(std::move(csys.note_))
+{}
+
+
+Foam::coordinateSystem::coordinateSystem(autoPtr<coordinateSystem>&& csys)
+:
+    coordinateSystem(nullptr)
+{
+    if (csys)
+    {
+        // Has valid autoPtr - move.
+        coordinateSystem::operator=(std::move(*csys));
+        csys.clear();
+    }
+    else
+    {
+        // No valid autoPtr - treat like identity
+        spec_.reset(new coordinateRotations::identity());
+    }
+}
+
+
 Foam::coordinateSystem::coordinateSystem
 (
     const word& name,
-    const coordinateSystem& cs
+    const coordinateSystem& csys
 )
 :
+    spec_(csys.spec_.clone()),
+    origin_(csys.origin_),
+    rot_(csys.rot_),
     name_(name),
-    note_(cs.note_),
-    origin_(cs.origin_),
-    R_(cs.R_.clone())
+    note_(csys.note_)
+{}
+
+
+Foam::coordinateSystem::coordinateSystem
+(
+    const point& origin,
+    const coordinateRotation& crot
+)
+:
+    coordinateSystem(word::null, origin, crot)
 {}
 
 
@@ -83,13 +195,25 @@ Foam::coordinateSystem::coordinateSystem
 (
     const word& name,
     const point& origin,
-    const coordinateRotation& cr
+    const coordinateRotation& crot
 )
 :
-    name_(name),
-    note_(),
+    spec_(crot.clone()),
     origin_(origin),
-    R_(cr.clone())
+    rot_(spec_->R()),
+    name_(name),
+    note_()
+{}
+
+
+Foam::coordinateSystem::coordinateSystem
+(
+    const point& origin,
+    const vector& axis,
+    const vector& dirn
+)
+:
+    coordinateSystem(word::null, origin, axis, dirn)
 {}
 
 
@@ -101,10 +225,11 @@ Foam::coordinateSystem::coordinateSystem
     const vector& dirn
 )
 :
-    name_(name),
-    note_(),
+    spec_(new coordinateRotations::axes(axis, dirn)),
     origin_(origin),
-    R_(new axesRotation(axis, dirn))
+    rot_(spec_->R()),
+    name_(name),
+    note_()
 {}
 
 
@@ -114,119 +239,91 @@ Foam::coordinateSystem::coordinateSystem
     const dictionary& dict
 )
 :
-    name_(name),
-    note_(),
+    spec_(nullptr),
     origin_(Zero),
-    R_()
+    rot_(sphericalTensor::I),
+    name_(name),
+    note_()
 {
-    init(dict);
+    assign(dict);
 }
 
 
 Foam::coordinateSystem::coordinateSystem(const dictionary& dict)
 :
-    name_(),
-    note_(),
-    origin_(Zero),
-    R_()
-{
-    init(dict);
-}
+    coordinateSystem(word::null, dict)
+{}
 
 
 Foam::coordinateSystem::coordinateSystem
 (
-    const objectRegistry& obr,
-    const dictionary& dict
+    const dictionary& dict,
+    const word& dictName
 )
 :
-    name_(),
-    note_(),
-    origin_(Zero),
-    R_()
+    coordinateSystem(nullptr)
 {
-    const entry* entryPtr = dict.lookupEntryPtr(typeName_(), false, false);
-
-    if (!entryPtr)
+    if (dictName.size())
     {
-        // No 'coordinateSystem' entry
-        init(dict, obr);
-    }
-    else if (entryPtr->isDict())
-    {
-        // 'coordinateSystem' as dictionary entry - use it
-        init(entryPtr->dict(), obr);
+        assign(dict.subDict(dictName));
     }
     else
     {
-        // 'coordinateSystem' as non-dictionary entry
-        // - this is a lookup into global coordinateSystems
-
-        keyType key(entryPtr->stream());
-
-        const coordinateSystems& lst = coordinateSystems::New(obr);
-        const label index = lst.findIndex(key);
-
-        if (debug)
-        {
-            InfoInFunction
-                << "Using global coordinate system: "
-                << key << "=" << index << endl;
-        }
-
-        if (index < 0)
-        {
-            FatalErrorInFunction
-                << "could not find coordinate system: " << key << nl
-                << "available coordinate systems: " << lst.toc() << nl << nl
-                << exit(FatalError);
-        }
-
-        // Copy from coordinateSystem, but assign the name as the typeName
-        // to avoid strange things in writeDict()
-        operator=(lst[index]);
-        name_ = typeName_();
+        assign(dict);
     }
 }
 
 
-Foam::coordinateSystem::coordinateSystem(Istream& is)
-:
-    name_(is),
-    note_(),
-    origin_(Zero),
-    R_()
-{
-    dictionary dict(is);
-    init(dict);
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::dictionary Foam::coordinateSystem::dict(bool ignoreType) const
+void Foam::coordinateSystem::clear()
 {
-    dictionary dict;
+    spec_->clear();
+    origin_ = Zero;
+    rot_ = sphericalTensor::I;
+    note_.clear();
+}
 
-    dict.add("name", name_);
 
-    // Only write type for derived types
-    if (!ignoreType && type() != typeName_())
-    {
-        dict.add("type", type());
-    }
+Foam::tensor Foam::coordinateSystem::R(const point& global) const
+{
+    return rot_;
+}
 
-    // The note entry is optional
-    if (note_.size())
-    {
-        dict.add("note", note_);
-    }
 
-    dict.add("origin", origin_);
-    dict.add("e1", R_->e1());
-    dict.add("e3", R_->e3());
+Foam::tmp<Foam::tensorField> Foam::coordinateSystem::R
+(
+    const UList<point>& global
+) const
+{
+    return rotationsImpl(global);
+}
 
-    return dict;
+
+Foam::tmp<Foam::tensorField> Foam::coordinateSystem::R
+(
+    const pointUIndList& global
+) const
+{
+    return rotationsImpl(global);
+}
+
+
+Foam::point Foam::coordinateSystem::transformPoint
+(
+    const point& localCart
+) const
+{
+    return Foam::transform(rot_, localCart) + origin_;
+}
+
+
+Foam::point Foam::coordinateSystem::invTransformPoint
+(
+    const point& global
+) const
+{
+    return Foam::invTransform(rot_, global - origin_);
 }
 
 
@@ -238,10 +335,10 @@ Foam::vector Foam::coordinateSystem::localToGlobal
 {
     if (translate)
     {
-        return (R_->transform(local)) + origin_;
+        return this->transform(local) + origin_;
     }
 
-    return R_->transform(local);
+    return this->transform(local);
 }
 
 
@@ -253,10 +350,10 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystem::localToGlobal
 {
     if (translate)
     {
-        return (R_->transform(local)) + origin_;
+        return this->transform(local) + origin_;
     }
 
-    return R_->transform(local);
+    return this->transform(local);
 }
 
 
@@ -268,10 +365,10 @@ Foam::vector Foam::coordinateSystem::globalToLocal
 {
     if (translate)
     {
-        return R_->invTransform(global - origin_);
+        return this->invTransform(global - origin_);
     }
 
-    return R_->invTransform(global);
+    return this->invTransform(global);
 }
 
 
@@ -283,54 +380,74 @@ Foam::tmp<Foam::vectorField> Foam::coordinateSystem::globalToLocal
 {
     if (translate)
     {
-        return R_->invTransform(global - origin_);
+        return this->invTransform(global - origin_);
     }
 
-    return R_->invTransform(global);
+    return this->invTransform(global);
 }
 
 
-void Foam::coordinateSystem::clear()
+void Foam::coordinateSystem::rotation(autoPtr<coordinateRotation>&& crot)
 {
-    note_.clear();
-    origin_ = Zero;
-    R_->clear();
-}
-
-
-void Foam::coordinateSystem::transfer(coordinateSystem& cs)
-{
-    name_ = std::move(cs.name_);
-    note_ = std::move(cs.note_);
-    origin_ = std::move(cs.origin_);
-    R_ = std::move(cs.R_);
+    spec_.reset(std::move(crot));
+    if (spec_)
+    {
+        rot_ = spec_->R();
+    }
+    else
+    {
+        rot_ = sphericalTensor::I;
+    }
 }
 
 
 void Foam::coordinateSystem::write(Ostream& os) const
 {
-    os  << type() << " origin: " << origin() << nl;
-    R_->write(os);
+    if (!valid())
+    {
+        return;
+    }
+
+    // Suppress output of type for Cartesian
+    if (!isCartesian(type()))
+    {
+        os << type() << ' ';
+    }
+
+    os << "origin: " << origin_ << ' ';
+    spec_->write(os);
 }
 
 
-void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
+void Foam::coordinateSystem::writeEntry(const word& keyword, Ostream& os) const
 {
-    if (subDict)
+    if (!valid())
     {
-        os.beginBlock(name_);
+        return;
     }
 
-    os.writeEntry("type", type());
+    const bool subDict = !keyword.empty();
 
-    if (note_.size())
+    if (subDict)
     {
-        // The 'note' is optional
-        os.writeEntry("note", note_);
+        os.beginBlock(keyword);
+
+        // Suppress output of type for Cartesian
+        if (!isCartesian(type()))
+        {
+            os.writeEntry<word>("type", type());
+        }
+
+        if (note_.size())
+        {
+            // The 'note' is optional
+            os.writeEntry("note", note_);
+        }
     }
 
     os.writeEntry("origin", origin_);
-    R_->write(os);
+
+    spec_->writeEntry("rotation", os);
 
     if (subDict)
     {
@@ -341,71 +458,64 @@ void Foam::coordinateSystem::writeDict(Ostream& os, bool subDict) const
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-void Foam::coordinateSystem::operator=(const coordinateSystem& cs)
+void Foam::coordinateSystem::operator=(const coordinateSystem& csys)
 {
-    name_ = cs.name_;
-    note_ = cs.note_;
-    origin_ = cs.origin_;
+    name_ = csys.name_;
+    note_ = csys.note_;
+    origin_ = csys.origin_;
 
     // Some extra safety
-    if (cs.R_.valid())
+    if (csys.spec_)
     {
-        R_ = cs.R_.clone();
+        rotation(csys.spec_.clone());
     }
     else
     {
-        R_.reset(new axesRotation(sphericalTensor::I));
+        spec_.reset(new coordinateRotations::identity());
+        rot_ = sphericalTensor::I;
     }
 }
 
-void Foam::coordinateSystem::operator=(coordinateSystem&& cs)
+
+void Foam::coordinateSystem::operator=(coordinateSystem&& csys)
 {
-    transfer(cs);
+    name_ = std::move(csys.name_);
+    note_ = std::move(csys.note_);
+    spec_ = std::move(csys.spec_);
+    origin_ = csys.origin_;
+    rot_ = csys.rot_;
 }
 
 
-void Foam::coordinateSystem::init(const dictionary& dict)
+void Foam::coordinateSystem::operator=(const autoPtr<coordinateSystem>& csys)
 {
-    dict.readEntry("origin", origin_);
-    note_.clear();
-    dict.readIfPresent("note", note_);
-    R_ = coordinateRotation::New(dict.subDict("coordinateRotation"));
+    coordinateSystem::operator=(*csys);
 }
 
 
-void Foam::coordinateSystem::init
-(
-    const dictionary& dict,
-    const objectRegistry& obr
-)
+void Foam::coordinateSystem::operator=(autoPtr<coordinateSystem>&& csys)
 {
-    dict.readEntry("origin", origin_);
-
-    // The 'note' entry is optional
-    note_.clear();
-    dict.readIfPresent("note", note_);
-    R_ = coordinateRotation::New(dict.subDict("coordinateRotation"), obr);
+    coordinateSystem::operator=(std::move(*csys));
+    csys.clear();
 }
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 bool Foam::operator!=(const coordinateSystem& a, const coordinateSystem& b)
 {
     return
     (
-        a.origin() != b.origin()
-     || a.type() != b.type()
-     || a.R().R() != b.R().R()
+        a.type() != b.type()
+     || a.origin() != b.origin()
+     || a.R() != b.R()
     );
 }
 
 
-// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<(Ostream& os, const coordinateSystem& cs)
+Foam::Ostream& Foam::operator<<(Ostream& os, const coordinateSystem& csys)
 {
-    cs.write(os);
+    csys.write(os);
     os.check(FUNCTION_NAME);
     return os;
 }
diff --git a/src/meshTools/coordinate/systems/coordinateSystem.H b/src/meshTools/coordinate/systems/coordinateSystem.H
index d47608b392..619f2af5f6 100644
--- a/src/meshTools/coordinate/systems/coordinateSystem.H
+++ b/src/meshTools/coordinate/systems/coordinateSystem.H
@@ -21,40 +21,66 @@ 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::coordSystem
+
+Description
+    Namespace for coordinate systems.
+
 Class
     Foam::coordinateSystem
 
 Description
-    Base class for other coordinate system specifications.
+    Base class for coordinate system specification,
+    the default coordinate system type is
+    \link coordSystem::cartesian cartesian \endlink.
 
-    All systems are defined by an origin point and a co-ordinate rotation.
+    All systems are defined by an origin point and a coordinate rotation
+    By default, the \link coordinateRotations::axes axes \endlink
+    specification can be used directly as part of the
+    coordinate system specification. For example,
 
+    \verbatim
+    coordinateSystem
+    {
+        origin  (0 0 0);
+        e1      (0 1 0);
+        e3      (1 0 0);
+    }
+    \endverbatim
+
+    The same, but in more verbose format:
     \verbatim
     coordinateSystem
     {
         type    cartesian;
         origin  (0 0 0);
-        coordinateRotation
+        rotation
         {
-            type        cylindrical;
-            e3          (0 0 1);
+            type    axes;
+            e1      (0 1 0);
+            e3      (1 0 0);
         }
     }
     \endverbatim
 
     Types of coordinateRotation:
-      -# axesRotation
-      -# \link STARCDCoordinateRotation STARCDRotation \endlink
-      -# cylindricalCS cylindrical
-      -# EulerCoordinateRotation
-
-    Type of co-ordinates:
-      -# \link cartesianCS cartesian \endlink
+      -# \link coordinateRotations::identity none \endlink
+      -# \link coordinateRotations::axes axes \endlink
+      -# \link coordinateRotations::axisAngle axisAngle \endlink
+      -# \link coordinateRotations::euler euler \endlink
+      -# \link coordinateRotations::starcd starcd \endlink
 
+    Type of coordinateSystem:
+      -# \link coordSystem::cartesian cartesian \endlink
+      -# \link coordSystem::cylindrical cylindrical \endlink
+      -# \link coordSystem::indirect indirect \endlink (references
+      an entry in coordinateSystems).
 
 SourceFiles
     coordinateSystem.C
     coordinateSystemNew.C
+    coordinateSystemTransform.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -66,79 +92,151 @@ SourceFiles
 #include "tensor.H"
 #include "vectorField.H"
 #include "pointField.H"
-#include "tmp.H"
+#include "tensorField.H"
+#include "pointIndList.H"
 #include "coordinateRotation.H"
-#include "objectRegistry.H"
 #include "autoPtr.H"
+#include "tmp.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declarations
-
+// Forward Declarations
 class coordinateSystem;
+class objectRegistry;
 
-bool operator!=(const coordinateSystem&, const coordinateSystem&);
-Ostream& operator<<(Ostream&, const coordinateSystem&);
+namespace coordSystem
+{
+class indirect;
+}
 
 
 /*---------------------------------------------------------------------------*\
-                     Class coordinateSystem Declaration
+                      Class coordinateSystem Declaration
 \*---------------------------------------------------------------------------*/
 
 class coordinateSystem
 {
-    // Private data
+    // Private Member Functions
 
-        //- Name of coordinate system
-        word name_;
-
-        //- Optional note
-        string note_;
-
-        //- Origin
-        point origin_;
-
-        //- Local-to-Global transformation tensor.
-        //  May be invalid after a move assignment or transfer
-        autoPtr<coordinateRotation> R_;
+        //- Use 'coordinateSystem' sub-dictionary if present
+        static const dictionary* subDictCompat(const dictionary* dictPtr);
 
 
 protected:
 
+    //- Friendship with indirect for dispatching to its underlying system
+    friend coordSystem::indirect;
+
+
+    // Protected Data
+
+        //- User specification of the coordinate rotation
+        //  May be invalid after a move assignment or transfer
+        autoPtr<coordinateRotation> spec_;
+
+        //- The coordinate system origin
+        point origin_;
+
+        //- The rotation tensor
+        tensor rot_;
+
+        //- The name of the coordinate system (optional)
+        word name_;
+
+        //- An optional note describing the coordinate system
+        string note_;
+
+        //- Dummy coordinate system for suppressed manipulation
+        static coordinateSystem dummy_;
+
+
     // Protected Member Functions
 
-        //- Convert from local coordinate system to the global Cartesian system
-        //- with optional translation for the origin
-        virtual vector localToGlobal(const vector&, bool translate) const;
+        //- Implementation for R() methods
+        template<class PointField>
+        tmp<tensorField> rotationsImpl(const PointField& global) const;
 
-        //- Convert from local coordinate system to the global Cartesian system
+        //- Implementation for transformPoint() methods
+        template<class PointField>
+        tmp<pointField> transformPointImpl(const PointField& localCart) const;
+
+        //- Implementation for transformPosition() methods
+        template<class PointField>
+        tmp<pointField> invTransformPointImpl(const PointField& global) const;
+
+        //- Apply single transform tensor for multiple inputs
+        template<class RetType, class Type, class BinaryOp>
+        static tmp<Field<RetType>> manyTimesImpl
+        (
+            const tensor& tt,
+            const UList<Type>& input,
+            const BinaryOp& bop
+        );
+
+        //- Use position-dependent transform tensors for multiple inputs
+        template<class RetType, class PointField, class Type, class BinaryOp>
+        tmp<Field<RetType>> oneToOneImpl
+        (
+            const PointField& global,
+            const UList<Type>& input,
+            const BinaryOp& bop
+        ) const;
+
+        //- Use position-dependent transform tensors for single input
+        template<class RetType, class PointField, class Type, class BinaryOp>
+        tmp<Field<RetType>> oneToManyImpl
+        (
+            const PointField& global,
+            const Type& input,
+            const BinaryOp& bop
+        ) const;
+
+
+        //- From local coordinate system to the global Cartesian system
+        //- with optional translation for the origin
+        virtual vector localToGlobal
+        (
+            const vector& local,
+            bool translate
+        ) const;
+
+        //- From local coordinate system to the global Cartesian system
         //- with optional translation for the origin
         virtual tmp<vectorField> localToGlobal
         (
-            const vectorField&,
+            const vectorField& local,
             bool translate
         ) const;
 
-        //- Convert from global Cartesian system to the local coordinate system
+        //- From global Cartesian system to the local coordinate system
         //- with optional translation for the origin
-        virtual vector globalToLocal(const vector&, bool translate) const;
+        virtual vector globalToLocal
+        (
+            const vector& global,
+            bool translate
+        ) const;
 
-        //- Convert from global Cartesian system to the local coordinate system
+        //- From global Cartesian system to the local coordinate system
         //- with optional translation for the origin
         virtual tmp<vectorField> globalToLocal
         (
-            const vectorField&,
+            const vectorField& global,
             bool translate
         ) const;
 
-        //- Init from dict and obr
-        void init(const dictionary& dict);
 
-        //- Init from dictionary
-        void init(const dictionary& dict, const objectRegistry& obr);
+        //- Assign from dictionary content
+        void assign(const dictionary& dict);
+
+
+    // Constructors
+
+        //- Construct null, without allocating a coordinateRotation
+        //- specification.
+        coordinateSystem(std::nullptr_t);
 
 
 public:
@@ -146,23 +244,57 @@ public:
     //- Runtime type information
     TypeName("coordinateSystem");
 
+        //- Helper for construction of coordinateSystem PtrList
+        //  The Istream contains a word followed by a dictionary
+        struct iNew
+        {
+            autoPtr<coordinateSystem> operator()(Istream& is) const
+            {
+                return coordinateSystem::New(is);
+            }
+        };
+
 
     // Constructors
 
-        //- Construct null. This is equivalent to an identity coordinateSystem
+        //- Construct null. This is an identity coordinateSystem.
         coordinateSystem();
 
+        //- Copy construct from rotation with origin=0
+        explicit coordinateSystem(const coordinateRotation& crot);
+
+        //- Move construct from rotation with origin=0
+        explicit coordinateSystem(coordinateRotation&& crot);
+
         //- Copy construct
-        coordinateSystem(const coordinateSystem& cs);
+        coordinateSystem(const coordinateSystem& csys);
 
         //- Move construct
-        coordinateSystem(coordinateSystem&& cs);
+        coordinateSystem(coordinateSystem&& csys);
+
+        //- Move construct from autoPtr
+        explicit coordinateSystem(autoPtr<coordinateSystem>&& csys);
 
         //- Copy construct with a different name
         coordinateSystem
         (
             const word& name,
-            const coordinateSystem& cs
+            const coordinateSystem& csys
+        );
+
+        //- Construct from origin and rotation
+        coordinateSystem
+        (
+            const point& origin,
+            const coordinateRotation& crot
+        );
+
+        //- Construct from origin and 2 axes
+        coordinateSystem
+        (
+            const point& origin,
+            const vector& axis,
+            const vector& dirn
         );
 
         //- Construct from origin and rotation
@@ -170,7 +302,7 @@ public:
         (
             const word& name,
             const point& origin,
-            const coordinateRotation&
+            const coordinateRotation& crot
         );
 
         //- Construct from origin and 2 axes
@@ -185,16 +317,13 @@ public:
         //- Construct from dictionary with a given name
         coordinateSystem(const word& name, const dictionary& dict);
 
-        //- Construct from dictionary with default name
+        //- Construct from dictionary without a name
         explicit coordinateSystem(const dictionary& dict);
 
-        //- Construct from dictionary (default name)
-        //  With the ability to reference global coordinateSystems
-        coordinateSystem(const objectRegistry& obr, const dictionary& dict);
-
-        //- Construct from Istream
-        //  The Istream contains a word followed by a dictionary
-        coordinateSystem(Istream& is);
+        //- Construct from dictionary with optional subDict lookup.
+        //
+        //  \param dictName If non-empty, the sub-dictionary to use.
+        coordinateSystem(const dictionary& dict, const word& dictName);
 
 
     //- Return clone
@@ -210,6 +339,18 @@ public:
         autoPtr,
         coordinateSystem,
         dictionary,
+        (
+            const dictionary& dict
+        ),
+        (dict)
+    );
+
+    // Declare run-time constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        coordinateSystem,
+        registry,
         (
             const objectRegistry& obr,
             const dictionary& dict
@@ -220,20 +361,57 @@ public:
 
     // Selectors
 
-        //- Select constructed from dictionary and objectRegistry
+        //- Select construct the specified coordinate system type
+        //- with reference to objectRegistry for indirect entries.
+        //
+        //  An empty modelType will be treated as "cartesian"
         static autoPtr<coordinateSystem> New
         (
+            word modelType,
             const objectRegistry& obr,
             const dictionary& dict
         );
 
-        //- Select constructed from dictionary
+        //- Select construct the specified coordinate system type
+        //
+        //  An empty modelType will be treated as "cartesian"
         static autoPtr<coordinateSystem> New
         (
+            word modelType,
             const dictionary& dict
         );
 
+        //- Select construct from dictionary with reference to objectRegistry
+        //- for indirect entries.
+        //
+        //  \param dictName If non-empty, the sub-dictionary name to use
+        //      for the coordinate system description.
+        //
+        //  \note When the dictName is empty, it includes an implicit search
+        //      for a "coordinateSystem" sub-dictionary for convenience and
+        //      compatibility with previous versions (1806 and earlier).
+        static autoPtr<coordinateSystem> New
+        (
+            const objectRegistry& obr,
+            const dictionary& dict,
+            const word& dictName = ""
+        );
+
+        //- Select constructed from dictionary
+        //  \param dictName If non-empty, the sub-dictionary name to use
+        //      for the coordinate system description.
+        //
+        //  \note When the dictName is empty, it includes an implicit search
+        //      for a "coordinateSystem" sub-dictionary for convenience and
+        //      compatibility with previous versions (1806 and earlier).
+        static autoPtr<coordinateSystem> New
+        (
+            const dictionary& dict,
+            const word& dictName = ""
+        );
+
         //- Select constructed from Istream
+        //  Expects a name/dictionary as input
         static autoPtr<coordinateSystem> New(Istream& is);
 
 
@@ -243,183 +421,308 @@ public:
 
     // Member Functions
 
-        // Access
+    // Access
 
-            //- Return name
-            const word& name() const
-            {
-                return name_;
-            }
+        //- Considered valid if it has a specification
+        virtual bool valid() const
+        {
+            return spec_.valid();
+        }
 
-            //- Return non-constant access to the optional note
-            string& note()
-            {
-                return note_;
-            }
+        //- True if the rotation tensor is uniform for all locations
+        virtual bool uniform() const
+        {
+            return true;
+        }
 
-            //- Return the optional note
-            const string& note() const
-            {
-                return note_;
-            }
+        //- The rotation specification
+        virtual const coordinateRotation& rotation() const
+        {
+            return *spec_;
+        }
 
-            //- Return origin
-            const point& origin() const
-            {
-                return origin_;
-            }
+        //- Return the name
+        virtual const word& name() const
+        {
+            return name_;
+        }
 
-            //- Return const reference to co-ordinate rotation
-            const coordinateRotation& R() const
-            {
-                return *R_;
-            }
+        //- Return the optional note
+        virtual const string& note() const
+        {
+            return note_;
+        }
 
-            //- Return non const reference to co-ordinate rotation
-            coordinateRotation& R()
-            {
-                return *R_;
-            }
+        //- Return origin
+        virtual const point& origin() const
+        {
+            return origin_;
+        }
 
-            //- Update and return the co-ordinate rotation for a list of cells
-            const coordinateRotation& R
-            (
-                const polyMesh& mesh,
-                const labelList& cells
-            )
-            {
-                R_->updateCells(mesh, cells);
-                return *R_;
-            }
+        //- Return const reference to the rotation tensor
+        virtual const tensor& R() const
+        {
+            return rot_;
+        }
 
-            //- Return as dictionary of entries
-            //  \param[in] ignoreType drop type (cartesian, cylindrical, etc)
-            //  when generating the dictionary
-            virtual dictionary dict(bool ignoreType=false) const;
+        //- The local Cartesian x-axis in global coordinates
+        virtual const vector e1() const
+        {
+            return rot_.cx();
+        }
+
+        //- The local Cartesian y-axis in global coordinates
+        virtual const vector e2() const
+        {
+            return rot_.cy();
+        }
+
+        //- The local Cartesian z-axis in global coordinates
+        virtual const vector e3() const
+        {
+            return rot_.cz();
+        }
 
 
-        // Edit
+    // Edit
 
-            //- Rename
-            void rename(const word& newName)
-            {
-                name_ = newName;
-            }
+        //- Rename
+        virtual void rename(const word& newName)
+        {
+            name_ = newName;
+        }
 
-            //- Edit access to origin
-            point& origin()
-            {
-                return origin_;
-            }
+        //- Provide non-constant access to the optional note
+        virtual string& note()
+        {
+            return note_;
+        }
 
-            //- Reset origin and rotation to an identity coordinateSystem
-            //  Also resets the note
-            virtual void clear();
+        //- Edit access to origin
+        virtual point& origin()
+        {
+            return origin_;
+        }
 
-            //- Transfer contents from parameter
-            void transfer(coordinateSystem& cs);
+        //- Reset origin and rotation to an identity coordinateSystem
+        //  Also resets the note
+        virtual void clear();
+
+        //- Change the rotation
+        virtual void rotation(autoPtr<coordinateRotation>&& crot);
 
 
-        // Write
+    // Write
 
-            //- Write
-            virtual void write(Ostream& os) const;
+        //- Write
+        virtual void write(Ostream& os) const;
 
-            //- Write dictionary
-            void writeDict(Ostream& os, bool subDict=true) const;
-
-
-        // Transformations
-
-            //- Convert from position in local coordinate system to global
-            //  Cartesian position
-            point globalPosition(const point& local) const
-            {
-                return localToGlobal(local, true);
-            }
-
-            //- Convert from position in local coordinate system to global
-            //  Cartesian position
-            tmp<pointField> globalPosition(const pointField& local) const
-            {
-                return localToGlobal(local, true);
-            }
-
-            //- Convert from vector components in local coordinate system to
-            //  global Cartesian vector
-            vector globalVector(const vector& local) const
-            {
-                return localToGlobal(local, false);
-            }
-
-            //- Convert from vector components in local coordinate system to
-            //  global Cartesian vector
-            tmp<vectorField> globalVector(const vectorField& local) const
-            {
-                return localToGlobal(local, false);
-            }
-
-            //- Convert from global Cartesian position to position in local
-            //  coordinate system
-            point localPosition(const point& global) const
-            {
-                return globalToLocal(global, true);
-            }
-
-            //- Convert from global Cartesian position to position in local
-            //  coordinate system
-            tmp<pointField> localPosition(const pointField& global) const
-            {
-                return globalToLocal(global, true);
-            }
-
-            //- Convert from global Cartesian vector to components in local
-            //  coordinate system
-            vector localVector(const vector& global) const
-            {
-                return globalToLocal(global, false);
-            }
-
-            //- Convert from global Cartesian vector to components in local
-            //  coordinate system
-            tmp<vectorField> localVector(const vectorField& global) const
-            {
-                return globalToLocal(global, false);
-            }
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const;
 
 
     // Member Operators
 
         //- Copy assignment
-        void operator=(const coordinateSystem& cs);
+        void operator=(const coordinateSystem& csys);
 
         //- Move assignment
-        void operator=(coordinateSystem&& cs);
+        void operator=(coordinateSystem&& csys);
+
+        //- Copy assignment from autoPtr
+        void operator=(const autoPtr<coordinateSystem>& csys);
+
+        //- Move assignment from autoPtr
+        void operator=(autoPtr<coordinateSystem>&& csys);
 
 
-        // Friend Operators
+    // Rotation
 
-            friend bool operator!=
-            (
-                const coordinateSystem& a,
-                const coordinateSystem& b
-            );
+        //- Position-dependent rotation tensor (when uniform = false)
+        //- \return tensor
+        virtual tensor R(const point& global) const;
+
+        //- Position-dependent rotation tensors (when uniform = false)
+        //- \return tensorField
+        virtual tmp<tensorField> R(const UList<point>& global) const;
+
+        //- Position-dependent rotation tensors (when uniform = false)
+        //- \return tensorField
+        virtual tmp<tensorField> R(const pointUIndList& global) const;
 
 
-        // IOstream Operators
+    // Position
 
-            friend Ostream& operator<<
-            (
-                Ostream& os,
-                const coordinateSystem& cs
-            );
+        //- Transform point and add origin offset.
+        //  Corresponds to a local-to-global transformation using Cartesian
+        //  coordinates for both local and global.
+        point transformPoint(const point& localCart) const;
+
+        //- Transform points and add origin offset.
+        tmp<pointField> transformPoint(const UList<point>& localCart) const;
+
+        //- Transform points and add origin offset.
+        tmp<pointField> transformPoint(const pointUIndList& localCart) const;
+
+
+        //- Remove origin offset and inverse transform point.
+        //  Corresponds to a global-to-local transformation using Cartesian
+        //  coordinates for both local and global.
+        point invTransformPoint(const point& global) const;
+
+        //- Remove origin offset and inverse transform points.
+        tmp<pointField> invTransformPoint(const UList<point>& global) const;
+
+        //- Remove origin offset and inverse transform points.
+        tmp<pointField> invTransformPoint(const pointUIndList& global) const;
+
+
+    // Transformations with change of coordinate types
+
+        //- From local coordinate position to global (cartesian) position
+        point globalPosition(const point& local) const
+        {
+            return localToGlobal(local, true);
+        }
+
+        //- From local coordinate position to global (cartesian) position
+        tmp<pointField> globalPosition(const pointField& local) const
+        {
+            return localToGlobal(local, true);
+        }
+
+        //- From global (cartesian) position to local coordinate position
+        point localPosition(const point& global) const
+        {
+            return globalToLocal(global, true);
+        }
+
+        //- From global (cartesian) position to local coordinate position
+        tmp<pointField> localPosition(const pointField& global) const
+        {
+            return globalToLocal(global, true);
+        }
+
+
+
+        //- From local to global (cartesian) vector components
+        vector globalVector(const vector& local) const
+        {
+            return localToGlobal(local, false);
+        }
+
+        //- From local to global (cartesian) vector components
+        tmp<vectorField> globalVector(const vectorField& local) const
+        {
+            return localToGlobal(local, false);
+        }
+
+        //- From global (cartesian) to local vector components
+        vector localVector(const vector& global) const
+        {
+            return globalToLocal(global, false);
+        }
+
+        //- From global (cartesian) to local vector components
+        tmp<vectorField> localVector(const vectorField& global) const
+        {
+            return globalToLocal(global, false);
+        }
+
+
+    // Transformations (input and output are Cartesian)
+
+#undef  defineCoordinateSystemTransform
+#define defineCoordinateSystemTransform(Op, RetType, Type)                    \
+                                                                              \
+    /**! With constant rotation tensor */                                     \
+    virtual RetType Op(const Type& input) const;                              \
+                                                                              \
+    /**! With constant rotation tensor */                                     \
+    virtual tmp<Field<RetType>> Op(const UList<Type>& input) const;           \
+                                                                              \
+    /**! With rotation tensor at given global position */                     \
+    virtual RetType Op(const point& global, const Type& input) const;         \
+                                                                              \
+    /**! With rotation tensors at given global positions */                   \
+    virtual tmp<Field<RetType>> Op                                            \
+    (                                                                         \
+        const UList<point>& global,                                           \
+        const Type& input                                                     \
+    ) const;                                                                  \
+                                                                              \
+    /**! With rotation tensors at given global positions */                   \
+    virtual tmp<Field<RetType>> Op                                            \
+    (                                                                         \
+        const pointUIndList& global,                                          \
+        const Type& input                                                     \
+    ) const;                                                                  \
+                                                                              \
+    /**! With rotation tensors at given global positions */                   \
+    virtual tmp<Field<RetType>> Op                                            \
+    (                                                                         \
+        const UList<point>& global,                                           \
+        const UList<Type>& input                                              \
+    ) const;                                                                  \
+                                                                              \
+    /**! With rotation tensors at given global positions */                   \
+    virtual tmp<Field<RetType>> Op                                            \
+    (                                                                         \
+        const pointUIndList& global,                                          \
+        const UList<Type>& input                                              \
+    ) const;
+
+
+    defineCoordinateSystemTransform(transformPrincipal, symmTensor, vector);
+
+    defineCoordinateSystemTransform(transform, scalar, scalar);
+    defineCoordinateSystemTransform(transform, vector, vector);
+    defineCoordinateSystemTransform
+    (
+        transform,
+        sphericalTensor,
+        sphericalTensor
+    );
+    defineCoordinateSystemTransform(transform, symmTensor, symmTensor);
+    defineCoordinateSystemTransform(transform, tensor, tensor);
+
+    defineCoordinateSystemTransform(invTransform, scalar, scalar);
+    defineCoordinateSystemTransform(invTransform, vector, vector);
+    defineCoordinateSystemTransform
+    (
+        invTransform,
+        sphericalTensor,
+        sphericalTensor
+    );
+    defineCoordinateSystemTransform(invTransform, symmTensor, symmTensor);
+    defineCoordinateSystemTransform(invTransform, tensor, tensor);
+
+    #undef defineCoordinateSystemTransform
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Global Operators
+
+//- Compare inequality
+bool operator!=(const coordinateSystem& a, const coordinateSystem& b);
+
+//- Output operator
+Ostream& operator<<(Ostream& os, const coordinateSystem& csys);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "coordinateSystemTemplates.C"
+#endif
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/meshTools/coordinate/systems/coordinateSystemNew.C b/src/meshTools/coordinate/systems/coordinateSystemNew.C
index 9f0fd18866..13c21578ed 100644
--- a/src/meshTools/coordinate/systems/coordinateSystemNew.C
+++ b/src/meshTools/coordinate/systems/coordinateSystemNew.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,58 +23,188 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "coordinateSystem.H"
-#include "dictionary.H"
+#include "objectRegistry.H"
+#include "cartesianCS.H"
+#include "indirectCS.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+
+//- Handle a 'coordinateSystem' sub-dictionary
+// In 1806 and earlier, this was handled (rather poorly) in the
+// coordinateSystem constructor itself.
+const Foam::dictionary* Foam::coordinateSystem::subDictCompat
+(
+    const dictionary* dictPtr
+)
+{
+    if (dictPtr)
+    {
+        // Non-recursive, no pattern matching in the search
+        const auto finder =
+            dictPtr->csearch(coordinateSystem::typeName_(), false, false);
+
+        if (finder.isDict())
+        {
+            return finder.dictPtr();
+        }
+        else if (finder.found())
+        {
+            const word csName(finder.ref().stream());
+
+            // Deprecated, unsupported syntax
+
+            std::cerr
+                << "--> FOAM IOWarning :" << nl
+                << "    Ignoring 'coordinateSystem' as a keyword."
+                " Perhaps you meant this instead?" << nl
+                << '{' << nl
+                << "    type    " << coordSystem::indirect::typeName_()
+                << ';' << nl
+                << "    name    " << csName << ';' << nl
+                << '}' << nl
+                << std::endl;
+
+            error::warnAboutAge("syntax change", 1806);
+        }
+    }
+
+    return dictPtr;
+}
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
 (
+    word modelType,
     const objectRegistry& obr,
     const dictionary& dict
 )
 {
-    const dictionary& coordDict = dict.subDict(typeName_());
-    const word modelType(coordDict.get<word>("type"));
+    if (modelType.empty())
+    {
+        modelType = coordSystem::cartesian::typeName_();
+    }
+
+    auto cstrIter1 = registryConstructorTablePtr_->cfind(modelType);
+
+    if (cstrIter1.found())
+    {
+        return autoPtr<coordinateSystem>(cstrIter1()(obr, dict));
+    }
 
     auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
+    // Everything with a registry constructor also has a dictionary
+    // constructor, so just need to print those.
     if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "Unknown coordinateSystem type "
+        FatalIOErrorInFunction(dict)
+            << "Unknown coordinate system type "
             << modelType << nl << nl
             << "Valid types:  "
             << flatOutput(dictionaryConstructorTablePtr_->sortedToc())
             << exit(FatalIOError);
     }
 
-    return autoPtr<coordinateSystem>(cstrIter()(obr, coordDict));
+    return autoPtr<coordinateSystem>(cstrIter()(dict));
 }
 
 
 Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
 (
+    word modelType,
     const dictionary& dict
 )
 {
-    const dictionary& coordDict = dict.subDict(typeName_());
+    if (modelType.empty())
+    {
+        modelType = coordSystem::cartesian::typeName_();
+    }
 
-    return autoPtr<coordinateSystem>::New(coordDict);
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+
+    if (!cstrIter.found())
+    {
+        FatalIOErrorInFunction(dict)
+            << "Unknown coordinate system type "
+            << modelType << nl << nl
+            << "Valid types:  "
+            << flatOutput(dictionaryConstructorTablePtr_->sortedToc())
+            << exit(FatalIOError);
+    }
+
+    return autoPtr<coordinateSystem>(cstrIter()(dict));
 }
 
 
 Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
 (
-    Istream& is
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const word& dictName
 )
 {
-    const word name(is);
+    const dictionary* dictPtr = &dict;
+
+    if (dictName.size())
+    {
+        dictPtr = &(dictPtr->subDict(dictName));
+    }
+    else
+    {
+        // Use 'coordinateSystem' subDict if present
+        dictPtr = coordinateSystem::subDictCompat(dictPtr);
+    }
+
+    word modelType = dictPtr->lookupOrDefault<word>
+    (
+        "type",
+        coordSystem::cartesian::typeName_()
+    );
+
+    return coordinateSystem::New(modelType, obr, *dictPtr);
+}
+
+
+Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New
+(
+    const dictionary& dict,
+    const word& dictName
+)
+{
+    const dictionary* dictPtr = &dict;
+
+    if (dictName.size())
+    {
+        dictPtr = &(dictPtr->subDict(dictName));
+    }
+    else
+    {
+        // Use 'coordinateSystem' subDict if present
+        dictPtr = coordinateSystem::subDictCompat(dictPtr);
+    }
+
+    word modelType = dictPtr->lookupOrDefault<word>
+    (
+        "type",
+        coordSystem::cartesian::typeName_()
+    );
+
+    return coordinateSystem::New(modelType, *dictPtr);
+}
+
+
+Foam::autoPtr<Foam::coordinateSystem> Foam::coordinateSystem::New(Istream& is)
+{
+    const word csName(is);
     const dictionary dict(is);
 
-    return autoPtr<coordinateSystem>::New(name, dict);
+    auto cs = coordinateSystem::New(dict, word::null);
+    cs->rename(csName);
+
+    return cs;
 }
 
 
diff --git a/src/meshTools/coordinate/systems/coordinateSystemTemplates.C b/src/meshTools/coordinate/systems/coordinateSystemTemplates.C
new file mode 100644
index 0000000000..e294b167f4
--- /dev/null
+++ b/src/meshTools/coordinate/systems/coordinateSystemTemplates.C
@@ -0,0 +1,161 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "coordinateSystem.H"
+#include "transform.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class PointField>
+Foam::tmp<Foam::tensorField>
+Foam::coordinateSystem::rotationsImpl(const PointField& global) const
+{
+    const label len = global.size();
+
+    auto tresult = tmp<tensorField>::New(len);
+    auto& result = tresult.ref();
+
+    for (label i=0; i<len; ++i)
+    {
+        result[i] = this->R(global[i]);
+    }
+
+    return tresult;
+}
+
+
+template<class PointField>
+Foam::tmp<Foam::pointField>
+Foam::coordinateSystem::transformPointImpl(const PointField& localCart) const
+{
+    const label len = localCart.size();
+
+    auto tresult = tmp<pointField>::New(len);
+    auto& result = tresult.ref();
+
+    for (label i=0; i<len; ++i)
+    {
+        result[i] = Foam::transform(rot_, localCart[i]) + origin_;
+    }
+
+    return tresult;
+}
+
+
+template<class PointField>
+Foam::tmp<Foam::pointField>
+Foam::coordinateSystem::invTransformPointImpl(const PointField& global) const
+{
+    const label len = global.size();
+
+    auto tresult = tmp<pointField>::New(len);
+    auto& result = tresult.ref();
+
+    for (label i=0; i<len; ++i)
+    {
+        result[i] = Foam::invTransform(rot_, global[i] - origin_);
+    }
+
+    return tresult;
+}
+
+
+template<class RetType, class Type, class BinaryOp>
+Foam::tmp<Foam::Field<RetType>>
+Foam::coordinateSystem::manyTimesImpl
+(
+    const tensor& tt,
+    const UList<Type>& input,
+    const BinaryOp& bop
+)
+{
+    const label len = input.size();
+
+    auto tresult = tmp<Field<RetType>>::New(len);
+    auto& result = tresult.ref();
+
+    for (label i=0; i<len; ++i)
+    {
+        result[i] = bop(tt, input[i]);
+    }
+
+    return tresult;
+}
+
+
+template<class RetType, class PointField, class Type, class BinaryOp>
+Foam::tmp<Foam::Field<RetType>>
+Foam::coordinateSystem::oneToOneImpl
+(
+    const PointField& global,
+    const UList<Type>& input,
+    const BinaryOp& bop
+) const
+{
+    const label len = input.size();
+
+    if (len != global.size())
+    {
+        FatalErrorInFunction
+            << "positions has different size from input field"
+            << abort(FatalError);
+    }
+
+    auto tresult = tmp<Field<RetType>>::New(len);
+    auto& result = tresult.ref();
+
+    for (label i=0; i<len; ++i)
+    {
+        result[i] = bop(this->R(global[i]), input[i]);
+    }
+
+    return tresult;
+}
+
+
+template<class RetType, class PointField, class Type, class BinaryOp>
+Foam::tmp<Foam::Field<RetType>>
+Foam::coordinateSystem::oneToManyImpl
+(
+    const PointField& global,
+    const Type& input,
+    const BinaryOp& bop
+) const
+{
+    const label len = global.size();
+
+    auto tresult = tmp<Field<RetType>>::New(len);
+    auto& result = tresult.ref();
+
+    for (label i=0; i<len; ++i)
+    {
+        result[i] = bop(this->R(global[i]), input);
+    }
+
+    return tresult;
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/systems/coordinateSystemTransform.C b/src/meshTools/coordinate/systems/coordinateSystemTransform.C
new file mode 100644
index 0000000000..d08877a8c4
--- /dev/null
+++ b/src/meshTools/coordinate/systems/coordinateSystemTransform.C
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "coordinateSystem.H"
+#include "transform.H"
+
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Resolve templated global functions via local non-templated function.
+// Lambda functions in the caller is a much messier solution.
+
+#undef  makeTransform
+#define makeTransform(Op, Type)                                               \
+    static inline Type Op##_##Type(const tensor& tt, const Type& in)          \
+    {                                                                         \
+        return Op(tt, in);                                                    \
+    }
+
+makeTransform(transform, scalar);
+makeTransform(transform, vector);
+makeTransform(transform, sphericalTensor);
+makeTransform(transform, symmTensor);
+makeTransform(transform, tensor);
+
+makeTransform(invTransform, scalar);
+makeTransform(invTransform, vector);
+makeTransform(invTransform, sphericalTensor);
+makeTransform(invTransform, symmTensor);
+makeTransform(invTransform, tensor);
+
+#undef makeTransform
+
+    //- Transform principal.
+    static inline symmTensor transformPrincipal_vector
+    (
+        const tensor& tt,
+        const vector& v
+    )
+    {
+        return symmTensor
+        (
+            tt.xx()*v.x()*tt.xx()
+          + tt.xy()*v.y()*tt.xy()
+          + tt.xz()*v.z()*tt.xz(),
+
+            tt.xx()*v.x()*tt.yx()
+          + tt.xy()*v.y()*tt.yy()
+          + tt.xz()*v.z()*tt.yz(),
+
+            tt.xx()*v.x()*tt.zx()
+          + tt.xy()*v.y()*tt.zy()
+          + tt.xz()*v.z()*tt.zz(),
+
+            tt.yx()*v.x()*tt.yx()
+          + tt.yy()*v.y()*tt.yy()
+          + tt.yz()*v.z()*tt.yz(),
+
+            tt.yx()*v.x()*tt.zx()
+          + tt.yy()*v.y()*tt.zy()
+          + tt.yz()*v.z()*tt.zz(),
+
+            tt.zx()*v.x()*tt.zx()
+          + tt.zy()*v.y()*tt.zy()
+          + tt.zz()*v.z()*tt.zz()
+        );
+    }
+
+} // End namespace Foam
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::pointField> Foam::coordinateSystem::transformPoint
+(
+    const UList<point>& localCart
+) const
+{
+    return transformPointImpl(localCart);
+}
+
+
+Foam::tmp<Foam::pointField> Foam::coordinateSystem::transformPoint
+(
+    const pointUIndList& localCart
+) const
+{
+    return transformPointImpl(localCart);
+}
+
+
+Foam::tmp<Foam::pointField> Foam::coordinateSystem::invTransformPoint
+(
+    const UList<point>& global
+) const
+{
+    return invTransformPointImpl(global);
+}
+
+
+Foam::tmp<Foam::pointField> Foam::coordinateSystem::invTransformPoint
+(
+    const pointUIndList& global
+) const
+{
+    return invTransformPointImpl(global);
+}
+
+
+// Transformations
+
+#undef  makeCoordinateSystemTransform
+#define makeCoordinateSystemTransform(Op, RetType, Type)                      \
+    Foam::RetType Foam::coordinateSystem::Op                                  \
+    (                                                                         \
+        const Type& input                                                     \
+    ) const                                                                   \
+    {                                                                         \
+        return Op##_##Type(rot_, input);                                      \
+    }                                                                         \
+                                                                              \
+    Foam::tmp<Foam::Field<Foam::RetType>> Foam::coordinateSystem::Op          \
+    (                                                                         \
+        const UList<Type>& input                                              \
+    ) const                                                                   \
+    {                                                                         \
+        return manyTimesImpl<RetType>(rot_, input, Op##_##Type);              \
+    }                                                                         \
+                                                                              \
+    Foam::RetType Foam::coordinateSystem::Op                                  \
+    (                                                                         \
+        const point& global,                                                  \
+        const Type& input                                                     \
+    ) const                                                                   \
+    {                                                                         \
+        return Op##_##Type(this->R(global), input);                           \
+    }                                                                         \
+                                                                              \
+    Foam::tmp<Foam::Field<Foam::RetType>> Foam::coordinateSystem::Op          \
+    (                                                                         \
+        const UList<point>& global,                                           \
+        const Type& input                                                     \
+    ) const                                                                   \
+    {                                                                         \
+        return oneToManyImpl<RetType>(global, input, Op##_##Type);            \
+    }                                                                         \
+                                                                              \
+    Foam::tmp<Foam::Field<Foam::RetType>> Foam::coordinateSystem::Op          \
+    (                                                                         \
+        const pointUIndList& global,                                          \
+        const Type& input                                                     \
+    ) const                                                                   \
+    {                                                                         \
+        return oneToManyImpl<RetType>(global, input, Op##_##Type);            \
+    }                                                                         \
+                                                                              \
+    Foam::tmp<Foam::Field<Foam::RetType>> Foam::coordinateSystem::Op          \
+    (                                                                         \
+        const UList<point>& global,                                           \
+        const UList<Type>& input                                              \
+    ) const                                                                   \
+    {                                                                         \
+        return oneToOneImpl<RetType>(global, input, Op##_##Type);             \
+    }                                                                         \
+                                                                              \
+    Foam::tmp<Foam::Field<Foam::RetType>> Foam::coordinateSystem::Op          \
+    (                                                                         \
+        const pointUIndList& global,                                          \
+        const UList<Type>& input                                              \
+    ) const                                                                   \
+    {                                                                         \
+        return oneToOneImpl<RetType>(global, input, Op##_##Type);             \
+    }
+
+
+makeCoordinateSystemTransform(transformPrincipal, symmTensor, vector);
+
+makeCoordinateSystemTransform(transform, scalar, scalar);
+makeCoordinateSystemTransform(transform, vector, vector);
+makeCoordinateSystemTransform(transform, sphericalTensor, sphericalTensor);
+makeCoordinateSystemTransform(transform, symmTensor, symmTensor);
+makeCoordinateSystemTransform(transform, tensor, tensor);
+
+makeCoordinateSystemTransform(invTransform, scalar, scalar);
+makeCoordinateSystemTransform(invTransform, vector, vector);
+makeCoordinateSystemTransform(invTransform, sphericalTensor, sphericalTensor);
+makeCoordinateSystemTransform(invTransform, symmTensor, symmTensor);
+makeCoordinateSystemTransform(invTransform, tensor, tensor);
+
+#undef makeCoordinateSystemTransform
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/systems/coordinateSystems.C b/src/meshTools/coordinate/systems/coordinateSystems.C
index 5a91c86fd1..5fcb359ad5 100644
--- a/src/meshTools/coordinate/systems/coordinateSystems.C
+++ b/src/meshTools/coordinate/systems/coordinateSystems.C
@@ -24,18 +24,20 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "coordinateSystems.H"
-#include "IOPtrList.H"
 #include "Time.H"
-#include "stringListOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(coordinateSystems, 0);
-    defineTemplateTypeNameAndDebug(IOPtrList<coordinateSystem>, 0);
+    defineTypeName(coordinateSystems);
 }
 
+// File-local
+
+//- Header name for 1806 and earlier
+static const char* headerTypeCompat = "IOPtrList<coordinateSystem>";
+
 
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
@@ -127,12 +129,77 @@ namespace Foam
 } // End namespace Foam
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+
+void Foam::coordinateSystems::readFromStream(const bool valid)
+{
+    Istream& is = readStream(word::null, valid);
+
+    if (valid)
+    {
+        if (headerClassName() == typeName)
+        {
+            this->readIstream(is, coordinateSystem::iNew());
+            close();
+        }
+        else if (headerClassName() == headerTypeCompat)
+        {
+            // Older (1806 and earlier) header name
+            std::cerr
+                << "--> FOAM IOWarning :" << nl
+                << "    Found header class name '" << headerTypeCompat
+                << "' instead of '" << typeName << "'" << nl;
+
+            error::warnAboutAge("header class", 1806);
+
+            this->readIstream(is, coordinateSystem::iNew());
+            close();
+        }
+        else
+        {
+            FatalIOErrorInFunction
+            (
+                is
+            )   << "unexpected class name " << headerClassName()
+                << " expected " << typeName
+                << " or " << headerTypeCompat << nl
+                << "    while reading object " << name()
+                << exit(FatalIOError);
+        }
+    }
+}
+
+
+bool Foam::coordinateSystems::readObject(const IOobject& io)
+{
+    if
+    (
+        (
+            io.readOpt() == IOobject::MUST_READ
+         || io.readOpt() == IOobject::MUST_READ_IF_MODIFIED
+        )
+     || (io.readOpt() == IOobject::READ_IF_PRESENT && headerOk())
+    )
+    {
+        readFromStream();
+        return true;
+    }
+
+    return false;
+}
+
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::coordinateSystems::coordinateSystems(const IOobject& io)
 :
-    IOPtrList<coordinateSystem>(io)
-{}
+    regIOobject(io),
+    PtrList<coordinateSystem>()
+{
+    readObject(io);
+}
 
 
 Foam::coordinateSystems::coordinateSystems
@@ -141,8 +208,14 @@ Foam::coordinateSystems::coordinateSystems
     const PtrList<coordinateSystem>& content
 )
 :
-    IOPtrList<coordinateSystem>(io, content)
-{}
+    regIOobject(io),
+    PtrList<coordinateSystem>()
+{
+    if (!readObject(io))
+    {
+        static_cast<PtrList<coordinateSystem>&>(*this) = content;
+    }
+}
 
 
 Foam::coordinateSystems::coordinateSystems
@@ -151,8 +224,11 @@ Foam::coordinateSystems::coordinateSystems
     PtrList<coordinateSystem>&& content
 )
 :
-    IOPtrList<coordinateSystem>(io, std::move(content))
-{}
+    regIOobject(io),
+    PtrList<coordinateSystem>(std::move(content))
+{
+    readObject(io);
+}
 
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
@@ -253,18 +329,64 @@ bool Foam::coordinateSystems::found(const keyType& key) const
 }
 
 
-Foam::wordList Foam::coordinateSystems::names() const
+const Foam::coordinateSystem*
+Foam::coordinateSystems::lookupPtr(const word& name) const
 {
-    const PtrList<coordinateSystem>& systems = *this;
+    const label index = this->findIndex(name);
 
-    wordList list(systems.size());
-
-    forAll(systems, i)
+    if (coordinateSystem::debug)
     {
-        list[i] = systems[i].name();
+        InfoInFunction
+            << "Global coordinate system: "
+            << name << "=" << index << endl;
     }
 
-    return list;
+    if (index < 0)
+    {
+        return nullptr;
+    }
+
+    return this->operator()(index);
+}
+
+
+const Foam::coordinateSystem&
+Foam::coordinateSystems::lookup(const word& name) const
+{
+    const label index = this->findIndex(name);
+
+    if (index < 0)
+    {
+        FatalErrorInFunction
+            << "Could not find coordinate system: " << name << nl
+            << "available coordinate systems: "
+            << flatOutput(names()) << nl << nl
+            << exit(FatalError);
+    }
+    if (coordinateSystem::debug)
+    {
+        InfoInFunction
+            << "Global coordinate system: "
+            << name << "=" << index << endl;
+    }
+
+    return this->operator[](index);
+}
+
+
+Foam::wordList Foam::coordinateSystems::names() const
+{
+    const PtrList<coordinateSystem>& list = *this;
+
+    wordList result(list.size());
+
+    forAll(list, i)
+    {
+        result[i] = list[i].name();
+    }
+
+    return result;
+    // return ListOps::create<word>(list, nameOp<coordinateSystem>());
 }
 
 
@@ -303,12 +425,14 @@ Foam::wordList Foam::coordinateSystems::names(const wordRes& matcher) const
 
 bool Foam::coordinateSystems::writeData(Ostream& os) const
 {
+    const PtrList<coordinateSystem>& list = *this;
+
     os << nl << size() << nl << token::BEGIN_LIST;
 
-    forAll(*this, i)
+    for (const coordinateSystem& csys : list)
     {
         os << nl;
-        operator[](i).writeDict(os, true);
+        csys.writeEntry(csys.name(), os);
     }
 
     os << token::END_LIST << nl;
@@ -317,4 +441,23 @@ bool Foam::coordinateSystems::writeData(Ostream& os) const
 }
 
 
+bool Foam::coordinateSystems::writeObject
+(
+    IOstream::streamFormat,
+    IOstream::versionNumber ver,
+    IOstream::compressionType,
+    const bool valid
+) const
+{
+    // Force ASCII writing
+    return regIOobject::writeObject
+    (
+        IOstream::ASCII,
+        ver,
+        IOstream::UNCOMPRESSED,
+        valid
+    );
+}
+
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinate/systems/coordinateSystems.H b/src/meshTools/coordinate/systems/coordinateSystems.H
index a982f3c30c..643739571b 100644
--- a/src/meshTools/coordinate/systems/coordinateSystems.H
+++ b/src/meshTools/coordinate/systems/coordinateSystems.H
@@ -25,30 +25,31 @@ Class
     Foam::coordinateSystems
 
 Description
-    Provides a centralized coordinateSystem collection.
+    A centralized collection of named coordinate systems.
 
 Note
     Mixing normal constructors and the coordinateSystems::New constructor
     may yield unexpected results.
 
     \verbatim
-        1
-        (
-        cat1
+    cat1
+    {
+        coordinateSystem
         {
-            coordinateSystem  system_10;
-            porosity        0.781;
-            Darcy
-            {
-                d   d [0 -2 0 0 0]  (-1000 -1000 0.50753e+08);
-                f   f [0 -1 0 0 0]  (-1000 -1000 12.83);
-            }
+            type   indirect;
+            name   _10;
         }
-        )
+        porosity    0.781;
+        Darcy
+        {
+            d   d [0 -2 0 0 0]  (-1000 -1000 0.50753e+08);
+            f   f [0 -1 0 0 0]  (-1000 -1000 12.83);
+        }
+    }
     \endverbatim
 
     For this to work correctly, the coordinateSystem constructor must be
-    supplied with both a dictionary and an objectRegistry.
+    supplied with an objectRegistry as well as the dictionary.
 
 SourceFiles
     coordinateSystems.C
@@ -57,8 +58,9 @@ SourceFiles
 #ifndef coordinateSystems_H
 #define coordinateSystems_H
 
+#include "regIOobject.H"
+#include "PtrList.H"
 #include "coordinateSystem.H"
-#include "IOPtrList.H"
 #include "wordRes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -72,10 +74,19 @@ namespace Foam
 
 class coordinateSystems
 :
-    public IOPtrList<coordinateSystem>
+    public regIOobject,
+    public PtrList<coordinateSystem>
 {
     // Private Member Functions
 
+        //- Read "coordinateSystems" or older "IOPtrList<coordinateSystem>"
+        void readFromStream(const bool valid = true);
+
+        //- Attempt read if MUST_READ.., or READ_IF_PRESENT and has header
+        //  \return False if no read should have been attempted
+        bool readObject(const IOobject& io);
+
+
         //- No copy construct
         coordinateSystems(const coordinateSystems&) = delete;
 
@@ -86,21 +97,22 @@ class coordinateSystems
 public:
 
     //- Runtime type information
-    TypeName("coordinateSystems");
+    TypeNameNoDebug("coordinateSystems");
+
 
     // Constructors
 
         //- Read construct from IOobject
         explicit coordinateSystems(const IOobject& io);
 
-        //- Construct from IOobject and a PtrList
+        //- Construct from IOobject and PtrList content
         coordinateSystems
         (
             const IOobject& io,
             const PtrList<coordinateSystem>& content
         );
 
-        //- Construct from IOobject and transferring the PtrList content
+        //- Construct from IOobject and transferring PtrList content
         coordinateSystems
         (
             const IOobject& io,
@@ -111,7 +123,7 @@ public:
     // Selectors
 
         //- Return previously registered or read construct from "constant"
-        static const coordinateSystems& New(const objectRegistry&);
+        static const coordinateSystems& New(const objectRegistry& obr);
 
 
     // Member Functions
@@ -131,6 +143,12 @@ public:
         //- Search if given key exists
         bool found(const keyType& key) const;
 
+        //- Return reference to named coordinateSystem or FatalErrror
+        const coordinateSystem& lookup(const word& name) const;
+
+        //- Return pointer to named coordinateSystem or nullptr on error
+        const coordinateSystem* lookupPtr(const word& name) const;
+
         //- A list of the coordinate-system names
         wordList names() const;
 
@@ -149,8 +167,20 @@ public:
             return names();
         }
 
+
+    // IO
+
         //- Write data
-        bool writeData(Ostream&) const;
+        bool writeData(Ostream& os) const;
+
+        //- Write data
+        virtual bool writeObject
+        (
+            IOstream::streamFormat,
+            IOstream::versionNumber ver,
+            IOstream::compressionType,
+            const bool valid = true
+        ) const;
 
 
     // Housekeeping
diff --git a/src/meshTools/coordinate/systems/cylindricalCS.C b/src/meshTools/coordinate/systems/cylindricalCS.C
index dac22e62d3..26c049b63c 100644
--- a/src/meshTools/coordinate/systems/cylindricalCS.C
+++ b/src/meshTools/coordinate/systems/cylindricalCS.C
@@ -26,6 +26,18 @@ License
 #include "cylindricalCS.H"
 #include "addToRunTimeSelectionTable.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace coordSystem
+{
+    defineTypeName(cylindrical);
+    addToRunTimeSelectionTable(coordinateSystem, cylindrical, dictionary);
+}
+}
+
+
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -65,43 +77,52 @@ static inline vector toCartesian(const vector& v)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cylindricalCS::cylindricalCS()
+Foam::coordSystem::cylindrical::cylindrical()
 :
     coordinateSystem()
 {}
 
 
-Foam::cylindricalCS::cylindricalCS
-(
-    const coordinateSystem& cs
-)
+Foam::coordSystem::cylindrical::cylindrical(const coordinateSystem& csys)
 :
-    coordinateSystem(cs)
+    coordinateSystem(csys)
 {}
 
 
-Foam::cylindricalCS::cylindricalCS
-(
-    const word& name,
-    const coordinateSystem& cs
-)
+Foam::coordSystem::cylindrical::cylindrical(coordinateSystem&& csys)
 :
-    coordinateSystem(name, cs)
+    coordinateSystem(std::move(csys))
 {}
 
 
-Foam::cylindricalCS::cylindricalCS
+Foam::coordSystem::cylindrical::cylindrical(autoPtr<coordinateSystem>&& csys)
+:
+    coordinateSystem(std::move(csys))
+{}
+
+
+Foam::coordSystem::cylindrical::cylindrical
 (
-    const word& name,
     const point& origin,
-    const coordinateRotation& cr
+    const coordinateRotation& crot
 )
 :
-    coordinateSystem(name, origin, cr)
+    coordinateSystem(origin, crot)
 {}
 
 
-Foam::cylindricalCS::cylindricalCS
+Foam::coordSystem::cylindrical::cylindrical
+(
+    const point& origin,
+    const vector& axis,
+    const vector& dirn
+)
+:
+    coordinateSystem(origin, axis, dirn)
+{}
+
+
+Foam::coordSystem::cylindrical::cylindrical
 (
     const word& name,
     const point& origin,
@@ -113,7 +134,7 @@ Foam::cylindricalCS::cylindricalCS
 {}
 
 
-Foam::cylindricalCS::cylindricalCS
+Foam::coordSystem::cylindrical::cylindrical
 (
     const word& name,
     const dictionary& dict
@@ -128,13 +149,9 @@ Foam::cylindricalCS::cylindricalCS
 }
 
 
-Foam::cylindricalCS::cylindricalCS
-(
-    const objectRegistry& obr,
-    const dictionary& dict
-)
+Foam::coordSystem::cylindrical::cylindrical(const dictionary& dict)
 :
-    coordinateSystem(obr, dict)
+    coordinateSystem(dict)
 {
     if (dict.lookupOrDefault("degrees", false))
     {
@@ -143,9 +160,65 @@ Foam::cylindricalCS::cylindricalCS
 }
 
 
+Foam::coordSystem::cylindrical::cylindrical
+(
+    const dictionary& dict,
+    const word& dictName
+)
+:
+    coordinateSystem(dict, dictName)
+{
+    const dictionary* dictPtr =
+    (
+        dictName.size()
+      ? &(dict.subDict(dictName))
+      : &(dict)
+    );
+
+    if (dictPtr->lookupOrDefault("degrees", false))
+    {
+        warnCompatDegrees(dict);
+    }
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::vector Foam::cylindricalCS::localToGlobal
+Foam::tensor Foam::coordSystem::cylindrical::R(const point& global) const
+{
+    // Robuster version of coordinateRotations::axes::rotation()
+    // using an E3_E1 order and falling back to the top-level rotation
+    // tensor if the directional input is borderline.
+
+    tensor rotTensor(rot_);
+
+    const vector ax1 = rotTensor.col<2>(); // == e3 (already normalized)
+
+    vector ax2(global - origin_);
+
+    // Remove colinear component
+    ax2 -= ((ax1 & ax2) * ax1);
+
+    const scalar magAxis2(mag(ax2));
+
+    // Trap zero size and colinearity
+    if (magAxis2 < SMALL)
+    {
+        return rotTensor;
+    }
+
+    ax2 /= magAxis2;  // normalise
+
+    // Replace with updated local axes
+
+    rotTensor.col<0>(ax2);
+    rotTensor.col<1>(ax1^ax2);
+
+    return rotTensor;
+}
+
+
+Foam::vector Foam::coordSystem::cylindrical::localToGlobal
 (
     const vector& local,
     bool translate
@@ -159,7 +232,7 @@ Foam::vector Foam::cylindricalCS::localToGlobal
 }
 
 
-Foam::tmp<Foam::vectorField> Foam::cylindricalCS::localToGlobal
+Foam::tmp<Foam::vectorField> Foam::coordSystem::cylindrical::localToGlobal
 (
     const vectorField& local,
     bool translate
@@ -184,7 +257,7 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::localToGlobal
 }
 
 
-Foam::vector Foam::cylindricalCS::globalToLocal
+Foam::vector Foam::coordSystem::cylindrical::globalToLocal
 (
     const vector& global,
     bool translate
@@ -197,7 +270,7 @@ Foam::vector Foam::cylindricalCS::globalToLocal
 }
 
 
-Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
+Foam::tmp<Foam::vectorField> Foam::coordSystem::cylindrical::globalToLocal
 (
     const vectorField& global,
     bool translate
@@ -220,4 +293,5 @@ Foam::tmp<Foam::vectorField> Foam::cylindricalCS::globalToLocal
 }
 
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/coordinate/systems/cylindricalCS.H b/src/meshTools/coordinate/systems/cylindricalCS.H
index ef34b9e15b..8a8291251c 100644
--- a/src/meshTools/coordinate/systems/cylindricalCS.H
+++ b/src/meshTools/coordinate/systems/cylindricalCS.H
@@ -22,13 +22,21 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::cylindricalCS
+    Foam::coordSystem::cylindrical
 
 Description
-    Cylindrical coordinate system, always in radians.
+    A cylindrical coordinate system (r-theta-z).
+    The coordinate system angle theta is always in radians.
+
+    \heading Dictionary entries
+    \table
+        Property    | Description                           | Required | Default
+        type        | type name: cylindrical                | yes   |
+    \endtable
 
 SourceFiles
     cylindricalCS.C
+    cylindricalCSTransform.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -41,12 +49,14 @@ SourceFiles
 
 namespace Foam
 {
+namespace coordSystem
+{
 
 /*---------------------------------------------------------------------------*\
-                        Class cylindricalCS Declaration
+                  Class coordSystem::cylindrical Declaration
 \*---------------------------------------------------------------------------*/
 
-class cylindricalCS
+class cylindrical
 :
     public coordinateSystem
 {
@@ -54,63 +64,78 @@ protected:
 
     // Protected Member Functions
 
+        //- From local coordinate system to the global Cartesian system
+        //- with optional translation for the origin
+        virtual vector localToGlobal
+        (
+            const vector& local,
+            bool translate
+        ) const;
 
-        //- Convert from local coordinate system to the global Cartesian system
-        //  with optional translation for the origin
-        virtual vector localToGlobal(const vector&, bool translate) const;
-
-        //- Convert from local coordinate system to the global Cartesian system
-        //  with optional translation for the origin
+        //- From local coordinate system to the global Cartesian system
+        //- with optional translation for the origin
         virtual tmp<vectorField> localToGlobal
         (
-            const vectorField&,
+            const vectorField& local,
+            bool translate
+        ) const;
+
+        //- From global Cartesian system to the local coordinate system
+        //- with optional translation for the origin
+        virtual vector globalToLocal
+        (
+            const vector& global,
             bool translate
         ) const;
 
         //- Convert from global Cartesian system to the local coordinate system
-        //  with optional translation for the origin
-        virtual vector globalToLocal(const vector&, bool translate) const;
-
-        //- Convert from global Cartesian system to the local coordinate system
-        //  with optional translation for the origin
+        //- with optional translation for the origin
         virtual tmp<vectorField> globalToLocal
         (
-            const vectorField&,
+            const vectorField& global,
             bool translate
         ) const;
 
 
 public:
 
+    //- Runtime type information
+    TypeNameNoDebug("cylindrical");
+
 
     // Constructors
 
-        //- Construct null
-        cylindricalCS();
+        //- Construct null (identity coordinateSystem)
+        cylindrical();
 
-        //- Construct copy
-        cylindricalCS
-        (
-            const coordinateSystem&
-        );
+        //- Copy construct
+        cylindrical(const cylindrical& csys) = default;
 
-        //- Construct copy with a different name
-        cylindricalCS
-        (
-            const word& name,
-            const coordinateSystem&
-        );
+        //- Move construct
+        cylindrical(cylindrical&& csys) = default;
+
+        //- Copy construct from another coordinateSystem type
+        explicit cylindrical(const coordinateSystem& csys);
+
+        //- Move construct from another coordinateSystem type
+        explicit cylindrical(coordinateSystem&& csys);
+
+        //- Move construct from autoPtr of another coordinateSystem type
+        explicit cylindrical(autoPtr<coordinateSystem>&& csys);
 
         //- Construct from origin and rotation
-        cylindricalCS
+        cylindrical(const point& origin, const coordinateRotation& crot);
+
+        //- Construct from origin and 2 axes
+        cylindrical
         (
-            const word& name,
             const point& origin,
-            const coordinateRotation&
+            const vector& axis,
+            const vector& dirn
         );
 
         //- Construct from origin and 2 axes
-        cylindricalCS
+        cylindrical
         (
             const word& name,
             const point& origin,
@@ -118,18 +143,59 @@ public:
             const vector& dirn
         );
 
-        //- Construct from dictionary and name
-        cylindricalCS(const word&, const dictionary&);
+        //- Construct from dictionary with a given name
+        cylindrical(const word& name, const dictionary& dict);
 
-        //- Construct from dictionary and objectRegistry
-        cylindricalCS(const objectRegistry&, const dictionary&);
+        //- Construct from dictionary without a name
+        explicit cylindrical(const dictionary& dict);
 
+        //- Construct from dictionary with optional subDict lookup.
+        //
+        //  \param dictName If non-empty, the sub-dictionary to use.
+        cylindrical(const dictionary& dict, const word& dictName);
 
     //- Destructor
-    virtual ~cylindricalCS() = default;
+    virtual ~cylindrical() = default;
+
+
+    // Member Functions
+
+        //- Treat the rotation tensor as non-uniform
+        virtual bool uniform() const
+        {
+            return false;
+        }
+
+
+    // Rotations
+
+        //- Position-dependent rotation tensors at multiple points
+        using coordinateSystem::R;
+
+        //- Position-dependent rotation tensor at a single point
+        //- \return tensor
+        virtual tensor R(const point& global) const;
+
+
+    // Member Operators
+
+        //- Copy assignment
+        cylindrical& operator=(const cylindrical&) = default;
+
+        //- Move assignment
+        cylindrical& operator=(cylindrical&&) = default;
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace coordSystem
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Compatibility typedef 1806
+typedef coordSystem::cylindrical cylindricalCS;
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/meshTools/coordinate/systems/indirectCS.C b/src/meshTools/coordinate/systems/indirectCS.C
new file mode 100644
index 0000000000..c2ce19fb32
--- /dev/null
+++ b/src/meshTools/coordinate/systems/indirectCS.C
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "indirectCS.H"
+#include "coordinateSystems.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace coordSystem
+{
+    defineTypeNameAndDebug(indirect, 0);
+    addToRunTimeSelectionTable(coordinateSystem, indirect, registry);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::coordSystem::indirect::indirect(const indirect& csys)
+:
+    coordinateSystem(),
+    backend_(csys.backend_)
+{}
+
+
+Foam::coordSystem::indirect::indirect(indirect&& csys)
+:
+    coordinateSystem(),
+    backend_(std::move(csys.backend_))
+{}
+
+
+// Use lookup() instead of lookupPtr() to trigger FatalError on any problems
+Foam::coordSystem::indirect::indirect
+(
+    const objectRegistry& obr,
+    const word& name
+)
+:
+    coordinateSystem(),
+    backend_(&(coordinateSystems::New(obr).lookup(name)))
+{}
+
+
+Foam::coordSystem::indirect::indirect
+(
+    const objectRegistry& obr,
+    const dictionary& dict
+)
+:
+    indirect(obr, dict.get<word>("name"))
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::coordSystem::indirect::write(Ostream& os) const
+{
+    writeEntry(coordinateSystem::typeName_(), os);
+}
+
+
+void Foam::coordSystem::indirect::writeEntry
+(
+    const word& keyword,
+    Ostream& os
+) const
+{
+    if (!valid())
+    {
+        return;
+    }
+
+    const bool subDict = !keyword.empty();
+
+    if (subDict)
+    {
+        os.beginBlock(keyword);
+
+        os.writeEntry("type", type());
+        os.writeEntry("name", name());
+
+        os.endBlock();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/coordinate/systems/indirectCS.H b/src/meshTools/coordinate/systems/indirectCS.H
new file mode 100644
index 0000000000..1fd334218c
--- /dev/null
+++ b/src/meshTools/coordinate/systems/indirectCS.H
@@ -0,0 +1,298 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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::coordSystem::indirect
+
+Description
+    A coordinate system forward to a global coordinate system that is
+    normally provided by the constant/coordinateSystems file.
+
+    \heading Dictionary entries
+    \table
+        Property    | Description                           | Required | Default
+        type        | Type name: indirect                   | yes   |
+        name        | Name of the referenced system         | yes   |
+    \endtable
+
+SourceFiles
+    indirectCS.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef indirectCS_H
+#define indirectCS_H
+
+#include "coordinateSystem.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace coordSystem
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class coordSystem::indirect Declaration
+\*---------------------------------------------------------------------------*/
+
+class indirect
+:
+    public coordinateSystem
+{
+    // Private Data
+
+        //- The real coordinate system
+        const coordinateSystem* backend_;
+
+
+    // Private Member Functions
+
+        //- Construct null is disallowed
+        indirect() = delete;
+
+
+protected:
+
+        // Protected Member Functions
+
+        //- Convert from local coordinate system to the global Cartesian system
+        //- with optional translation for the origin
+        virtual vector localToGlobal
+        (
+            const vector& local,
+            bool translate
+        ) const
+        {
+            return backend_->localToGlobal(local, translate);
+        }
+
+        //- Convert from local coordinate system to the global Cartesian system
+        //- with optional translation for the origin
+        virtual tmp<vectorField> localToGlobal
+        (
+            const vectorField& local,
+            bool translate
+        ) const
+        {
+            return backend_->localToGlobal(local, translate);
+        }
+
+        //- Convert from global Cartesian system to the local coordinate system
+        //- with optional translation for the origin
+        virtual vector globalToLocal
+        (
+            const vector& global,
+            bool translate
+        ) const
+        {
+            return backend_->globalToLocal(global, translate);
+        }
+
+        //- Convert from global Cartesian system to the local coordinate system
+        //- with optional translation for the origin
+        virtual tmp<vectorField> globalToLocal
+        (
+            const vectorField& global,
+            bool translate
+        ) const
+        {
+            return backend_->globalToLocal(global, translate);
+        }
+
+
+public:
+
+    //- Runtime type information
+    TypeName("indirect");
+
+
+    // Constructors
+
+        //- Copy construct
+        indirect(const indirect& csys);
+
+        //- Move construct
+        indirect(indirect&& csys);
+
+        //- Construct from global lookup
+        indirect(const objectRegistry& obr, const word& name);
+
+        //- Construct from global lookup
+        indirect(const objectRegistry& obr, const dictionary& dict);
+
+
+    //- Destructor
+    virtual ~indirect() = default;
+
+
+    // Member Functions
+
+    // Access
+
+        //- Reference to the underlying coordinate system
+        virtual const coordinateSystem& cs() const
+        {
+            return *backend_;
+        }
+
+        //- Is the coordinate system valid?
+        virtual bool valid() const
+        {
+            return backend_ && backend_->valid();
+        }
+
+        //- True if the rotation tensor is uniform for all positions
+        virtual bool uniform() const
+        {
+            return backend_->uniform();
+        }
+
+        //- The rotation specification
+        virtual const coordinateRotation& rotation() const
+        {
+            return backend_->rotation();
+        }
+
+        //- Return the name
+        virtual const word& name() const
+        {
+            return backend_->name_;
+        }
+
+        //- Return the optional note
+        virtual const string& note() const
+        {
+            return backend_->note();
+        }
+
+        //- Return origin
+        virtual const point& origin() const
+        {
+            return backend_->origin();
+        }
+
+        //- Return const reference to the rotation tensor
+        virtual const tensor& R() const
+        {
+            return backend_->R();
+        }
+
+        //- The local Cartesian x-axis in global coordinates
+        virtual const vector e1() const
+        {
+            return backend_->e1();
+        }
+
+        //- The local Cartesian y-axis in global coordinates
+        virtual const vector e2() const
+        {
+            return backend_->e2();
+        }
+
+        //- The local Cartesian z-axis in global coordinates
+        virtual const vector e3() const
+        {
+            return backend_->e3();
+        }
+
+
+    // Edit
+
+        //- Rename (ignored)
+        void rename(const word& newName) {}
+
+        //- Provide non-constant access to the optional note
+        string& note()
+        {
+            NotImplemented;
+            return dummy_.note();
+        }
+
+        //- Edit access to origin (disallowed)
+        virtual point& origin()
+        {
+            NotImplemented;
+            return dummy_.origin();
+        }
+
+        //- Clear (ignored)
+        virtual void clear() {}
+
+        //- Change the rotation (disallowed)
+        virtual void rotation(autoPtr<coordinateRotation>&& crot)
+        {
+            NotImplemented;
+        }
+
+
+    // Write
+
+        //- Write
+        virtual void write(Ostream& os) const;
+
+        //- Write dictionary entry
+        virtual void writeEntry(const word& keyword, Ostream& os) const;
+
+
+    // Member Operators
+
+        //- No copy assignment
+        void operator=(const coordinateSystem& csys) = delete;
+
+        //- No move assignment
+        void operator=(coordinateSystem&& csys) = delete;
+
+
+    // Rotations
+
+        //- Position-dependent rotation tensor at a single point
+        virtual tensor R(const point& global) const
+        {
+            return backend_->R(global);
+        }
+
+        //- Position-dependent rotation tensors at multiple points
+        virtual tmp<tensorField> R(const UList<point>& global) const
+        {
+            return backend_->R(global);
+        }
+
+        //- Position-dependent rotation tensors at multiple points
+        virtual tmp<tensorField> R(const pointUIndList& global) const
+        {
+            return backend_->R(global);
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace coordSystem
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.C b/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.C
index 13e85223e3..bf66177ced 100644
--- a/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.C
+++ b/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.C
@@ -25,7 +25,6 @@ License
 
 #include "searchableRotatedBox.H"
 #include "addToRunTimeSelectionTable.H"
-#include "axesRotation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
index 030010882b..dce9041d3f 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
@@ -201,7 +201,8 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
                 surfI,
                 coordinateSystem::New
                 (
-                    subDict.subDict("transform")
+                    subDict,
+                    "transform"
                 )
             );
 
@@ -229,7 +230,7 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
             Info<< "    instance : " << instance_[surfI] << endl;
             Info<< "    surface  : " << s.name() << endl;
             Info<< "    scale    : " << scale_[surfI] << endl;
-            Info<< "    coordsys : " << transform_[surfI] << endl;
+            Info<< "    transform: " << transform_[surfI] << endl;
 
             surfI++;
         }
diff --git a/src/sampling/sampledSet/array/arraySet.C b/src/sampling/sampledSet/array/arraySet.C
index c4a25e3937..10ac31ac91 100644
--- a/src/sampling/sampledSet/array/arraySet.C
+++ b/src/sampling/sampledSet/array/arraySet.C
@@ -81,11 +81,17 @@ void Foam::arraySet::calcSamples
         }
     }
 
-    forAll(sampleCoords, i)
+    // Local to global (Cartesian)
     {
-        sampleCoords[i] = transform(coordSys_.R().R(), sampleCoords[i]);
+        const tensor& rotTensor = coordSys_.R();
+
+        forAll(sampleCoords, i)
+        {
+            sampleCoords[i] = Foam::transform(rotTensor, sampleCoords[i]);
+        }
     }
 
+
     forAll(sampleCoords, sampleI)
     {
         label celli = queryMesh.findCell(sampleCoords[sampleI]);
diff --git a/src/sampling/sampledSet/circle/circleSet.H b/src/sampling/sampledSet/circle/circleSet.H
index 5d4cb59734..ab122f8795 100644
--- a/src/sampling/sampledSet/circle/circleSet.H
+++ b/src/sampling/sampledSet/circle/circleSet.H
@@ -69,13 +69,13 @@ class circleSet
 
         // Circle definition
 
-            //- Origin (x, y, z) in global cartesian co-ordinates
+            //- Origin (x, y, z) in global cartesian coordinates
             point origin_;
 
             //- Axis of the circle
             vector circleAxis_;
 
-            //- Point on circle (x, y, z) in global cartesian co-ordinates
+            //- Point on circle (x, y, z) in global cartesian coordinates
             //  Defines start point
             point startPoint_;
 
diff --git a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
index 11701aa55a..3c1759e3cf 100644
--- a/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
+++ b/src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C
@@ -130,7 +130,7 @@ void Foam::ensightSurfaceReader::readGeometryHeader(ensightReadFile& is) const
     is.read(buffer);
     if (debug) Info<< "buffer: " << buffer << endl;
 
-    // Co-ordinates
+    // Coordinates
     is.read(buffer);
     if (debug) Info<< "buffer: " << buffer << endl;
 }
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.C b/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
index 954302f4a8..663d31f7cd 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
@@ -119,7 +119,8 @@ Foam::sampledPlane::sampledPlane
     // allow lookup from global coordinate systems
     if (dict.found("coordinateSystem"))
     {
-        coordinateSystem cs(mesh, dict.subDict("coordinateSystem"));
+        auto csysPtr = coordinateSystem::New(mesh, dict, "coordinateSystem");
+        const auto& cs = *csysPtr;
         plane& pln = planeDesc();
 
         const point  orig = cs.globalPosition(pln.origin());
diff --git a/src/sampling/surfMeshSample/plane/surfMeshSamplePlane.C b/src/sampling/surfMeshSample/plane/surfMeshSamplePlane.C
index 3eaaafd7df..b9e0a57040 100644
--- a/src/sampling/surfMeshSample/plane/surfMeshSamplePlane.C
+++ b/src/sampling/surfMeshSample/plane/surfMeshSamplePlane.C
@@ -119,7 +119,8 @@ Foam::surfMeshSamplePlane::surfMeshSamplePlane
     // allow lookup from global coordinate systems
     if (dict.found("coordinateSystem"))
     {
-        coordinateSystem cs(mesh, dict.subDict("coordinateSystem"));
+        auto csysPtr = coordinateSystem::New(mesh, dict, "coordinateSystem");
+        const auto& cs = *csysPtr;
         plane& pln = planeDesc();
 
         const point  orig = cs.globalPosition(pln.origin());
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index af4662addf..5a30633948 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -144,7 +144,7 @@ void Foam::solarCalculator::calculateSunDirection()
     }
 
     // Transform to actual coordinate system
-    direction_ = coord_->R().transform(direction_);
+    direction_ = coord_->transform(direction_);
 
     if (debug)
     {
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 1c8de7f563..6686df17aa 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -29,13 +29,13 @@ License
 #include "slidingInterface.H"
 #include "addToRunTimeSelectionTable.H"
 #include "mapPolyMesh.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
     defineTypeNameAndDebug(mixerFvMesh, 0);
-
     addToRunTimeSelectionTable(topoChangerFvMesh, mixerFvMesh, IOobject);
 }
 
@@ -110,7 +110,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers()
     regionSplit rs(*this);
 
     // Get the region of the cell containing the origin.
-    const label originRegion = rs[findNearestCell(cs().origin())];
+    const label originRegion = rs[findNearestCell(csys_.origin())];
 
     labelList movingCells(nCells());
     label nMovingCells = 0;
@@ -207,8 +207,7 @@ void Foam::mixerFvMesh::calcMovingMasks() const
 
     const word innerSliderZoneName
     (
-        word(motionDict_.subDict("slider").lookup("inside"))
-      + "Zone"
+        motionDict_.subDict("slider").get<word>("inside") + "Zone"
     );
 
     const labelList& innerSliderAddr = faceZones()[innerSliderZoneName];
@@ -225,8 +224,7 @@ void Foam::mixerFvMesh::calcMovingMasks() const
 
     const word outerSliderZoneName
     (
-        word(motionDict_.subDict("slider").lookup("outside"))
-      + "Zone"
+        motionDict_.subDict("slider").get<word>("outside") + "Zone"
     );
 
     const labelList& outerSliderAddr = faceZones()[outerSliderZoneName];
@@ -245,7 +243,6 @@ void Foam::mixerFvMesh::calcMovingMasks() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::mixerFvMesh::mixerFvMesh
 (
     const IOobject& io
@@ -267,19 +264,26 @@ Foam::mixerFvMesh::mixerFvMesh
             )
         ).optionalSubDict(typeName + "Coeffs")
     ),
-    csPtr_
-    (
-        // Caution: must be a cylindricalCS
-        coordinateSystem::New(*this, motionDict_, "coordinateSystem")
-    ),
+    csys_(),
     rpm_(motionDict_.get<scalar>("rpm")),
     movingPointsMaskPtr_(nullptr)
 {
+    if (motionDict_.found(coordinateSystem::typeName_()))
+    {
+        // New() for access to indirect (global) coordSystem.
+        static_cast<coordinateSystem&>(csys_) =
+            *coordinateSystem::New(*this, motionDict_);
+    }
+    else
+    {
+        csys_ = coordSystem::cylindrical(motionDict_);
+    }
+
     addZonesAndModifiers();
 
     Info<< "Mixer mesh:" << nl
-        << "    origin: " << cs().origin() << nl
-        << "    axis: " << cs().axis() << nl
+        << "    origin: " << csys_.origin() << nl
+        << "    axis: " << csys_.e3() << nl
         << "    rpm: " << rpm_ << endl;
 }
 
@@ -313,9 +317,9 @@ bool Foam::mixerFvMesh::update()
 
     movePoints
     (
-        csPtr_->globalPosition
+        csys_.globalPosition
         (
-            csPtr_->localPosition(points())
+            csys_.localPosition(points())
           + theta
             *movingPointsMask()
         )
@@ -336,9 +340,9 @@ bool Foam::mixerFvMesh::update()
 
     movePoints
     (
-        csPtr_->globalPosition
+        csys_.globalPosition
         (
-            csPtr_->localPosition(oldPoints())
+            csys_.localPosition(oldPoints())
           + theta
             *movingPointsMask()
         )
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
index 5d4eb0c270..bb2bd3dd42 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.H
@@ -43,8 +43,6 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
-
 /*---------------------------------------------------------------------------*\
                            Class mixerFvMesh Declaration
 \*---------------------------------------------------------------------------*/
@@ -58,10 +56,10 @@ class mixerFvMesh
         //- Motion dictionary
         dictionary motionDict_;
 
-        //- Coordinate system
-        autoPtr<coordinateSystem> csPtr_;
+        //- Cylindrical coordinate system
+        coordSystem::cylindrical csys_;
 
-        // - Rotational speed in rotations per minute (rpm)
+        // - Rotational speed in revolutions per minute (rpm)
         scalar rpm_;
 
         //- Markup field for points.  Moving points marked with 1
@@ -106,9 +104,9 @@ public:
     // Member Functions
 
         //- Return coordinate system
-        const coordinateSystem& cs() const
+        const coordSystem::cylindrical& cs() const
         {
-            return *csPtr_;
+            return csys_;
         }
 
         //- Update the mesh for both mesh motion and topology change
diff --git a/src/waveModels/waveModel/waveModel.C b/src/waveModels/waveModel/waveModel.C
index 829cd89d59..4a9f7d7135 100644
--- a/src/waveModels/waveModel/waveModel.C
+++ b/src/waveModels/waveModel/waveModel.C
@@ -53,7 +53,7 @@ Foam::word Foam::waveModel::modelName(const word& patchName)
 
 void Foam::waveModel::initialiseGeometry()
 {
-    // Determine local patch co-ordinate system given by:
+    // Determine local patch coordinate system given by:
     // - X: streamwise: patch normal
     // - Y: spanwise: Z^X
     // - Z: up: (negative) gravity direction
@@ -396,7 +396,7 @@ void Foam::waveModel::correct(const scalar t)
             }
         }
 
-        // Transform velocity into global co-ordinate system
+        // Transform velocity into global coordinate system
         U_ = Rlg_ & U_;
 
         currTimeIndex_ = mesh_.time().timeIndex();
diff --git a/src/waveModels/waveModel/waveModel.H b/src/waveModels/waveModel/waveModel.H
index 84b6d39163..694acd6b80 100644
--- a/src/waveModels/waveModel/waveModel.H
+++ b/src/waveModels/waveModel/waveModel.H
@@ -85,16 +85,16 @@ protected:
         //- Number of paddles
         label nPaddle_;
 
-        //- Paddle x co-ordinates / [m]
+        //- Paddle x coordinates / [m]
         scalarField xPaddle_;
 
-        //- Paddle y co-ordinates / [m]
+        //- Paddle y coordinates / [m]
         scalarField yPaddle_;
 
         //- Addressing from patch face index to paddle index
         labelList faceToPaddle_;
 
-        //- Patch face centre z co-ordinates / [m]
+        //- Patch face centre z coordinates / [m]
         scalarField z_;
 
         //- Overall (point) span in z-direction / [m]
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions
index 3d246ece8b..306f826cef 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/fvOptions
@@ -31,14 +31,9 @@ porosity1
 
         coordinateSystem
         {
-            type    cartesian;
             origin  (0 0 0);
-            coordinateRotation
-            {
-                type    axesRotation;
-                e1      (0.70710678 0.70710678 0);
-                e3      (0 0 1);
-            }
+            e1      (0.70710678 0.70710678 0);
+            e3      (0 0 1);
         }
     }
 }
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions
index 1a139a96d4..adaebd15cf 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/fvOptions
@@ -31,14 +31,9 @@ porosity1
 
         coordinateSystem
         {
-            type    cartesian;
             origin  (0 0 0);
-            coordinateRotation
-            {
-                type    axesRotation;
-                e1  (0.70710678 0.70710678 0);
-                e2  (0 0 1);
-            }
+            e1      (0.70710678 0.70710678 0);
+            e2      (0 0 1);
         }
     }
 }
diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions
index 1dca13888a..04d38c6963 100644
--- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/fvOptions
@@ -22,6 +22,7 @@ porosity1
     explicitPorositySourceCoeffs
     {
         selectionMode   cellZone;
+
         cellZone        stator;
 
         type            DarcyForchheimer;
@@ -31,13 +32,11 @@ porosity1
 
         coordinateSystem
         {
-            type    cartesian;
             origin  (0 0 0);
-            coordinateRotation
+
+            rotation
             {
-                type    axesRotation;
-                e1  (1 0 0);
-                e2  (0 1 0);
+                type    none;
             }
         }
     }
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties
index 8093402fc9..77c3649255 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties
@@ -26,14 +26,9 @@ porosity1
 
     coordinateSystem
     {
-        type    cartesian;
         origin  (0 0 0);
-        coordinateRotation
-        {
-            type    axesRotation;
-            e1  (0.70710678 0.70710678 0);
-            e2  (0 0 1);
-        }
+        e1      (0.70710678 0.70710678 0);
+        e2      (0 0 1);
     }
 }
 
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
index 1cf991953f..4fc67a5490 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/fvOptions
@@ -35,14 +35,9 @@ porosity
 
             coordinateSystem
             {
-                type    cartesian;
                 origin  (0 0 0);
-                coordinateRotation
-                {
-                    type    axesRotation;
-                    e1      (0.70710678 0.70710678 0);
-                    e2      (0 0 1);
-                }
+                e1      (0.70710678 0.70710678 0);
+                e2      (0 0 1);
             }
         }
     }
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
index c75aa58ad7..244b9b7177 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/snappyHexMeshDict
@@ -54,17 +54,9 @@ geometry
             scale   (1.0 1.0 2.1);
             transform
             {
-                coordinateSystem
-                {
-                    type    cartesian;
-                    origin  (2 2 0);
-                    coordinateRotation
-                    {
-                        type    axesRotation;
-                        e1      (1 0 0);
-                        e3      (0 0 1);
-                    }
-                }
+                origin  (2 2 0);
+                e1      (1 0 0);
+                e3      (0 0 1);
             }
         }
         herring
@@ -73,17 +65,9 @@ geometry
             scale   (1.0 1.0 2.1);
             transform
             {
-                coordinateSystem
-                {
-                    type    cartesian;
-                    origin  (3.5 3 0);
-                    coordinateRotation
-                    {
-                        type    axesRotation;
-                        e1      (1 0 0);
-                        e3      (0 0 1);
-                    }
-                }
+                origin  (3.5 3 0);
+                e1      (1 0 0);
+                e3      (0 0 1);
             }
         }
     }
@@ -121,7 +105,6 @@ castellatedMeshControls
     nCellsBetweenLevels 1;
 
 
-
     // Explicit feature edge refinement
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -136,7 +119,6 @@ castellatedMeshControls
     );
 
 
-
     // Surface based refinement
     // ~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
index 870926abb9..15fa8b1c2c 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/constant/air/fvOptions
@@ -44,14 +44,9 @@ porosityBlockage
 
         coordinateSystem
         {
-            type    cartesian;
             origin  (0 0 0);
-            coordinateRotation
-            {
-                type    axesRotation;
-                e1      (0 1 0);
-                e2      (0 0 1);
-            }
+            e1      (0 1 0);
+            e2      (0 0 1);
         }
     }
 }
diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
index 5240f45df4..7bfa2b4c72 100644
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/fvOptions
@@ -22,6 +22,7 @@ porosity1
     explicitPorositySourceCoeffs
     {
         selectionMode   cellZone;
+
         cellZone        porousBlockage;
 
         type            DarcyForchheimer;
@@ -36,13 +37,11 @@ porosity1
 
         coordinateSystem
         {
-            type    cartesian;
             origin  (0 0 0);
-            coordinateRotation
+
+            rotation
             {
-                type    axesRotation;
-                e1  (1 0 0);
-                e2  (0 1 0);
+                type    none;
             }
         }
     }
diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties
index bea521b859..77c3649255 100644
--- a/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties
+++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties
@@ -26,14 +26,9 @@ porosity1
 
     coordinateSystem
     {
-        type    cartesian;
         origin  (0 0 0);
-        coordinateRotation
-        {
-            type    axesRotation;
-            e1      (0.70710678 0.70710678 0);
-            e2      (0 0 1);
-        }
+        e1      (0.70710678 0.70710678 0);
+        e2      (0 0 1);
     }
 }
 
diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
index 9c81c5df7e..13973aa67e 100644
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/porosityProperties
@@ -26,14 +26,9 @@ porosity1
 
     coordinateSystem
     {
-        type    cartesian;
         origin  (0 0 0);
-        coordinateRotation
-        {
-            type    axesRotation;
-            e1      (1 0 0);    //(0.70710678 0.70710678 0);
-            e2      (0 0 1);
-        }
+        e1      (1 0 0);
+        e2      (0 1 0);
     }
 }
 
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions b/tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions
index 8619d8254b..36dd823836 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/fvOptions
@@ -33,14 +33,9 @@ porosity1
 
             coordinateSystem
             {
-                type            cartesian;
-                origin          (0 0 0);
-                coordinateRotation
-                {
-                    type            axesRotation;
-                    e1              (1 0 0);
-                    e2              (0 1 0);
-                }
+                origin  (0 0 0);
+                e1      (1 0 0);
+                e2      (0 1 0);
             }
         }
     }
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
index fdbdbb37db..b2fd38d6d4 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
@@ -31,14 +31,9 @@ filter1
 
         coordinateSystem
         {
-            type    cartesian;
             origin  (0 0 0);
-            coordinateRotation
-            {
-                type    axesRotation;
-                e1  (1 0 0);
-                e2  (0 1 0);
-            }
+            e1      (1 0 0);
+            e2      (0 1 0);
         }
     }
 }
diff --git a/tutorials/mesh/parallel/filter/system/fvOptions b/tutorials/mesh/parallel/filter/system/fvOptions
index be0c86520f..89094dc787 100644
--- a/tutorials/mesh/parallel/filter/system/fvOptions
+++ b/tutorials/mesh/parallel/filter/system/fvOptions
@@ -34,14 +34,9 @@ filter1
 
             coordinateSystem
             {
-                type    cartesian;
                 origin  (0 0 0);
-                coordinateRotation
-                {
-                    type    axesRotation;
-                    e1  (1 0 0);
-                    e2  (0 1 0);
-                }
+                e1      (1 0 0);
+                e2      (0 1 0);
             }
         }
     }
diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
index 84a0238556..e90a10d096 100644
--- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
+++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/fvOptions
@@ -31,14 +31,9 @@ porosity1
 
         coordinateSystem
         {
-            type    cartesian;
             origin  (0 0 0);
-            coordinateRotation
-            {
-                type    axesRotation;
-                e1  (0.70710678 0.70710678 0);
-                e2  (0 0 1);
-            }
+            e1      (0.70710678 0.70710678 0);
+            e2      (0 0 1);
         }
     }
 }
diff --git a/tutorials/verificationAndValidation/schemes/divergenceExample/README b/tutorials/verificationAndValidation/schemes/divergenceExample/README
index 6b586a8f8e..6e04d3a760 100644
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/README
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/README
@@ -2,7 +2,7 @@ Divergence scheme test
 ======================
 
 Various divergence schemes are examined on a 2-D structured mesh, where a
-passive scalar is convected at 45deg to the mesh co-ordinate system using a
+passive scalar is convected at 45deg to the mesh coordinate system using a
 uniform flow velocity.  Executing:
 
 ./Allrun
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index d6584304cd..1421bb21a0 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -1,5 +1,5 @@
 #-------------------------------*- makefile -*---------------------------------
-WM_VERSION = OPENFOAM=1807
+WM_VERSION = OPENFOAM=1810
 
 AR         = ar
 ARFLAGS    = cr

From b17bcd67b795ae66079fc20ecb1f1e76080f69d8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 1 Oct 2018 17:10:35 +0200
Subject: [PATCH 04/43] ENH: correct suspicious coordinate system conversions
 (issue #1027)

- arraySet :
     was translate + transform
     now use globalPosition (== transform + translate).

     Explicitly limit to Cartesian coordinate system for clarity.
---
 src/sampling/sampledSet/array/arraySet.C | 69 +++++++++---------------
 src/sampling/sampledSet/array/arraySet.H | 15 +++---
 2 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/src/sampling/sampledSet/array/arraySet.C b/src/sampling/sampledSet/array/arraySet.C
index 10ac31ac91..eb747ae80c 100644
--- a/src/sampling/sampledSet/array/arraySet.C
+++ b/src/sampling/sampledSet/array/arraySet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,7 +30,6 @@ License
 #include "polyMesh.H"
 #include "addToRunTimeSelectionTable.H"
 #include "word.H"
-#include "transform.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -54,57 +53,37 @@ void Foam::arraySet::calcSamples
 {
     const meshSearch& queryMesh = searchEngine();
 
-    label nTotalSamples
-    (
-        pointsDensity_.x()
-       *pointsDensity_.y()
-       *pointsDensity_.z()
-    );
+    const scalar dx = spanBox_.x()/(pointsDensity_.x() + 1);
+    const scalar dy = spanBox_.y()/(pointsDensity_.y() + 1);
+    const scalar dz = spanBox_.z()/(pointsDensity_.z() + 1);
 
-    List<point> sampleCoords(nTotalSamples);
+    label sampleI(0);
 
-    const scalar deltax = spanBox_.x()/(pointsDensity_.x() + 1);
-    const scalar deltay = spanBox_.y()/(pointsDensity_.y() + 1);
-    const scalar deltaz = spanBox_.z()/(pointsDensity_.z() + 1);
-
-    label p(0);
     for (label k=1; k<=pointsDensity_.z(); ++k)
     {
         for (label j=1; j<=pointsDensity_.y(); ++j)
         {
             for (label i=1; i<=pointsDensity_.x(); ++i)
             {
-                vector t(deltax*i , deltay*j, deltaz*k);
-                sampleCoords[p] = coordSys_.origin() + t;
-                ++p;
+                // Local Cartesian
+                point pt(i*dx*i , j*dy, k*dz);
+
+                // Global Cartesian
+                pt = csys_.globalPosition(pt);
+
+                const label celli = queryMesh.findCell(pt);
+
+                if (celli != -1)
+                {
+                    samplingPts.append(pt);
+                    samplingCells.append(celli);
+                    samplingFaces.append(-1);
+                    samplingSegments.append(0);
+                    samplingCurveDist.append(1.0 * sampleI);
+                }
             }
         }
     }
-
-    // Local to global (Cartesian)
-    {
-        const tensor& rotTensor = coordSys_.R();
-
-        forAll(sampleCoords, i)
-        {
-            sampleCoords[i] = Foam::transform(rotTensor, sampleCoords[i]);
-        }
-    }
-
-
-    forAll(sampleCoords, sampleI)
-    {
-        label celli = queryMesh.findCell(sampleCoords[sampleI]);
-
-        if (celli != -1)
-        {
-            samplingPts.append(sampleCoords[sampleI]);
-            samplingCells.append(celli);
-            samplingFaces.append(-1);
-            samplingSegments.append(0);
-            samplingCurveDist.append(1.0 * sampleI);
-        }
-    }
 }
 
 
@@ -157,13 +136,13 @@ Foam::arraySet::arraySet
     const polyMesh& mesh,
     const meshSearch& searchEngine,
     const word& axis,
-    const coordinateSystem& origin,
+    const coordSystem::cartesian& csys,
     const Vector<label>& pointsDensity,
     const Vector<scalar>& spanBox
 )
 :
     sampledSet(name, mesh, searchEngine, axis),
-    coordSys_(origin),
+    csys_(csys),
     pointsDensity_(pointsDensity),
     spanBox_(spanBox)
 {
@@ -180,7 +159,7 @@ Foam::arraySet::arraySet
 )
 :
     sampledSet(name, mesh, searchEngine, dict),
-    coordSys_(dict),
+    csys_(dict),  // Note: no indirect cs with this constructor
     pointsDensity_(dict.get<labelVector>("pointsDensity")),
     spanBox_(dict.get<vector>("spanBox"))
 {
diff --git a/src/sampling/sampledSet/array/arraySet.H b/src/sampling/sampledSet/array/arraySet.H
index c176993891..f56831de97 100644
--- a/src/sampling/sampledSet/array/arraySet.H
+++ b/src/sampling/sampledSet/array/arraySet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,17 +49,14 @@ SourceFiles
 #include "sampledSet.H"
 #include "labelVector.H"
 #include "DynamicList.H"
-#include "coordinateSystem.H"
+#include "cartesianCS.H"
+#include "cylindricalCS.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declarations
-class passiveParticle;
-template<class Type> class particle;
-
 /*---------------------------------------------------------------------------*\
                            Class arraySet Declaration
 \*---------------------------------------------------------------------------*/
@@ -70,8 +67,8 @@ class arraySet
 {
     // Private data
 
-        //- Coordinate system
-        coordinateSystem coordSys_;
+        //- Local Cartesian coordinate system
+        coordSystem::cartesian csys_;
 
         //- Point density vector
         labelVector pointsDensity_;
@@ -111,7 +108,7 @@ public:
             const polyMesh& mesh,
             const meshSearch& searchEngine,
             const word& axis,
-            const coordinateSystem& coordSys,
+            const coordSystem::cartesian& csys,
             const Vector<label>& pointsDensity,
             const Vector<scalar>& spanBox
         );

From 496e1cd0d217a468b4a67c8cfffd5d666fd3c466 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 1 Oct 2018 22:55:59 +0200
Subject: [PATCH 05/43] STYLE: enforce Cartesian transform (issue #1027)

- searchable surfaces
- pointToPointPlanarInterpolation
- sampled planes
- surfaceMeshConvert, surfaceMeshExport, surfaceMeshImport
---
 .../surfaceMeshConvert/coordinateSystems      | 46 +++++++--------
 .../surfaceMeshConvert/surfaceMeshConvert.C   | 57 ++++++++++---------
 .../surfaceMeshExport/surfaceMeshExport.C     | 51 +++++++++--------
 .../surfaceMeshImport/surfaceMeshImport.C     | 56 +++++++++---------
 .../searchableRotatedBox.C                    |  1 -
 .../searchableRotatedBox.H                    |  5 +-
 .../searchableSurfaceCollection.C             | 11 +---
 .../searchableSurfaceCollection.H             | 10 ++--
 .../pointToPointPlanarInterpolation.C         | 29 ++++------
 .../pointToPointPlanarInterpolation.H         | 12 ++--
 .../sampledPlane/sampledPlane.C               | 10 ++--
 .../plane/surfMeshSamplePlane.C               | 10 ++--
 12 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
index c527806a21..9f46501ae7 100644
--- a/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
+++ b/applications/utilities/surface/surfaceMeshConvert/coordinateSystems
@@ -9,74 +9,74 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       IOPtrList<coordinateSystem>;
+    class       coordinateSystems;
     object      coordinateSystems;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-7
+
 (
-system_9
+_9
 {
     type            cartesian;
     origin          (1.03291515 -0.114391257 -0.0826236662);
-    e3              (1 0 0);
     e1              (0 1 0);
-    // STARCDRotation  (0 90 90);
+    e3              (1 0 0);
+    // rotation { type starcd; angles (0 90 90); }
 }
 
-system_10
+_10
 {
     type            cartesian;
     origin          (0.623151719 -0.286472935 -0.113933262);
-    e3              (0.99508851 0.09829095 0.01173645);
     e1              (0.01179356 0 -0.99993045);
-    // STARCDRotation  (5.6403745 -0.0664172952 89.3275351);
+    e3              (0.99508851 0.09829095 0.01173645);
+    // rotation { type starcd; angles (5.6403745 -0.0664172952 89.3275351); }
 }
 
-system_15
+_15
 {
     type            cartesian;
     origin          (0.644772231 -0.240036493 0.155972187);
-    e3              (-0.01346388 -0.90616979 -0.42269969);
     e1              (0.00627978 0.42265304 -0.90626981);
-    // STARCDRotation  (-90.8512386 0 115.005148);
+    e3              (-0.01346388 -0.90616979 -0.42269969);
+    // rotation { type starcd; angles (-90.8512386 0 115.005148); }
 }
 
-system_16
+_16
 {
     type            cartesian;
     origin          (0.540824938 -0.240036415 0.15928296);
-    e3              (-0.01346388 -0.90616979 -0.42269969);
     e1              (0.00627978 0.42265304 -0.90626981);
-    // STARCDRotation  (-90.8512386 0 115.005148);
+    e3              (-0.01346388 -0.90616979 -0.42269969);
+    // rotation { type starcd; angles (-90.8512386 0 115.005148); }
 }
 
-system_17
+_17
 {
     type            cartesian;
     origin          (0.436877646 -0.240036339 0.162593737);
-    e3              (-0.01346388 -0.90616979 -0.42269969);
     e1              (0.00627978 0.42265304 -0.90626981);
-    // STARCDRotation  (-90.8512386 0 115.005148);
+    e3              (-0.01346388 -0.90616979 -0.42269969);
+    // rotation { type starcd; angles (-90.8512386 0 115.005148); }
 }
 
-system_18
+_18
 {
     type            cartesian;
     origin          (0.332930354 -0.240036261 0.16590451);
-    e3              (-0.01346388 -0.90616979 -0.42269969);
     e1              (0.00627978 0.42265304 -0.90626981);
-    // STARCDRotation  (-90.8512386 0 115.005148);
+    e3              (-0.01346388 -0.90616979 -0.42269969);
+    // rotation { type starcd; angles (-90.8512386 0 115.005148); }
 }
 
-system_21
+_21
 {
     type            cartesian;
     origin          (0.55863733 -0.300866705 0.00317260982);
-    e3              (0.42110287 0.02470132 -0.90667647);
     e1              (0.90646036 0.02342535 0.42164069);
-    // STARCDRotation  (-178.185897 -0.71772221 -155.059695);
+    e3              (0.42110287 0.02470132 -0.90667647);
+    // rotation { type starcd; angles (-178.185897 -0.71772221 -155.059695); }
 }
 )
 
diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
index 0ca90a5b7a..a030599286 100644
--- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
+++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
@@ -66,6 +66,7 @@ Note
 
 #include "MeshedSurfaces.H"
 #include "coordinateSystems.H"
+#include "cartesianCS.H"
 
 using namespace Foam;
 
@@ -146,9 +147,9 @@ int main(int argc, char *argv[])
     }
 
 
-    // get the coordinate transformations
-    autoPtr<coordinateSystem> fromCsys;
-    autoPtr<coordinateSystem> toCsys;
+    // The coordinate transformations (must be cartesian)
+    autoPtr<coordSystem::cartesian> fromCsys;
+    autoPtr<coordSystem::cartesian> toCsys;
 
     if (args.found("from") || args.found("to"))
     {
@@ -174,46 +175,47 @@ int main(int argc, char *argv[])
                 << exit(FatalError);
         }
 
-        coordinateSystems csLst(ioCsys);
+        coordinateSystems globalCoords(ioCsys);
 
         if (args.found("from"))
         {
-            const word csName = args["from"];
+            const word csName(args["from"]);
+            const auto* csPtr = globalCoords.lookupPtr(csName);
 
-            const label csIndex = csLst.findIndex(csName);
-            if (csIndex < 0)
+            if (!csPtr)
             {
                 FatalErrorInFunction
                     << "Cannot find -from " << csName << nl
-                    << "available coordinateSystems: " << csLst.toc() << nl
+                    << "available coordinateSystems: "
+                    << flatOutput(globalCoords.names()) << nl
                     << exit(FatalError);
             }
 
-            fromCsys.reset(new coordinateSystem(csLst[csIndex]));
+            fromCsys = autoPtr<coordSystem::cartesian>::New(*csPtr);
         }
 
         if (args.found("to"))
         {
-            const word csName = args["to"];
+            const word csName(args["to"]);
+            const auto* csPtr = globalCoords.lookupPtr(csName);
 
-            const label csIndex = csLst.findIndex(csName);
-            if (csIndex < 0)
+            if (!csPtr)
             {
                 FatalErrorInFunction
                     << "Cannot find -to " << csName << nl
-                    << "available coordinateSystems: " << csLst.toc() << nl
+                    << "available coordinateSystems: "
+                    << flatOutput(globalCoords.names()) << nl
                     << exit(FatalError);
             }
 
-            toCsys.reset(new coordinateSystem(csLst[csIndex]));
+            toCsys = autoPtr<coordSystem::cartesian>::New(*csPtr);
         }
 
-
-        // maybe fix this later
-        if (fromCsys.valid() && toCsys.valid())
+        // Maybe fix this later
+        if (fromCsys && toCsys)
         {
             FatalErrorInFunction
-                << "Only allowed  '-from' or '-to' option at the moment."
+                << "Only allowed '-from' or '-to' option at the moment."
                 << exit(FatalError);
         }
     }
@@ -230,29 +232,30 @@ int main(int argc, char *argv[])
         scalar scaleIn = 0;
         if (args.readIfPresent("scaleIn", scaleIn) && scaleIn > 0)
         {
-            Info<< " -scaleIn " << scaleIn << endl;
+            Info<< "scale input " << scaleIn << endl;
             surf.scalePoints(scaleIn);
         }
 
-
-        if (fromCsys.valid())
+        if (fromCsys)
         {
-            Info<< " -from " << fromCsys().name() << endl;
-            tmp<pointField> tpf = fromCsys().localPosition(surf.points());
+            Info<< "move points from coordinate system: "
+                << fromCsys->name() << endl;
+            tmp<pointField> tpf = fromCsys->localPosition(surf.points());
             surf.movePoints(tpf());
         }
 
-        if (toCsys.valid())
+        if (toCsys)
         {
-            Info<< " -to " << toCsys().name() << endl;
-            tmp<pointField> tpf = toCsys().globalPosition(surf.points());
+            Info<< "move points to coordinate system: "
+                << toCsys->name() << endl;
+            tmp<pointField> tpf = toCsys->globalPosition(surf.points());
             surf.movePoints(tpf());
         }
 
         scalar scaleOut = 0;
         if (args.readIfPresent("scaleOut", scaleOut) && scaleOut > 0)
         {
-            Info<< " -scaleOut " << scaleOut << endl;
+            Info<< "scale output " << scaleOut << endl;
             surf.scalePoints(scaleOut);
         }
 
diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
index 65abe34eb9..62e515e2eb 100644
--- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
+++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C
@@ -67,6 +67,7 @@ Note
 
 #include "MeshedSurfaces.H"
 #include "coordinateSystems.H"
+#include "cartesianCS.H"
 
 using namespace Foam;
 
@@ -135,9 +136,9 @@ int main(int argc, char *argv[])
     }
 
 
-    // get the coordinate transformations
-    autoPtr<coordinateSystem> fromCsys;
-    autoPtr<coordinateSystem> toCsys;
+    // The coordinate transformations (must be cartesian)
+    autoPtr<coordSystem::cartesian> fromCsys;
+    autoPtr<coordSystem::cartesian> toCsys;
 
     if (args.found("from") || args.found("to"))
     {
@@ -162,45 +163,47 @@ int main(int argc, char *argv[])
                 << exit(FatalError);
         }
 
-        coordinateSystems csLst(ioCsys);
+        coordinateSystems globalCoords(ioCsys);
 
         if (args.found("from"))
         {
-            const word csName = args["from"];
+            const word csName(args["from"]);
+            const auto* csPtr = globalCoords.lookupPtr(csName);
 
-            const label csIndex = csLst.findIndex(csName);
-            if (csIndex < 0)
+            if (!csPtr)
             {
                 FatalErrorInFunction
                     << "Cannot find -from " << csName << nl
-                    << "available coordinateSystems: " << csLst.toc() << nl
+                    << "available coordinateSystems: "
+                    << flatOutput(globalCoords.names()) << nl
                     << exit(FatalError);
             }
 
-            fromCsys.reset(new coordinateSystem(csLst[csIndex]));
+            fromCsys = autoPtr<coordSystem::cartesian>::New(*csPtr);
         }
 
         if (args.found("to"))
         {
-            const word csName = args["to"];
+            const word csName(args["to"]);
+            const auto* csPtr = globalCoords.lookupPtr(csName);
 
-            const label csIndex = csLst.findIndex(csName);
-            if (csIndex < 0)
+            if (!csPtr)
             {
                 FatalErrorInFunction
                     << "Cannot find -to " << csName << nl
-                    << "available coordinateSystems: " << csLst.toc() << nl
+                    << "available coordinateSystems: "
+                    << flatOutput(globalCoords.names()) << nl
                     << exit(FatalError);
             }
 
-            toCsys.reset(new coordinateSystem(csLst[csIndex]));
+            toCsys = autoPtr<coordSystem::cartesian>::New(*csPtr);
         }
 
-
-        // maybe fix this later
-        if (fromCsys.valid() && toCsys.valid())
+        // Maybe fix this later
+        if (fromCsys && toCsys)
         {
             FatalErrorInFunction
+                << "Only allowed '-from' or '-to' option at the moment."
                 << exit(FatalError);
         }
     }
@@ -233,28 +236,30 @@ int main(int argc, char *argv[])
     scalar scaleIn = 0;
     if (args.readIfPresent("scaleIn", scaleIn) && scaleIn > 0)
     {
-        Info<< " -scaleIn " << scaleIn << endl;
+        Info<< "scale input " << scaleIn << endl;
         surf.scalePoints(scaleIn);
     }
 
     if (fromCsys.valid())
     {
-        Info<< " -from " << fromCsys().name() << endl;
-        tmp<pointField> tpf = fromCsys().localPosition(surf.points());
+        Info<< "move points from coordinate system: "
+            << fromCsys->name() << endl;
+        tmp<pointField> tpf = fromCsys->localPosition(surf.points());
         surf.movePoints(tpf());
     }
 
     if (toCsys.valid())
     {
-        Info<< " -to " << toCsys().name() << endl;
-        tmp<pointField> tpf = toCsys().globalPosition(surf.points());
+        Info<< "move points to coordinate system: "
+            << toCsys->name() << endl;
+        tmp<pointField> tpf = toCsys->globalPosition(surf.points());
         surf.movePoints(tpf());
     }
 
     scalar scaleOut = 0;
     if (args.readIfPresent("scaleOut", scaleOut) && scaleOut > 0)
     {
-        Info<< " -scaleOut " << scaleOut << endl;
+        Info<< "scale output " << scaleOut << endl;
         surf.scalePoints(scaleOut);
     }
 
diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
index 48b29a2118..eb233b30e3 100644
--- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
+++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C
@@ -67,6 +67,7 @@ Note
 
 #include "MeshedSurfaces.H"
 #include "coordinateSystems.H"
+#include "cartesianCS.H"
 
 using namespace Foam;
 
@@ -148,9 +149,9 @@ int main(int argc, char *argv[])
     }
 
 
-    // get the coordinate transformations
-    autoPtr<coordinateSystem> fromCsys;
-    autoPtr<coordinateSystem> toCsys;
+    // The coordinate transformations (must be cartesian)
+    autoPtr<coordSystem::cartesian> fromCsys;
+    autoPtr<coordSystem::cartesian> toCsys;
 
     if (args.found("from") || args.found("to"))
     {
@@ -175,51 +176,52 @@ int main(int argc, char *argv[])
                 << exit(FatalError);
         }
 
-        coordinateSystems csLst(ioCsys);
+        coordinateSystems globalCoords(ioCsys);
 
         if (args.found("from"))
         {
-            const word csName = args["from"];
+            const word csName(args["from"]);
+            const auto* csPtr = globalCoords.lookupPtr(csName);
 
-            const label csIndex = csLst.findIndex(csName);
-            if (csIndex < 0)
+            if (!csPtr)
             {
                 FatalErrorInFunction
                     << "Cannot find -from " << csName << nl
-                    << "available coordinateSystems: " << csLst.toc() << nl
+                    << "available coordinateSystems: "
+                    << flatOutput(globalCoords.names()) << nl
                     << exit(FatalError);
             }
 
-            fromCsys.reset(new coordinateSystem(csLst[csIndex]));
+            fromCsys = autoPtr<coordSystem::cartesian>::New(*csPtr);
         }
 
         if (args.found("to"))
         {
-            const word csName = args["to"];
+            const word csName(args["to"]);
+            const auto* csPtr = globalCoords.lookupPtr(csName);
 
-            const label csIndex = csLst.findIndex(csName);
-            if (csIndex < 0)
+            if (!csPtr)
             {
                 FatalErrorInFunction
                     << "Cannot find -to " << csName << nl
-                    << "available coordinateSystems: " << csLst.toc() << nl
+                    << "available coordinateSystems: "
+                    << flatOutput(globalCoords.names()) << nl
                     << exit(FatalError);
             }
 
-            toCsys.reset(new coordinateSystem(csLst[csIndex]));
+            toCsys = autoPtr<coordSystem::cartesian>::New(*csPtr);
         }
 
-
-        // maybe fix this later
-        if (fromCsys.valid() && toCsys.valid())
+        // Maybe fix this later
+        if (fromCsys && toCsys)
         {
             FatalErrorInFunction
+                << "Only allowed '-from' or '-to' option at the moment."
                 << exit(FatalError);
         }
     }
 
 
-
     MeshedSurface<face> surf(importName);
 
     if (args.found("clean"))
@@ -231,28 +233,30 @@ int main(int argc, char *argv[])
     scalar scaleIn = 0;
     if (args.readIfPresent("scaleIn", scaleIn) && scaleIn > 0)
     {
-        Info<< " -scaleIn " << scaleIn << endl;
+        Info<< "scale input " << scaleIn << endl;
         surf.scalePoints(scaleIn);
     }
 
-    if (fromCsys.valid())
+    if (fromCsys)
     {
-        Info<< " -from " << fromCsys().name() << endl;
-        tmp<pointField> tpf = fromCsys().localPosition(surf.points());
+        Info<< "move points from coordinate system: "
+            << fromCsys->name() << endl;
+        tmp<pointField> tpf = fromCsys->localPosition(surf.points());
         surf.movePoints(tpf());
     }
 
-    if (toCsys.valid())
+    if (toCsys)
     {
-        Info<< " -to " << toCsys().name() << endl;
-        tmp<pointField> tpf = toCsys().globalPosition(surf.points());
+        Info<< "move points to coordinate system: "
+            << toCsys->name() << endl;
+        tmp<pointField> tpf = toCsys->globalPosition(surf.points());
         surf.movePoints(tpf());
     }
 
     scalar scaleOut = 0;
     if (args.readIfPresent("scaleOut", scaleOut) && scaleOut > 0)
     {
-        Info<< " -scaleOut " << scaleOut << endl;
+        Info<< "scale output " << scaleOut << endl;
         surf.scalePoints(scaleOut);
     }
 
diff --git a/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.C b/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.C
index bf66177ced..62355837e1 100644
--- a/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.C
+++ b/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.C
@@ -72,7 +72,6 @@ Foam::searchableRotatedBox::searchableRotatedBox
     ),
     transform_
     (
-        "rotation",
         dict.get<point>("origin"),
         dict.get<vector>("e3"),
         dict.get<vector>("e1")
diff --git a/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.H b/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.H
index cb28c26c29..3065fb00ec 100644
--- a/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.H
+++ b/src/meshTools/searchableSurfaces/searchableRotatedBox/searchableRotatedBox.H
@@ -32,6 +32,7 @@ Description
 
     E.g. box with sides 1 1 1 rotated 45 degrees around z-axis at
          origin (0.5 0.5 0.5)
+
     \verbatim
         span    (1 1 1);
         origin  (0.5 0.5 0.5);
@@ -58,8 +59,8 @@ SourceFiles
 #define searchableRotatedBox_H
 
 #include "searchableSurface.H"
-#include "coordinateSystem.H"
 #include "searchableBox.H"
+#include "cartesianCS.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -82,7 +83,7 @@ private:
         searchableBox box_;
 
         //- Transformation from local to global coordinates
-        coordinateSystem transform_;
+        coordSystem::cartesian transform_;
 
         //- The (global) corner points (in treeBoundBox order)
         pointField points_;
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
index dce9041d3f..a55e2c37ff 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
@@ -199,11 +199,7 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
             transform_.set
             (
                 surfI,
-                coordinateSystem::New
-                (
-                    subDict,
-                    "transform"
-                )
+                new coordSystem::cartesian(subDict, "transform")
             );
 
             const word subGeomName(subDict.get<word>("surface"));
@@ -716,10 +712,7 @@ void Foam::searchableSurfaceCollection::distribute
         // pointField bbPoints =
         // cmptDivide
         // (
-        //     transform_[surfI].localPosition
-        //     (
-        //         bbs[i].points()
-        //     ),
+        //     transform_[surfI].localPosition(bbs[i].points()),
         //     scale_[surfI]
         // );
         // treeBoundBox newBb(bbPoints);
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H
index f35b64d3f7..e178dbaa2d 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.H
@@ -45,7 +45,7 @@ SourceFiles
 
 #include "searchableSurface.H"
 #include "treeBoundBox.H"
-#include "coordinateSystem.H"
+#include "cartesianCS.H"
 #include "UPtrList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -71,8 +71,8 @@ class searchableSurfaceCollection
             //- Scaling vector
             vectorField scale_;
 
-            //- transformation
-            PtrList<coordinateSystem> transform_;
+            //- Coordinate transformation
+            PtrList<coordSystem::cartesian> transform_;
 
             UPtrList<searchableSurface> subGeom_;
 
@@ -159,13 +159,13 @@ public:
         }
 
         //- Coordinate system per subsurface
-        const PtrList<coordinateSystem>& transform() const
+        const PtrList<coordSystem::cartesian>& transform() const
         {
             return transform_;
         }
 
         //- Coordinate system per subsurface
-        PtrList<coordinateSystem>& transform()
+        PtrList<coordSystem::cartesian>& transform()
         {
             return transform_;
         }
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
index ac28865272..6c16efd3eb 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
@@ -43,7 +43,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::coordinateSystem
+Foam::coordSystem::cartesian
 Foam::pointToPointPlanarInterpolation::calcCoordinateSystem
 (
     const pointField& points
@@ -117,9 +117,8 @@ Foam::pointToPointPlanarInterpolation::calcCoordinateSystem
             << " to define coordinate system with normal " << n << endl;
     }
 
-    return coordinateSystem
+    return coordSystem::cartesian
     (
-        "reference",
         p0,  // origin
         n,   // normal
         e1   // 0-axis
@@ -192,11 +191,8 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
     }
     else
     {
-        tmp<vectorField> tlocalVertices
-        (
-            referenceCS_.localPosition(sourcePoints)
-        );
-        vectorField& localVertices = tlocalVertices.ref();
+        auto tlocalVertices = referenceCS_.localPosition(sourcePoints);
+        auto& localVertices = tlocalVertices.ref();
 
         const boundBox bb(localVertices, true);
         const point bbMid(bb.midpoint());
@@ -228,13 +224,7 @@ void Foam::pointToPointPlanarInterpolation::calcWeights
 
         triSurface s(triSurfaceTools::delaunay2D(localVertices2D));
 
-        tmp<pointField> tlocalFaceCentres
-        (
-            referenceCS_.localPosition
-            (
-                destPoints
-            )
-        );
+        auto tlocalFaceCentres = referenceCS_.localPosition(destPoints);
         const pointField& localFaceCentres = tlocalFaceCentres();
 
         if (debug)
@@ -324,12 +314,13 @@ Foam::pointToPointPlanarInterpolation::pointToPointPlanarInterpolation
 :
     perturb_(perturb),
     nearestOnly_(nearestOnly),
-    referenceCS_
-    (
-        nearestOnly ? coordinateSystem() : calcCoordinateSystem(sourcePoints)
-    ),
+    referenceCS_(),
     nPoints_(sourcePoints.size())
 {
+    if (!nearestOnly)
+    {
+        referenceCS_ = calcCoordinateSystem(sourcePoints);
+    }
     calcWeights(sourcePoints, destPoints);
 }
 
diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
index 2d0df6a8ea..36adb7e4b8 100644
--- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
+++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.H
@@ -37,8 +37,8 @@ SourceFiles
 #define pointToPointPlanarInterpolation_H
 
 #include "FixedList.H"
-#include "coordinateSystem.H"
 #include "instantList.H"
+#include "cartesianCS.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,8 +59,8 @@ class pointToPointPlanarInterpolation
         //- Whether to use nearest point only (avoids triangulation, projection)
         const bool nearestOnly_;
 
-        //- Coordinate system
-        coordinateSystem referenceCS_;
+        //- Cartesian reference coordinate system
+        coordSystem::cartesian referenceCS_;
 
         //- Number of source points (for checking)
         label nPoints_;
@@ -77,7 +77,7 @@ class pointToPointPlanarInterpolation
     // Private Member Functions
 
         //- Calculate a local coordinate system from set of points
-        coordinateSystem calcCoordinateSystem(const pointField&) const;
+        coordSystem::cartesian calcCoordinateSystem(const pointField&) const;
 
         //- Calculate addressing and weights
         void calcWeights
@@ -145,8 +145,8 @@ public:
             return nearestOnly_;
         }
 
-        //- Return the coordinateSystem
-        const coordinateSystem& referenceCS() const
+        //- Return the Cartesian reference coordinate system
+        const coordSystem::cartesian& referenceCS() const
         {
             return referenceCS_;
         }
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.C b/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
index 663d31f7cd..32720169cf 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
@@ -27,7 +27,7 @@ License
 #include "dictionary.H"
 #include "polyMesh.H"
 #include "volFields.H"
-#include "coordinateSystem.H"
+#include "cartesianCS.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -117,10 +117,12 @@ Foam::sampledPlane::sampledPlane
 
     // Make plane relative to the coordinateSystem (Cartesian)
     // allow lookup from global coordinate systems
-    if (dict.found("coordinateSystem"))
+    if (dict.found(coordinateSystem::typeName_()))
     {
-        auto csysPtr = coordinateSystem::New(mesh, dict, "coordinateSystem");
-        const auto& cs = *csysPtr;
+        coordSystem::cartesian cs
+        (
+            coordinateSystem::New(mesh, dict, coordinateSystem::typeName_())
+        );
         plane& pln = planeDesc();
 
         const point  orig = cs.globalPosition(pln.origin());
diff --git a/src/sampling/surfMeshSample/plane/surfMeshSamplePlane.C b/src/sampling/surfMeshSample/plane/surfMeshSamplePlane.C
index b9e0a57040..59eb7d33b9 100644
--- a/src/sampling/surfMeshSample/plane/surfMeshSamplePlane.C
+++ b/src/sampling/surfMeshSample/plane/surfMeshSamplePlane.C
@@ -27,7 +27,7 @@ License
 #include "dictionary.H"
 #include "polyMesh.H"
 #include "volFields.H"
-#include "coordinateSystem.H"
+#include "cartesianCS.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -117,10 +117,12 @@ Foam::surfMeshSamplePlane::surfMeshSamplePlane
 
     // Make plane relative to the coordinateSystem (Cartesian)
     // allow lookup from global coordinate systems
-    if (dict.found("coordinateSystem"))
+    if (dict.found(coordinateSystem::typeName_()))
     {
-        auto csysPtr = coordinateSystem::New(mesh, dict, "coordinateSystem");
-        const auto& cs = *csysPtr;
+        coordSystem::cartesian cs
+        (
+            coordinateSystem::New(mesh, dict, coordinateSystem::typeName_())
+        );
         plane& pln = planeDesc();
 
         const point  orig = cs.globalPosition(pln.origin());

From 6eb1f6fefc338fdc04609811fa7a14e1e4f90628 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 8 Oct 2018 17:11:37 +0100
Subject: [PATCH 06/43] ENH: searchableSurface: handle multiple surfaces. Fixes
 #1034

---
 .../searchableSurfacesQueries.C               | 61 +++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C b/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
index f5c48914a2..df5234dc1a 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfacesQueries/searchableSurfacesQueries.C
@@ -516,37 +516,48 @@ void Foam::searchableSurfacesQueries::findNearest
             //    - current surface     : info+normal1
             forAll(near, i)
             {
-                if (info[i].hit() && normal[i] != vector::zero)
+                if (info[i].hit())
                 {
-                    if (mag(normal[i]&normal1[i]) < 1.0-1e-6)
+                    if (normal[i] != vector::zero)
                     {
-                        plane pl0(near[i], normal[i], false);
-                        plane pl1(info[i].hitPoint(), normal1[i], false);
-
-                        plane::ray r(pl0.planeIntersect(pl1));
-                        vector n = r.dir() / mag(r.dir());
-
-                        // Calculate vector to move onto intersection line
-                        vector d(r.refPoint()-near[i]);
-                        d -= (d&n)*n;
-
-                        // Trim the max distance
-                        scalar magD = mag(d);
-                        if (magD > SMALL)
+                        // Have previous hit. Find intersection
+                        if (mag(normal[i]&normal1[i]) < 1.0-1e-6)
                         {
-                            scalar maxDist = Foam::sqrt(distSqr[i]);
-                            if (magD > maxDist)
-                            {
-                                // Clip
-                                d /= magD;
-                                d *= maxDist;
-                            }
+                            plane pl0(near[i], normal[i], false);
+                            plane pl1(info[i].hitPoint(), normal1[i], false);
 
-                            near[i] += d;
-                            normal[i] = normal1[i];
-                            constraint[i].applyConstraint(normal1[i]);
+                            plane::ray r(pl0.planeIntersect(pl1));
+                            vector n = r.dir() / mag(r.dir());
+
+                            // Calculate vector to move onto intersection line
+                            vector d(r.refPoint()-near[i]);
+                            d -= (d&n)*n;
+
+                            // Trim the max distance
+                            scalar magD = mag(d);
+                            if (magD > SMALL)
+                            {
+                                scalar maxDist = Foam::sqrt(distSqr[i]);
+                                if (magD > maxDist)
+                                {
+                                    // Clip
+                                    d /= magD;
+                                    d *= maxDist;
+                                }
+
+                                near[i] += d;
+                                normal[i] = normal1[i];
+                                constraint[i].applyConstraint(normal1[i]);
+                            }
                         }
                     }
+                    else
+                    {
+                        // First hit
+                        near[i] = info[i].hitPoint();
+                        normal[i] = normal1[i];
+                        constraint[i].applyConstraint(normal1[i]);
+                    }
                 }
             }
 

From 4c2af2bb1e2fecb5e2840004c7f09d29905048e4 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Mon, 8 Oct 2018 15:40:12 -0700
Subject: [PATCH 07/43] BUG: Correct initialization for psi and mu for
 solidThermo

---
 .../solidThermo/solidThermo/heSolidThermo.C                   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
index f99ac1ba9b..0cdfeec3d6 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
+++ b/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
@@ -161,6 +161,8 @@ heSolidThermo
     heThermo<BasicSolidThermo, MixtureType>(mesh, phaseName)
 {
     calculate();
+    this->mu_ == dimensionedScalar("zero", this->mu_.dimensions(), 0.0);
+    this->psi_ == dimensionedScalar("zero", this->psi_.dimensions(), 0.0);
 }
 
 
@@ -176,6 +178,8 @@ heSolidThermo
     heThermo<BasicSolidThermo, MixtureType>(mesh, dict, phaseName)
 {
     calculate();
+    this->mu_ == dimensionedScalar("zero", this->mu_.dimensions(), 0.0);
+    this->psi_ == dimensionedScalar("zero", this->psi_.dimensions(), 0.0);
 }
 
 

From 2cd2732fed2c1ba3d3d7b12eb471c12957c2ed17 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 Oct 2018 08:27:50 +0200
Subject: [PATCH 08/43] ENH: avoid change when setting UPtrList twice (issue
 #1035)

    UPtrList::set(const label i, T* ptr);

No-op if the new pointer value is identical to the current content.
This avoid memory management issues.
---
 applications/test/PtrList/Test-PtrList.C              | 11 +++++++++++
 src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H    |  1 +
 src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H  |  2 +-
 src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H |  4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/applications/test/PtrList/Test-PtrList.C b/applications/test/PtrList/Test-PtrList.C
index e76ee21e09..70e8ce184c 100644
--- a/applications/test/PtrList/Test-PtrList.C
+++ b/applications/test/PtrList/Test-PtrList.C
@@ -328,6 +328,17 @@ int main(int argc, char *argv[])
             <<"addresses:" << nl;
         printAddr(Info, list1);
         printAddr(Info, list1a);
+        Info<<"values:" << nl;
+        print(Info, list1a);
+
+        // This should not cause problems (ie, no deletion)
+        {
+            auto* ptr = &(list1a.first());
+            list1a.set(0, ptr);
+            Info<<"values:" << nl;
+            print(Info, list1a);
+        }
+
 
         PtrList<Scalar> list1b(list1a, true);
 
diff --git a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
index 291fc65ff3..d1296de3f2 100644
--- a/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/PtrList/PtrList.H
@@ -154,6 +154,7 @@ public:
         inline bool set(const label i) const;
 
         //- Set element to given pointer and return old element (can be null)
+        //  No-op if the new pointer value is identical to the current content.
         inline autoPtr<T> set(label i, T* ptr);
 
         //- Set element to given autoPtr and return old element
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
index f778c850f9..99664df337 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrList.H
@@ -182,7 +182,7 @@ public:
 
         //- Set element to specified pointer and return the old list element,
         //- which can be a nullptr.
-        //  No checks on new element
+        //  No-op if the new pointer value is identical to the current content.
         inline T* set(const label i, T* ptr);
 
         //- Reorder elements. Reordering must be unique (ie, shuffle).
diff --git a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
index d416564a3b..6045c8ab3b 100644
--- a/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
+++ b/src/OpenFOAM/containers/PtrLists/UPtrList/UPtrListI.H
@@ -180,6 +180,10 @@ template<class T>
 inline T* Foam::UPtrList<T>::set(const label i, T* ptr)
 {
     T* old = ptrs_[i];
+    if (old == ptr)
+    {
+        return nullptr;  // Content did not change
+    }
     ptrs_[i] = ptr;
     return old;
 }

From edd93728e242d91ac973699665cc3f8e22303b7a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 Oct 2018 08:36:28 +0200
Subject: [PATCH 09/43] Partial revert "ENH: add GeometricField constructor for
 movable internal field"

Compilation problems on older compilers

This reverts commit baf3e931de2ab59efbf3d005146689359b022e1f.
---
 .../GeometricField/GeometricField.C           | 46 -------------------
 .../GeometricField/GeometricField.H           | 20 --------
 .../fvMeshSubset/fvMeshSubsetInterpolate.C    |  3 --
 3 files changed, 69 deletions(-)

diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index d6fbc678db..e7a088c522 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -327,52 +327,6 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 }
 
 
-template<class Type, template<class> class PatchField, class GeoMesh>
-Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
-(
-    const IOobject& io,
-    const Mesh& mesh,
-    const dimensionSet& ds,
-    Field<Type>&& iField,
-    const PtrList<PatchField<Type>>& ptfl
-)
-:
-    Internal(io, mesh, ds, std::move(iField)),
-    timeIndex_(this->time().timeIndex()),
-    field0Ptr_(nullptr),
-    fieldPrevIterPtr_(nullptr),
-    boundaryField_(mesh.boundary(), *this, ptfl)
-{
-    DebugInFunction
-        << "Move construct from components" << nl << this->info() << endl;
-
-    readIfPresent();
-}
-
-
-template<class Type, template<class> class PatchField, class GeoMesh>
-Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
-(
-    const IOobject& io,
-    const Mesh& mesh,
-    const dimensionSet& ds,
-    List<Type>&& iField,
-    const PtrList<PatchField<Type>>& ptfl
-)
-:
-    Internal(io, mesh, ds, std::move(iField)),
-    timeIndex_(this->time().timeIndex()),
-    field0Ptr_(nullptr),
-    fieldPrevIterPtr_(nullptr),
-    boundaryField_(mesh.boundary(), *this, ptfl)
-{
-    DebugInFunction
-        << "Move construct from components" << nl << this->info() << endl;
-
-    readIfPresent();
-}
-
-
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index b847f01c8b..a7941db125 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -354,26 +354,6 @@ public:
             const PtrList<PatchField<Type>>& ptfl
         );
 
-        //- Construct from components, moving initial internal field
-        GeometricField
-        (
-            const IOobject& io,
-            const Mesh& mesh,
-            const dimensionSet& ds,
-            Field<Type>&& iField,
-            const PtrList<PatchField<Type>>& ptfl
-        );
-
-        //- Construct from components, moving initial internal field
-        GeometricField
-        (
-            const IOobject& io,
-            const Mesh& mesh,
-            const dimensionSet& ds,
-            List<Type>&& iField,
-            const PtrList<PatchField<Type>>& ptfl
-        );
-
         //- Construct and read given IOobject
         GeometricField
         (
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
index b65dbea1dc..0bb4b87cc2 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C
@@ -96,7 +96,6 @@ fvMeshSubset::interpolate
         ),
         sMesh,
         vf.dimensions(),
-        // Move construct for internal field
         Field<Type>(vf.primitiveField(), cellMap),
         patchFields
     );
@@ -232,7 +231,6 @@ fvMeshSubset::interpolate
         ),
         sMesh,
         vf.dimensions(),
-        // Move construct for internal field
         Field<Type>
         (
             vf.primitiveField(),
@@ -409,7 +407,6 @@ fvMeshSubset::interpolate
         ),
         sMesh,
         vf.dimensions(),
-        // Move construct for internal field
         Field<Type>(vf.primitiveField(), pointMap),
         patchFields
     );

From 4b7c21bc3cdc76ac7c13eca2d27d4dd744ba01f7 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 9 Oct 2018 09:47:54 +0100
Subject: [PATCH 10/43] BUG: foamNewSource - corrected Make/options for app
 mode.  Closes #1006

---
 etc/codeTemplates/source/foamNewSource | 2 +-
 wmake/scripts/makeOptions              | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/codeTemplates/source/foamNewSource b/etc/codeTemplates/source/foamNewSource
index 1ece48d5ad..6469aa3b32 100755
--- a/etc/codeTemplates/source/foamNewSource
+++ b/etc/codeTemplates/source/foamNewSource
@@ -96,7 +96,7 @@ else
 
     fileName="$className$Type"
 
-    echo "$Script: Creating new interface file $fileName"
+    echo "$Script: Creating new code file $fileName"
     if [ -e "$fileName" ]
     then
         echo "   Error: file exists"
diff --git a/wmake/scripts/makeOptions b/wmake/scripts/makeOptions
index 864f08f84e..6101889ec5 100755
--- a/wmake/scripts/makeOptions
+++ b/wmake/scripts/makeOptions
@@ -32,9 +32,11 @@ rm -f Make/options
 echo "Creating Make/options"
 
 echo 'EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude' > Make/options
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude' > Make/options
 echo >> Make/options
 echo 'EXE_LIBS = \
-    -lfiniteVolume' >> Make/options
+    -lfiniteVolume \
+    -lmeshTools' >> Make/options
 
 #------------------------------------------------------------------------------

From c006a10bd842f95c18d35fe2667d528322ac502c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 Oct 2018 19:39:02 +0200
Subject: [PATCH 11/43] STYLE: remove unused timeSelector::select static method

- this also removes the '-newTimes' option cruft from appearing
  everywhere. reconstructPar and redistributePar are unaffected by this
  since they define their own -newTimes option independently.
---
 etc/config.sh/completion_cache      | 65 +++++++++++++++--------------
 src/OpenFOAM/db/Time/timeSelector.C | 46 +-------------------
 src/OpenFOAM/db/Time/timeSelector.H | 11 -----
 3 files changed, 35 insertions(+), 87 deletions(-)

diff --git a/etc/config.sh/completion_cache b/etc/config.sh/completion_cache
index 54597aa34f..ea650fb21e 100644
--- a/etc/config.sh/completion_cache
+++ b/etc/config.sh/completion_cache
@@ -30,9 +30,9 @@ _of_complete_cache_[cartesianMesh]="-case -decomposeParDict -fileHandler -hostRo
 _of_complete_cache_[cavitatingDyMFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[cavitatingFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[cfx4ToFoam]="-case -fileHandler -scale | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[changeDictionary]="-case -decomposeParDict -dict -fileHandler -hostRoots -instance -listScalarBCs -listVectorBCs -region -roots -subDict -time | -constant -disablePatchGroups -enableFunctionEntries -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -literalRE -newTimes -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[changeDictionary]="-case -decomposeParDict -dict -fileHandler -hostRoots -instance -listScalarBCs -listVectorBCs -region -roots -subDict -time | -constant -disablePatchGroups -enableFunctionEntries -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -literalRE -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[checkFaMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[checkMesh]="-case -decomposeParDict -fileHandler -hostRoots -region -roots -time -writeFields -writeSets | -allGeometry -allTopology -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -meshQuality -newTimes -noFunctionObjects -noTopology -noZero -parallel -writeAllFields -doc -doc-source -help"
+_of_complete_cache_[checkMesh]="-case -decomposeParDict -fileHandler -hostRoots -region -roots -time -writeFields -writeSets | -allGeometry -allTopology -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -meshQuality -noFunctionObjects -noTopology -noZero -parallel -writeAllFields -doc -doc-source -help"
 _of_complete_cache_[checkSurfaceMesh]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[chemFoam]="-case -fileHandler -listScalarBCs -listVectorBCs | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -postProcess -doc -doc-source -help"
 _of_complete_cache_[chemkinToFoam]="-case -fileHandler | -newFormat -doc -doc-source -help"
@@ -40,7 +40,7 @@ _of_complete_cache_[chtMultiRegionFoam]="-case -decomposeParDict -fileHandler -h
 _of_complete_cache_[chtMultiRegionSimpleFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[coalChemistryFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[coldEngineFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[collapseEdges]="-case -collapseFaceSet -decomposeParDict -dict -fileHandler -hostRoots -roots -time | -collapseFaces -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noZero -overwrite -parallel -doc -doc-source -help"
+_of_complete_cache_[collapseEdges]="-case -collapseFaceSet -decomposeParDict -dict -fileHandler -hostRoots -roots -time | -collapseFaces -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noZero -overwrite -parallel -doc -doc-source -help"
 _of_complete_cache_[combinePatchFaces]="-case -concaveAngle -decomposeParDict -fileHandler -hostRoots -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -meshQuality -overwrite -parallel -doc -doc-source -help"
 _of_complete_cache_[compressibleInterDyMFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[compressibleInterFilmFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
@@ -52,7 +52,7 @@ _of_complete_cache_[createExternalCoupledPatchGeometry]="-case -commsDir -decomp
 _of_complete_cache_[createPatch]="-case -decomposeParDict -dict -fileHandler -hostRoots -region -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -overwrite -parallel -writeObj -doc -doc-source -help"
 _of_complete_cache_[createZeroDirectory]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots -templateDir | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[datToFoam]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[decomposePar]="-case -decomposeParDict -fileHandler -listScalarBCs -listVectorBCs -region -time | -allRegions -cellDist -constant -copyUniform -copyZero -dry-run -fields -force -ifRequired -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noSets -noZero -verbose -doc -doc-source -help"
+_of_complete_cache_[decomposePar]="-case -decomposeParDict -fileHandler -listScalarBCs -listVectorBCs -region -time | -allRegions -cellDist -constant -copyUniform -copyZero -dry-run -fields -force -ifRequired -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noSets -noZero -verbose -doc -doc-source -help"
 _of_complete_cache_[deformedGeom]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[dnsFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[DPMDyMFoam]="-case -cloudName -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
@@ -81,22 +81,22 @@ _of_complete_cache_[fluent3DMeshToFoam]="-case -fileHandler -ignoreCellGroups -i
 _of_complete_cache_[fluentMeshToFoam]="-case -fileHandler -scale | -noFunctionObjects -writeSets -writeZones -doc -doc-source -help"
 _of_complete_cache_[FMSToSurface]="-case -fileHandler | -exportFeatureEdges -exportSubsets -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[FMSToVTK]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[foamDataToFluent]="-case -fileHandler -listScalarBCs -listVectorBCs -time | -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -doc -doc-source -help"
+_of_complete_cache_[foamDataToFluent]="-case -fileHandler -listScalarBCs -listVectorBCs -time | -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -doc -doc-source -help"
 _of_complete_cache_[foamDictionary]="-add -case -decomposeParDict -diff -diff-etc -entry -fileHandler -hostRoots -roots -set | -disableFunctionEntries -expand -includes -keywords -noFunctionObjects -parallel -remove -value -doc -doc-source -help"
-_of_complete_cache_[foamFormatConvert]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -enableFunctionEntries -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noConstant -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[foamFormatConvert]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -enableFunctionEntries -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noConstant -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[foamListRegions]="-case -fileHandler | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -doc -doc-source -help"
-_of_complete_cache_[foamListTimes]="-case -fileHandler -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noZero -processor -rm -verbose -withZero -doc -doc-source -help"
+_of_complete_cache_[foamListTimes]="-case -fileHandler -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noZero -processor -rm -verbose -withZero -doc -doc-source -help"
 _of_complete_cache_[foamMeshToFluent]="-case -fileHandler | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[foamRestoreFields]="-case -decomposeParDict -fileHandler -hostRoots -method -roots -time | -constant -dry-run -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noZero -parallel -processor -verbose -withZero -doc -doc-source -help"
-_of_complete_cache_[foamToEnsight]="-case -cellZone -decomposeParDict -faceZones -fields -fileHandler -hostRoots -listScalarBCs -listVectorBCs -name -patches -region -roots -time -width | -ascii -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noLagrangian -noPatches -noZero -nodeValues -parallel -doc -doc-source -help"
-_of_complete_cache_[foamToEnsightParts]="-case -fileHandler -index -listScalarBCs -listVectorBCs -name -time -width | -ascii -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noLagrangian -noMesh -noZero -doc -doc-source -help"
-_of_complete_cache_[foamToFireMesh]="-case -fileHandler -scale -time | -ascii -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -doc -doc-source -help"
+_of_complete_cache_[foamRestoreFields]="-case -decomposeParDict -fileHandler -hostRoots -method -roots -time | -constant -dry-run -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noZero -parallel -processor -verbose -withZero -doc -doc-source -help"
+_of_complete_cache_[foamToEnsight]="-case -cellZone -decomposeParDict -faceZones -fields -fileHandler -hostRoots -listScalarBCs -listVectorBCs -name -patches -region -roots -time -width | -ascii -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noLagrangian -noPatches -noZero -nodeValues -parallel -doc -doc-source -help"
+_of_complete_cache_[foamToEnsightParts]="-case -fileHandler -index -listScalarBCs -listVectorBCs -name -time -width | -ascii -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noLagrangian -noMesh -noZero -doc -doc-source -help"
+_of_complete_cache_[foamToFireMesh]="-case -fileHandler -scale -time | -ascii -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -doc -doc-source -help"
 _of_complete_cache_[foamToGMV]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[foamToStarMesh]="-case -fileHandler -scale -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noBnd -noFunctionObjects -noZero -doc -doc-source -help"
-_of_complete_cache_[foamToSurface]="-case -fileHandler -scale -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -tri -doc -doc-source -help"
+_of_complete_cache_[foamToStarMesh]="-case -fileHandler -scale -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noBnd -noFunctionObjects -noZero -doc -doc-source -help"
+_of_complete_cache_[foamToSurface]="-case -fileHandler -scale -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -tri -doc -doc-source -help"
 _of_complete_cache_[foamToTetDualMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -overwrite -parallel -doc -doc-source -help"
-_of_complete_cache_[foamToVTK]="-case -cellSet -cellZone -decomposeParDict -excludePatches -faceSet -fields -fileHandler -hostRoots -listScalarBCs -listVectorBCs -name -pointSet -region -roots -time | -allPatches -ascii -constant -finiteAreaFields -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -nearCellValue -newTimes -noFaceZones -noFunctionObjects -noInternal -noLagrangian -noLinks -noPointValues -noZero -parallel -poly -surfaceFields -useTimeName -xml -doc -doc-source -help"
-_of_complete_cache_[foamUpgradeCyclics]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -dry-run -enableFunctionEntries -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[foamToVTK]="-case -cellSet -cellZone -decomposeParDict -excludePatches -faceSet -fields -fileHandler -hostRoots -listScalarBCs -listVectorBCs -name -pointSet -region -roots -time | -allPatches -ascii -constant -finiteAreaFields -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -nearCellValue -noFaceZones -noFunctionObjects -noInternal -noLagrangian -noLinks -noPointValues -noZero -parallel -poly -surfaceFields -useTimeName -xml -doc -doc-source -help"
+_of_complete_cache_[foamUpgradeCyclics]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -dry-run -enableFunctionEntries -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[foamyHexMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -checkGeometry -conformationOnly -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -parallel -doc -doc-source -help"
 _of_complete_cache_[foamyQuadMesh]="-case -fileHandler -pointsFile | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -overwrite -doc -doc-source -help"
 _of_complete_cache_[gambitToFoam]="-case -fileHandler -scale | -noFunctionObjects -doc -doc-source -help"
@@ -120,7 +120,7 @@ _of_complete_cache_[interPhaseChangeFoam]="-case -decomposeParDict -fileHandler
 _of_complete_cache_[kivaToFoam]="-case -file -fileHandler -version -zHeadMin | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[laplacianFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[liquidFilmFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[lumpedPointForces]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noZero -parallel -vtk -doc -doc-source -help"
+_of_complete_cache_[lumpedPointForces]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noZero -parallel -vtk -doc -doc-source -help"
 _of_complete_cache_[lumpedPointMovement]="-case -fileHandler -max -scale -span | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -removeLock -slave -doc -doc-source -help"
 _of_complete_cache_[lumpedPointZones]="-case -fileHandler -region | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -verbose -doc -doc-source -help"
 _of_complete_cache_[magneticFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noB -noFunctionObjects -noH -parallel -doc -doc-source -help"
@@ -159,9 +159,9 @@ _of_complete_cache_[overPotentialFoam]="-case -decomposeParDict -fileHandler -ho
 _of_complete_cache_[overRhoPimpleDyMFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[overRhoSimpleFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[overSimpleFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[particleTracks]="-case -decomposeParDict -fileHandler -hostRoots -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[particleTracks]="-case -decomposeParDict -fileHandler -hostRoots -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[patchesToSubsets]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[patchSummary]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -expand -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[patchSummary]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -expand -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[pdfPlot]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[PDRFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[PDRMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -overwrite -parallel -doc -doc-source -help"
@@ -171,20 +171,20 @@ _of_complete_cache_[plot3dToFoam]="-case -fileHandler -scale | -noBlank -noFunct
 _of_complete_cache_[pMesh]="-case -decomposeParDict -fileHandler -hostRoots -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[polyDualMesh]="-case -fileHandler -listScalarBCs -listVectorBCs | -concaveMultiCells -doNotPreserveFaceZones -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -overwrite -splitAllFaces -doc -doc-source -help"
 _of_complete_cache_[porousSimpleFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[postChannel]="-case -fileHandler -listScalarBCs -listVectorBCs -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -doc -doc-source -help"
-_of_complete_cache_[postProcess]="-case -decomposeParDict -dict -field -fields -fileHandler -func -funcs -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -latestTime -list -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -parallel -profiling -doc -doc-source -help"
+_of_complete_cache_[postChannel]="-case -fileHandler -listScalarBCs -listVectorBCs -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -doc -doc-source -help"
+_of_complete_cache_[postProcess]="-case -decomposeParDict -dict -field -fields -fileHandler -func -funcs -hostRoots -listScalarBCs -listVectorBCs -region -roots -time | -constant -latestTime -list -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -parallel -profiling -doc -doc-source -help"
 _of_complete_cache_[potentialFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -pName -roots | -dry-run -dry-run-write -initialiseUBCs -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -withFunctionObjects -writePhi -writep -doc -doc-source -help"
 _of_complete_cache_[potentialFreeSurfaceDyMFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[potentialFreeSurfaceFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[preparePar]="-case -decomposeParDict -fileHandler | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -doc -doc-source -help"
-_of_complete_cache_[profilingSummary]="-case -fileHandler -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noZero -withZero -doc -doc-source -help"
+_of_complete_cache_[profilingSummary]="-case -fileHandler -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noZero -withZero -doc -doc-source -help"
 _of_complete_cache_[reactingFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[reactingMultiphaseEulerFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[reactingParcelFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[reactingTwoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[reconstructPar]="-case -fields -fileHandler -lagrangianFields -listScalarBCs -listVectorBCs -region -time | -allRegions -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFields -noFunctionObjects -noLagrangian -noSets -noZero -withZero -doc -doc-source -help"
-_of_complete_cache_[reconstructParMesh]="-case -fileHandler -listScalarBCs -listVectorBCs -mergeTol -region -time | -cellDist -constant -fullMatch -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -withZero -doc -doc-source -help"
-_of_complete_cache_[redistributePar]="-case -decomposeParDict -fileHandler -hostRoots -mergeTol -region -roots -time | -cellDist -constant -decompose -latestTime -newTimes -noZero -overwrite -parallel -reconstruct -withZero -doc -doc-source -help"
+_of_complete_cache_[reconstructParMesh]="-case -fileHandler -listScalarBCs -listVectorBCs -mergeTol -region -time | -cellDist -constant -fullMatch -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -withZero -doc -doc-source -help"
+_of_complete_cache_[redistributePar]="-case -decomposeParDict -fileHandler -hostRoots -mergeTol -region -roots -time | -allRegions -cellDist -constant -decompose -dry-run -latestTime -newTimes -noZero -overwrite -parallel -reconstruct -withZero -doc -doc-source -help"
 _of_complete_cache_[refineHexMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -minSet -overwrite -parallel -doc -doc-source -help"
 _of_complete_cache_[refinementLevel]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -readLevel -doc -doc-source -help"
 _of_complete_cache_[refineMesh]="-case -decomposeParDict -dict -fileHandler -hostRoots -region -roots | -all -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -overwrite -parallel -doc -doc-source -help"
@@ -201,20 +201,21 @@ _of_complete_cache_[rhoPorousSimpleFoam]="-case -decomposeParDict -fileHandler -
 _of_complete_cache_[rhoReactingBuoyantFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[rhoReactingFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[rhoSimpleFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[rotateMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[rotateMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[scalarTransportFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[scaleMesh]="-case -decomposeParDict -fileHandler -hostRoots -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[scaleSurfaceMesh]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[selectCells]="-case -fileHandler | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[setAlphaField]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[setFields]="-case -decomposeParDict -dict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[setSet]="-batch -case -decomposeParDict -fileHandler -hostRoots -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -loop -newTimes -noFunctionObjects -noSync -noVTK -noZero -parallel -doc -doc-source -help"
-_of_complete_cache_[setsToZones]="-case -decomposeParDict -fileHandler -hostRoots -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFlipMap -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[setSet]="-batch -case -decomposeParDict -fileHandler -hostRoots -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -loop -noFunctionObjects -noSync -noVTK -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[setsToZones]="-case -decomposeParDict -fileHandler -hostRoots -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFlipMap -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[shallowWaterFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[simpleCoalParcelFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[simpleFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[simpleReactingParcelFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[singleCellMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[simpleSprayFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
+_of_complete_cache_[singleCellMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[slopeMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[smapToFoam]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[snappyHexMesh]="-case -decomposeParDict -dict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -outFile -patches -region -roots -surfaceSimplify | -checkGeometry -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -overwrite -parallel -profiling -doc -doc-source -help"
@@ -233,7 +234,7 @@ _of_complete_cache_[sprayFoam]="-case -decomposeParDict -fileHandler -hostRoots
 _of_complete_cache_[SRFPimpleFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[SRFSimpleFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[star4ToFoam]="-case -fileHandler -scale | -ascii -noFunctionObjects -solids -doc -doc-source -help"
-_of_complete_cache_[steadyParticleTracks]="-case -dict -fileHandler -region -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -doc -doc-source -help"
+_of_complete_cache_[steadyParticleTracks]="-case -dict -fileHandler -region -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -doc -doc-source -help"
 _of_complete_cache_[stitchMesh]="-case -dict -fileHandler -listScalarBCs -listVectorBCs -region -toleranceDict | -integral -intermediate -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -overwrite -partial -perfect -doc -doc-source -help"
 _of_complete_cache_[subsetMesh]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -patch -patches -region -resultTime -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -overwrite -parallel -zone -doc -doc-source -help"
 _of_complete_cache_[subsetToPatch]="-case -fileHandler | -noFunctionObjects -doc -doc-source -help"
@@ -256,7 +257,7 @@ _of_complete_cache_[surfaceMeshConvert]="-case -dict -fileHandler -from -scaleIn
 _of_complete_cache_[surfaceMeshExport]="-case -dict -fileHandler -from -name -scaleIn -scaleOut -to | -clean -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[surfaceMeshImport]="-case -dict -fileHandler -from -name -scaleIn -scaleOut -to | -clean -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[surfaceMeshInfo]="-case -fileHandler -scale | -areas -noFunctionObjects -xml -doc -doc-source -help"
-_of_complete_cache_[surfaceMeshTriangulate]="-case -decomposeParDict -faceZones -fileHandler -hostRoots -patches -region -roots -time | -constant -excludeProcPatches -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[surfaceMeshTriangulate]="-case -decomposeParDict -faceZones -fileHandler -hostRoots -patches -region -roots -time | -constant -excludeProcPatches -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[surfaceOrient]="-case -fileHandler -scale | -inside -noFunctionObjects -usePierceTest -doc -doc-source -help"
 _of_complete_cache_[surfacePatch]="-case -dict -fileHandler | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[surfacePointMerge]="-case -fileHandler -scale | -noFunctionObjects -doc -doc-source -help"
@@ -270,11 +271,11 @@ _of_complete_cache_[surfaceToFMS]="-case -fileHandler | -noFunctionObjects -doc
 _of_complete_cache_[surfaceToPatch]="-case -faceSet -fileHandler -tol | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[surfaceTransformPoints]="-case -fileHandler -origin -rollPitchYaw -rotate -rotate-angle -scale -translate -yawPitchRoll | -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[surfactantFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[temporalInterpolate]="-case -decomposeParDict -divisions -fields -fileHandler -hostRoots -interpolationType -listScalarBCs -listVectorBCs -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[temporalInterpolate]="-case -decomposeParDict -divisions -fields -fileHandler -hostRoots -interpolationType -listScalarBCs -listVectorBCs -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[tetgenToFoam]="-case -decomposeParDict -fileHandler -hostRoots -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFaceFile -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[tetMesh]="-case -decomposeParDict -fileHandler -hostRoots -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[thermoFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
-_of_complete_cache_[topoSet]="-case -decomposeParDict -dict -fileHandler -hostRoots -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noFunctionObjects -noSync -noZero -parallel -doc -doc-source -help"
+_of_complete_cache_[topoSet]="-case -decomposeParDict -dict -fileHandler -hostRoots -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -noSync -noZero -parallel -doc -doc-source -help"
 _of_complete_cache_[transformPoints]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -origin -region -rollPitchYaw -roots -rotate -rotate-angle -scale -translate -yawPitchRoll | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -rotateFields -doc -doc-source -help"
 _of_complete_cache_[twoLiquidMixingFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[twoPhaseEulerFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
@@ -283,7 +284,7 @@ _of_complete_cache_[uncoupledKinematicParcelFoam]="-case -cloud -decomposeParDic
 _of_complete_cache_[viewFactorsGen]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -region -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
 _of_complete_cache_[vtkUnstructuredToFoam]="-case -fileHandler | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -doc -doc-source -help"
 _of_complete_cache_[wallFunctionTable]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noFunctionObjects -parallel -doc -doc-source -help"
-_of_complete_cache_[writeMeshObj]="-case -cell -cellSet -decomposeParDict -face -faceSet -fileHandler -hostRoots -point -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -newTimes -noZero -parallel -patchEdges -patchFaces -doc -doc-source -help"
+_of_complete_cache_[writeMeshObj]="-case -cell -cellSet -decomposeParDict -face -faceSet -fileHandler -hostRoots -point -region -roots -time | -constant -latestTime -listFunctionObjects -listRegisteredSwitches -listSwitches -listUnsetSwitches -noZero -parallel -patchEdges -patchFaces -doc -doc-source -help"
 _of_complete_cache_[XiDyMFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[XiEngineFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
 _of_complete_cache_[XiFoam]="-case -decomposeParDict -fileHandler -hostRoots -listScalarBCs -listVectorBCs -roots | -dry-run -dry-run-write -listFunctionObjects -listFvOptions -listRegisteredSwitches -listSwitches -listTurbulenceModels -listUnsetSwitches -noFunctionObjects -parallel -postProcess -doc -doc-source -help"
diff --git a/src/OpenFOAM/db/Time/timeSelector.C b/src/OpenFOAM/db/Time/timeSelector.C
index 7400619b99..1930759edf 100644
--- a/src/OpenFOAM/db/Time/timeSelector.C
+++ b/src/OpenFOAM/db/Time/timeSelector.C
@@ -70,12 +70,8 @@ Foam::List<bool> Foam::timeSelector::selected(const instantList& times) const
         {
             const scalar target = range.value();
 
-            int nearestIndex =
-                TimePaths::findClosestTimeIndex
-                (
-                    times,
-                    target
-                );
+            const label nearestIndex =
+                TimePaths::findClosestTimeIndex(times, target);
 
             // Note could also test if the index is too far away.
             // Eg, for times (0 10 20 30 40) selecting 100 will currently
@@ -142,11 +138,6 @@ void Foam::timeSelector::addOptions
         "latestTime",
         "Select the latest time"
     );
-    argList::addBoolOption
-    (
-        "newTimes",
-        "Select the new times"
-    );
     argList::addOption
     (
         "time",
@@ -297,37 +288,4 @@ Foam::instantList Foam::timeSelector::selectIfPresent
 }
 
 
-Foam::instantList Foam::timeSelector::select
-(
-    Time& runTime,
-    const argList& args,
-    const word& fName
-)
-{
-    instantList times(timeSelector::select0(runTime, args));
-
-    const label nTimes = times.size();
-
-    if (nTimes && args.found("newTimes"))
-    {
-        List<bool> selectTimes(nTimes, true);
-
-        for (label timei=0; timei < nTimes; ++timei)
-        {
-            selectTimes[timei] =
-               !fileHandler().exists
-                (
-                    runTime.path()
-                  / times[timei].name()
-                  / fName
-                );
-        }
-
-        return subset(selectTimes, times);
-    }
-
-    return times;
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/db/Time/timeSelector.H b/src/OpenFOAM/db/Time/timeSelector.H
index 031fd9b60f..5276392131 100644
--- a/src/OpenFOAM/db/Time/timeSelector.H
+++ b/src/OpenFOAM/db/Time/timeSelector.H
@@ -163,17 +163,6 @@ public:
             const argList& args
         );
 
-        //- Return the set of times selected based on the argList options
-        //- including support for \b -newTimes in which times are selected
-        //- if the file 'fName' does not exist in the time directory.
-        //  Also set the runTime to the first instance or the
-        //  \c constant/ directory if no instances are specified or available
-        static instantList select
-        (
-            Time& runTime,
-            const argList& args,
-            const word& fName
-        );
 };
 
 

From 4645c841ca4f55531f66dddd1bf60548bac32cef Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 10 Oct 2018 12:40:48 +0100
Subject: [PATCH 12/43] ENH: coordinateSystem: fix cloning. See #863

---
 src/meshTools/coordinate/systems/cartesianCS.H      | 6 ++++++
 src/meshTools/coordinate/systems/coordinateSystem.H | 2 +-
 src/meshTools/coordinate/systems/cylindricalCS.H    | 7 +++++++
 src/meshTools/coordinate/systems/indirectCS.H       | 6 ++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/meshTools/coordinate/systems/cartesianCS.H b/src/meshTools/coordinate/systems/cartesianCS.H
index 860cb6b800..94d712ed58 100644
--- a/src/meshTools/coordinate/systems/cartesianCS.H
+++ b/src/meshTools/coordinate/systems/cartesianCS.H
@@ -115,6 +115,12 @@ public:
         //  \param dictName If non-empty, the sub-dictionary to use.
         cartesian(const dictionary& dict, const word& dictName);
 
+        //- Return clone
+        virtual autoPtr<coordinateSystem> clone() const
+        {
+            return autoPtr<coordinateSystem>::NewFrom<cartesian>(*this);
+        }
+
 
     //- Destructor
     virtual ~cartesian() = default;
diff --git a/src/meshTools/coordinate/systems/coordinateSystem.H b/src/meshTools/coordinate/systems/coordinateSystem.H
index 619f2af5f6..e57f691e61 100644
--- a/src/meshTools/coordinate/systems/coordinateSystem.H
+++ b/src/meshTools/coordinate/systems/coordinateSystem.H
@@ -327,7 +327,7 @@ public:
 
 
     //- Return clone
-    autoPtr<coordinateSystem> clone() const
+    virtual autoPtr<coordinateSystem> clone() const
     {
         return autoPtr<coordinateSystem>::New(*this);
     }
diff --git a/src/meshTools/coordinate/systems/cylindricalCS.H b/src/meshTools/coordinate/systems/cylindricalCS.H
index 8a8291251c..53c7349260 100644
--- a/src/meshTools/coordinate/systems/cylindricalCS.H
+++ b/src/meshTools/coordinate/systems/cylindricalCS.H
@@ -154,6 +154,13 @@ public:
         //  \param dictName If non-empty, the sub-dictionary to use.
         cylindrical(const dictionary& dict, const word& dictName);
 
+        //- Return clone
+        virtual autoPtr<coordinateSystem> clone() const
+        {
+            return autoPtr<coordinateSystem>::NewFrom<cylindrical>(*this);
+        }
+
+
     //- Destructor
     virtual ~cylindrical() = default;
 
diff --git a/src/meshTools/coordinate/systems/indirectCS.H b/src/meshTools/coordinate/systems/indirectCS.H
index 1fd334218c..2ae4160cd5 100644
--- a/src/meshTools/coordinate/systems/indirectCS.H
+++ b/src/meshTools/coordinate/systems/indirectCS.H
@@ -141,6 +141,12 @@ public:
         //- Construct from global lookup
         indirect(const objectRegistry& obr, const dictionary& dict);
 
+        //- Return clone
+        virtual autoPtr<coordinateSystem> clone() const
+        {
+            return autoPtr<coordinateSystem>::NewFrom<indirect>(*this);
+        }
+
 
     //- Destructor
     virtual ~indirect() = default;

From 1933cffffe3af0c8dd8e5b2fafbd2eadd536d3c7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 10 Oct 2018 14:07:21 +0200
Subject: [PATCH 13/43] ENH: support line-breaks in option usage text

- for finer control of the '-help' output text
---
 src/OpenFOAM/global/argList/argList.C | 198 +++++++++++++++-----------
 src/OpenFOAM/global/argList/argList.H |  26 ++--
 2 files changed, 122 insertions(+), 102 deletions(-)

diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 84a6736bd6..acb268e37f 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -51,6 +51,7 @@ License
 
 bool Foam::argList::argsMandatory_ = true;
 bool Foam::argList::checkProcessorDirectories_ = true;
+
 Foam::SLList<Foam::string>    Foam::argList::validArgs;
 Foam::HashSet<Foam::string>   Foam::argList::advancedOptions;
 Foam::HashTable<Foam::string> Foam::argList::validOptions;
@@ -59,10 +60,11 @@ Foam::HashTable<Foam::string> Foam::argList::optionUsage;
 Foam::HashTable<std::pair<Foam::word,int>> Foam::argList::validOptionsCompat;
 Foam::HashTable<std::pair<bool,int>> Foam::argList::ignoreOptionsCompat;
 Foam::SLList<Foam::string>    Foam::argList::notes;
-Foam::string::size_type Foam::argList::usageMin = 20;
-Foam::string::size_type Foam::argList::usageMax = 80;
 Foam::word Foam::argList::postProcessOptionName("postProcess");
 
+std::string::size_type Foam::argList::usageMin = 20;
+std::string::size_type Foam::argList::usageMax = 80;
+
 Foam::argList::initValidTables::initValidTables()
 {
     argList::addOption
@@ -256,7 +258,7 @@ void Foam::argList::addBoolOption
 (
     const word& optName,
     const string& usage,
-    const bool advanced
+    bool advanced
 )
 {
     addOption(optName, "", usage, advanced);
@@ -268,7 +270,7 @@ void Foam::argList::addOption
     const word& optName,
     const string& param,
     const string& usage,
-    const bool advanced
+    bool advanced
 )
 {
     validOptions.set(optName, param);
@@ -283,6 +285,19 @@ void Foam::argList::addOption
 }
 
 
+void Foam::argList::setAdvanced(const word& optName, bool advanced)
+{
+    if (advanced && validOptions.found(optName))
+    {
+        advancedOptions.set(optName);
+    }
+    else
+    {
+        advancedOptions.erase(optName);
+    }
+}
+
+
 void Foam::argList::addOptionCompat
 (
     const word& optName,
@@ -300,7 +315,7 @@ void Foam::argList::addOptionCompat
 void Foam::argList::ignoreOptionCompat
 (
     std::pair<const char*,int> compat,
-    const bool expectArg
+    bool expectArg
 )
 {
     ignoreOptionsCompat.insert
@@ -417,100 +432,107 @@ void Foam::argList::noCheckProcessorDirectories()
 
 void Foam::argList::printOptionUsage
 (
-    const label location,
+    std::string::size_type start,
     const string& str
 )
 {
-    const string::size_type textWidth = usageMax - usageMin;
-    const string::size_type strLen = str.size();
+    const auto strLen = str.length();
 
-    if (strLen)
+    if (!strLen)
     {
-        // Minimum of 2 spaces between option and usage:
-        if (string::size_type(location) + 2 <= usageMin)
+        Info<< nl;
+        return;
+    }
+
+    // Indent the first line. Min 2 spaces between option and usage
+    if (start + 2 > usageMin)
+    {
+        Info<< nl;
+        start = 0;
+    }
+    while (start < usageMin)
+    {
+        Info<<' ';
+        ++start;
+    }
+
+    const std::string::size_type textWidth = (usageMax - usageMin);
+
+    // Output with text wrapping
+    for (std::string::size_type pos = 0;  pos < strLen; /*ni*/)
+    {
+        // Potential end point and next point
+        std::string::size_type end  = pos + textWidth - 1;
+        std::string::size_type eol  = str.find('\n', pos);
+        std::string::size_type next = string::npos;
+
+        if (end >= strLen)
         {
-            for (string::size_type i = location; i < usageMin; ++i)
+            // No more wrapping needed
+            end = strLen;
+
+            if (std::string::npos != eol && eol <= end)
             {
-                Info<<' ';
+                end = eol;
+                next = str.find_first_not_of(" \t\n", end); // Next non-space
             }
         }
+        else if (std::string::npos != eol && eol <= end)
+        {
+            // Embedded '\n' char
+            end = eol;
+            next = str.find_first_not_of(" \t\n", end);     // Next non-space
+        }
+        else if (isspace(str[end]))
+        {
+            // Ended on a space - can use this directly
+            next = str.find_first_not_of(" \t\n", end);     // Next non-space
+        }
+        else if (isspace(str[end+1]))
+        {
+            // The next one is a space - so we are okay
+            ++end;  // Otherwise the length is wrong
+            next = str.find_first_not_of(" \t\n", end);     // Next non-space
+        }
         else
         {
-            // or start a new line
+            // Line break will be mid-word
+            auto prev = str.find_last_of(" \t\n", end);     // Prev word break
+
+            if (std::string::npos != prev && prev > pos)
+            {
+                end = prev;
+                next = prev + 1;  // Continue from here
+            }
+        }
+
+        // The next position to continue from
+        if (std::string::npos == next)
+        {
+            next = end + 1;
+        }
+
+        // Has a length
+        if (end > pos)
+        {
+            // Indent following lines. The first one was already done.
+            if (pos)
+            {
+                for (std::string::size_type i = 0; i < usageMin; ++i)
+                {
+                    Info<<' ';
+                }
+            }
+
+            while (pos < end)
+            {
+                Info<< str[pos];
+                ++pos;
+            }
             Info<< nl;
-            for (string::size_type i = 0; i < usageMin; ++i)
-            {
-                Info<<' ';
-            }
         }
 
-        // Text wrap
-        string::size_type pos = 0;
-        while (pos != string::npos && pos + textWidth < strLen)
-        {
-            // Potential end point and next point
-            string::size_type curr = pos + textWidth - 1;
-            string::size_type next = string::npos;
-
-            if (isspace(str[curr]))
-            {
-                // We were lucky: ended on a space
-                next = str.find_first_not_of(" \t\n", curr);
-            }
-            else if (isspace(str[curr+1]))
-            {
-                // The next one is a space - so we are okay
-                ++curr;  // otherwise the length is wrong
-                next = str.find_first_not_of(" \t\n", curr);
-            }
-            else
-            {
-                // Search for end of a previous word break
-                string::size_type prev = str.find_last_of(" \t\n", curr);
-
-                // Reposition to the end of previous word if possible
-                if (prev != string::npos && prev > pos)
-                {
-                    curr = prev;
-                }
-            }
-
-            if (next == string::npos)
-            {
-                next = curr + 1;
-            }
-
-            // Indent following lines (not the first one)
-            if (pos)
-            {
-                for (string::size_type i = 0; i < usageMin; ++i)
-                {
-                    Info<<' ';
-                }
-            }
-
-            Info<< str.substr(pos, (curr - pos)).c_str() << nl;
-            pos = next;
-        }
-
-        // Output the remainder of the string
-        if (pos != string::npos)
-        {
-            // Indent following lines (not the first one)
-            if (pos)
-            {
-                for (string::size_type i = 0; i < usageMin; ++i)
-                {
-                    Info<<' ';
-                }
-            }
-
-            Info<< str.substr(pos).c_str() << nl;
-        }
-    }
-    else
-    {
-        Info<< nl;
+        pos = next;
     }
 }
 
@@ -761,7 +783,7 @@ Foam::argList::argList
     char**& argv,
     bool checkArgs,
     bool checkOpts,
-    const bool initialise
+    bool initialise
 )
 :
     args_(argc),
@@ -1618,7 +1640,9 @@ void Foam::argList::printUsage(bool full) const
         }
 
         Info<< "  -" << optName;
-        label len = optName.size() + 3;  // Length includes leading '  -'
+
+        // Length includes leading '  -'
+        label len = optName.size() + 3;
 
         const auto optIter = validOptions.cfind(optName);
         if (optIter().size())
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 3bcc32ea1e..b319b5e165 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -157,7 +157,7 @@ class argList
         //- Helper function for printUsage
         static void printOptionUsage
         (
-            const label location,
+            std::string::size_type start,
             const string& str
         );
 
@@ -222,19 +222,17 @@ public:
         static SLList<string> notes;
 
         //- Min offset for displaying usage (default: 20)
-        static string::size_type usageMin;
+        static std::string::size_type usageMin;
 
         //- Max screen width for displaying usage (default: 80)
-        static string::size_type usageMax;
+        static std::string::size_type usageMax;
 
         //- Standard name for the post-processing option
         static word postProcessOptionName;
 
         //! \cond internalClass
-        class initValidTables
+        struct initValidTables
         {
-        public:
-
             initValidTables();
         };
         //! \endcond
@@ -274,12 +272,7 @@ public:
 
         //- Scan for -help, -doc options etc prior to checking the validity
         //- of other args/opts and finally initialising.
-        void parse
-        (
-            bool checkArgs,
-            bool checkOpts,
-            bool initialise
-        );
+        void parse(bool checkArgs, bool checkOpts, bool initialise);
 
 
     // Access
@@ -398,7 +391,7 @@ public:
         (
             const word& optName,
             const string& usage = "",
-            const bool advanced = false
+            bool advanced = false
         );
 
         //- Add an option to validOptions with usage information
@@ -408,9 +401,12 @@ public:
             const word& optName,
             const string& param = "",
             const string& usage = "",
-            const bool advanced = false
+            bool advanced = false
         );
 
+        //- Set an existing option as being 'advanced' or normal
+        static void setAdvanced(const word& optName, bool advanced = true);
+
         //- Specify an alias for the option name.
         //
         //  \param optName the currently used option name
@@ -434,7 +430,7 @@ public:
         static void ignoreOptionCompat
         (
             std::pair<const char*,int> compat,
-            const bool expectArg
+            bool expectArg
         );
 
         //- Add option usage information to optionUsage

From aafbb6723f76e436169e58bbed94be3006d74c06 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 10 Oct 2018 15:33:35 +0200
Subject: [PATCH 14/43] BUG: wmkdepend sometimes throws (closes #1036)

- local token shifting was missing when getting the next file chunk
  (while in the middle of parsing that text).

  As well as adding the correct shifting, also tag the local buffer
  with nullptr when it is done. Be extra paranoid and check the
  raw buffer range before passing off to std::string.
---
 wmake/src/wmkdepend.cpp | 115 ++++++++++++++++++++++++++--------------
 wmake/src/wmkdepend.rl  |  47 +++++++++++++---
 2 files changed, 117 insertions(+), 45 deletions(-)

diff --git a/wmake/src/wmkdepend.cpp b/wmake/src/wmkdepend.cpp
index d60d1fd490..610af3ecdc 100644
--- a/wmake/src/wmkdepend.cpp
+++ b/wmake/src/wmkdepend.cpp
@@ -73,6 +73,9 @@ Note
 #include <unordered_set>
 #include <vector>
 
+// Ragel switches may have several implicit fallthroughs
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+
 // Length of the input read buffer
 #define INBUFLEN 16384
 
@@ -309,7 +312,7 @@ namespace Files
 // Can use 'variable p xxx;' etc to change these names
 
 
-#line 334 "wmkdepend.rl"
+#line 341 "wmkdepend.rl"
 
 
 
@@ -318,22 +321,38 @@ namespace Files
 //
 
 
-#line 322 "wmkdepend.cpp"
+#line 325 "wmkdepend.cpp"
 static const int wmkdep_start = 21;
 static const int wmkdep_error = 0;
 
 static const int wmkdep_en_main = 21;
 
 
-#line 342 "wmkdepend.rl"
+#line 349 "wmkdepend.rl"
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+void processFile(std::string fileName);
+
+//
+// Open a file and process.
+// The file name is given by the [first,last) range
+//
+void processFile(const char* first, const char* last)
+{
+    // Extra safety
+    if (first && last && last > first)
+    {
+        processFile(std::string(first, last));
+    }
+}
+
+
 //
 // Open a file and process
 //
-void processFile(const std::string& fileName)
+void processFile(std::string fileName)
 {
     FILE* infile = Files::open(fileName);
     if (optVerbose)
@@ -348,7 +367,7 @@ void processFile(const std::string& fileName)
     int act, cs;
 
     
-#line 352 "wmkdepend.cpp"
+#line 371 "wmkdepend.cpp"
 	{
 	cs = wmkdep_start;
 	ts = 0;
@@ -356,7 +375,7 @@ void processFile(const std::string& fileName)
 	act = 0;
 	}
 
-#line 363 "wmkdepend.rl"
+#line 386 "wmkdepend.rl"
    /* ^^^ FSM initialization here ^^^ */;
 
     // Local token start
@@ -401,7 +420,7 @@ void processFile(const std::string& fileName)
         }
 
         
-#line 405 "wmkdepend.cpp"
+#line 424 "wmkdepend.cpp"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -420,35 +439,35 @@ tr0:
 	}
 	goto st21;
 tr2:
-#line 332 "wmkdepend.rl"
+#line 339 "wmkdepend.rl"
 	{te = p+1;}
 	goto st21;
 tr17:
-#line 332 "wmkdepend.rl"
+#line 339 "wmkdepend.rl"
 	{{p = ((te))-1;}}
 	goto st21;
 tr21:
-#line 327 "wmkdepend.rl"
+#line 334 "wmkdepend.rl"
 	{te = p+1;}
 	goto st21;
 tr29:
-#line 330 "wmkdepend.rl"
+#line 337 "wmkdepend.rl"
 	{te = p+1;}
 	goto st21;
 tr31:
-#line 329 "wmkdepend.rl"
+#line 336 "wmkdepend.rl"
 	{te = p+1;}
 	goto st21;
 tr36:
-#line 324 "wmkdepend.rl"
+#line 331 "wmkdepend.rl"
 	{te = p;p--;}
 	goto st21;
 tr37:
-#line 332 "wmkdepend.rl"
+#line 339 "wmkdepend.rl"
 	{te = p;p--;}
 	goto st21;
 tr38:
-#line 330 "wmkdepend.rl"
+#line 337 "wmkdepend.rl"
 	{te = p;p--;}
 	goto st21;
 st21:
@@ -461,7 +480,7 @@ st21:
 case 21:
 #line 1 "NONE"
 	{ts = p;}
-#line 465 "wmkdepend.cpp"
+#line 484 "wmkdepend.cpp"
 	switch( (*p) ) {
 		case 10: goto st23;
 		case 11: goto tr34;
@@ -482,14 +501,14 @@ case 1:
 tr32:
 #line 1 "NONE"
 	{te = p+1;}
-#line 324 "wmkdepend.rl"
+#line 331 "wmkdepend.rl"
 	{act = 1;}
 	goto st22;
 st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-#line 493 "wmkdepend.cpp"
+#line 512 "wmkdepend.cpp"
 	switch( (*p) ) {
 		case 10: goto st23;
 		case 11: goto tr34;
@@ -511,14 +530,14 @@ case 23:
 tr34:
 #line 1 "NONE"
 	{te = p+1;}
-#line 324 "wmkdepend.rl"
+#line 331 "wmkdepend.rl"
 	{act = 1;}
 	goto st24;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-#line 522 "wmkdepend.cpp"
+#line 541 "wmkdepend.cpp"
 	switch( (*p) ) {
 		case 10: goto st23;
 		case 32: goto tr34;
@@ -616,14 +635,14 @@ case 10:
 	}
 	goto tr12;
 tr12:
-#line 312 "wmkdepend.rl"
-	{ tok = p; /* Local token start */ }
+#line 315 "wmkdepend.rl"
+	{ tok = p;  /* Local token start */ }
 	goto st11;
 st11:
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-#line 627 "wmkdepend.cpp"
+#line 646 "wmkdepend.cpp"
 	switch( (*p) ) {
 		case 10: goto tr15;
 		case 34: goto tr16;
@@ -632,8 +651,8 @@ case 11:
 tr13:
 #line 1 "NONE"
 	{te = p+1;}
-#line 312 "wmkdepend.rl"
-	{ tok = p; /* Local token start */ }
+#line 315 "wmkdepend.rl"
+	{ tok = p;  /* Local token start */ }
 	goto st25;
 tr15:
 #line 1 "NONE"
@@ -643,7 +662,7 @@ st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-#line 647 "wmkdepend.cpp"
+#line 666 "wmkdepend.cpp"
 	if ( (*p) == 34 )
 		goto tr19;
 	goto st12;
@@ -655,26 +674,32 @@ case 12:
 		goto tr19;
 	goto st12;
 tr19:
-#line 313 "wmkdepend.rl"
-	{ processFile(std::string(tok, (p - tok))); }
+#line 317 "wmkdepend.rl"
+	{
+        processFile(tok, p);
+        tok = nullptr;          /* Done with buffer */
+    }
 	goto st13;
 st13:
 	if ( ++p == pe )
 		goto _test_eof13;
 case 13:
-#line 666 "wmkdepend.cpp"
+#line 688 "wmkdepend.cpp"
 	if ( (*p) == 10 )
 		goto tr21;
 	goto st13;
 tr16:
-#line 313 "wmkdepend.rl"
-	{ processFile(std::string(tok, (p - tok))); }
+#line 317 "wmkdepend.rl"
+	{
+        processFile(tok, p);
+        tok = nullptr;          /* Done with buffer */
+    }
 	goto st14;
 st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-#line 678 "wmkdepend.cpp"
+#line 703 "wmkdepend.cpp"
 	if ( (*p) == 10 )
 		goto tr21;
 	goto st14;
@@ -705,7 +730,7 @@ st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-#line 709 "wmkdepend.cpp"
+#line 734 "wmkdepend.cpp"
 	if ( (*p) == 42 )
 		goto st18;
 	goto st17;
@@ -738,14 +763,14 @@ case 19:
 tr30:
 #line 1 "NONE"
 	{te = p+1;}
-#line 330 "wmkdepend.rl"
+#line 337 "wmkdepend.rl"
 	{act = 4;}
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 749 "wmkdepend.cpp"
+#line 774 "wmkdepend.cpp"
 	if ( (*p) == 10 )
 		goto tr2;
 	goto st1;
@@ -820,7 +845,7 @@ cs = 0;
 	_out: {}
 	}
 
-#line 406 "wmkdepend.rl"
+#line 429 "wmkdepend.rl"
        /* ^^^ FSM execution here ^^^ */;
 
         if (0 == cs)
@@ -834,11 +859,23 @@ cs = 0;
 
         if (ts)
         {
-            // Preserve incomplete token
+            // Preserve incomplete token.
+            // We have the normal ragel range (ts, te) but potentially
+            // our own local buffer start as 'tok'
+
+            if (tok && tok >= ts)
+            {
+                tok = inbuf + (tok - ts);
+            }
+            else
+            {
+                tok = nullptr;          // safety
+            }
+
             pending = pe - ts;
             memmove(inbuf, ts, pending);
-            te = inbuf + (te - ts);   // token end (after memmove)
-            ts = inbuf;               // token start
+            te = inbuf + (te - ts);     // token end (after memmove)
+            ts = inbuf;                 // token start
         }
         else
         {
diff --git a/wmake/src/wmkdepend.rl b/wmake/src/wmkdepend.rl
index a811f51913..3683bd0577 100644
--- a/wmake/src/wmkdepend.rl
+++ b/wmake/src/wmkdepend.rl
@@ -71,6 +71,9 @@ Note
 #include <unordered_set>
 #include <vector>
 
+// Ragel switches may have several implicit fallthroughs
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+
 // Length of the input read buffer
 #define INBUFLEN 16384
 
@@ -309,8 +312,12 @@ namespace Files
 %%{
     machine wmkdep;
 
-    action  buffer  { tok = p; /* Local token start */ }
-    action  process { processFile(std::string(tok, (p - tok))); }
+    action  buffer  { tok = p;  /* Local token start */ }
+    action  process
+    {
+        processFile(tok, p);
+        tok = nullptr;          /* Done with buffer */
+    }
 
     white   = [ \t\f\r];        # Horizontal whitespace
     nl      = white* '\n';      # Newline (allow trailing whitespace)
@@ -343,10 +350,26 @@ namespace Files
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+void processFile(std::string fileName);
+
+//
+// Open a file and process.
+// The file name is given by the [first,last) range
+//
+void processFile(const char* first, const char* last)
+{
+    // Extra safety
+    if (first && last && last > first)
+    {
+        processFile(std::string(first, last));
+    }
+}
+
+
 //
 // Open a file and process
 //
-void processFile(const std::string& fileName)
+void processFile(std::string fileName)
 {
     FILE* infile = Files::open(fileName);
     if (optVerbose)
@@ -416,11 +439,23 @@ void processFile(const std::string& fileName)
 
         if (ts)
         {
-            // Preserve incomplete token
+            // Preserve incomplete token.
+            // We have the normal ragel range (ts, te) but potentially
+            // our own local buffer start as 'tok'
+
+            if (tok && tok >= ts)
+            {
+                tok = inbuf + (tok - ts);
+            }
+            else
+            {
+                tok = nullptr;          // safety
+            }
+
             pending = pe - ts;
             memmove(inbuf, ts, pending);
-            te = inbuf + (te - ts);   // token end (after memmove)
-            ts = inbuf;               // token start
+            te = inbuf + (te - ts);     // token end (after memmove)
+            ts = inbuf;                 // token start
         }
         else
         {

From 15747fde6b96946db63ec9457daf05d5b30c67e0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 10 Oct 2018 17:03:04 +0100
Subject: [PATCH 15/43] ENH: overset: on-demand trigger of stencil-update.
 Fixes #1028.

---
 .../cellCellStencil/cellCellStencil.H         |  15 ++-
 .../cellCellStencilTemplates.C                |  62 +++++++++
 .../cellVolumeWeightCellCellStencil.C         |   8 +-
 .../cellVolumeWeightCellCellStencil.H         |   8 +-
 .../inverseDistanceCellCellStencil.C          | 127 ++++++++++--------
 .../inverseDistanceCellCellStencil.H          |  10 +-
 .../trackingInverseDistanceCellCellStencil.C  |  16 ++-
 .../dynamicOversetFvMesh.C                    |  10 --
 .../dynamicOversetFvMesh.H                    |   2 -
 9 files changed, 178 insertions(+), 80 deletions(-)
 create mode 100644 src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C

diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
index 250afd7ba9..9bb1760188 100644
--- a/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,8 +43,8 @@ SourceFiles
 
 #include "scalarList.H"
 #include "mapDistribute.H"
-#include "fvMesh.H"
 #include "pointList.H"
+#include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -95,6 +95,11 @@ protected:
         //- Count ocurrences (in parallel)
         static labelList count(const label size, const labelUList& lst);
 
+        //- Helper: create volScalarField for postprocessing.
+        template<class Type>
+        tmp<volScalarField> createField(const word& name, UList<Type>&) const;
+
+
 private:
 
     // Private Member Functions
@@ -220,6 +225,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "cellCellStencilTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C b/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
new file mode 100644
index 0000000000..d431890976
--- /dev/null
+++ b/src/overset/cellCellStencil/cellCellStencil/cellCellStencilTemplates.C
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "zeroGradientFvPatchFields.H"
+
+// * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::volScalarField>
+Foam::cellCellStencil::createField(const word& name, UList<Type>& psi) const
+{
+    tmp<volScalarField> tfld
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                name,
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            mesh_,
+            dimensionedScalar(dimless, Zero),
+            zeroGradientFvPatchScalarField::typeName
+        )
+    );
+    volScalarField& fld = tfld.ref();
+
+    forAll(psi, cellI)
+    {
+        fld[cellI] = psi[cellI];
+    }
+    return tfld;
+}
+
+
+// ************************************************************************* //
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
index 7168900d6c..eca71ca548 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
@@ -1113,8 +1113,10 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
 
 
     List<Map<label>> compactMap;
-    mapDistribute map(globalCells, cellStencil_, compactMap);
-    cellInterpolationMap_.transfer(map);
+    cellInterpolationMap_.reset
+    (
+        new mapDistribute(globalCells, cellStencil_, compactMap)
+    );
 
     // Dump interpolation stencil
     if (debug)
@@ -1128,7 +1130,7 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
         OBJstream str(mesh_.time().timePath()/"stencil2.obj");
         Info<< typeName << " : dumping to " << str.name() << endl;
         pointField cc(mesh_.cellCentres());
-        cellInterpolationMap_.distribute(cc);
+        cellInterpolationMap().distribute(cc);
 
         forAll(interpolationCells_, compactI)
         {
diff --git a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
index 321922a8a9..6de2e2fb15 100644
--- a/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
+++ b/src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,7 +77,7 @@ protected:
         labelList interpolationCells_;
 
         //- Fetch interpolated cells
-        mapDistribute cellInterpolationMap_;
+        autoPtr<mapDistribute> cellInterpolationMap_;
 
         //- Interpolation stencil
         labelListList cellStencil_;
@@ -205,6 +205,10 @@ public:
         //- Return a communication schedule
         virtual const mapDistribute& cellInterpolationMap() const
         {
+            if (!cellInterpolationMap_.valid())
+            {
+                const_cast<cellVolumeWeight&>(*this).update();
+            }
             return cellInterpolationMap_;
         }
 
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
index 9e26175a19..e626bacede 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
@@ -1500,7 +1500,7 @@ void Foam::cellCellStencils::inverseDistance::createStencil
 
     while (true)
     {
-        pointField samples(cellInterpolationMap_.constructSize(), greatPoint);
+        pointField samples(cellInterpolationMap().constructSize(), greatPoint);
 
         // Fill remote slots (override old content). We'll find out later
         // on which one has won and mark this one in doneAcceptor.
@@ -1544,9 +1544,9 @@ void Foam::cellCellStencils::inverseDistance::createStencil
             Pstream::commsTypes::nonBlocking,
             List<labelPair>(),
             mesh_.nCells(),
-            cellInterpolationMap_.constructMap(),
+            cellInterpolationMap().constructMap(),
             false,
-            cellInterpolationMap_.subMap(),
+            cellInterpolationMap().subMap(),
             false,
             samples,
             minMagSqrEqOp<point>(),
@@ -1597,9 +1597,9 @@ void Foam::cellCellStencils::inverseDistance::createStencil
         // Transfer the information back to the acceptor:
         // - donorCellCells : stencil (with first element the original donor)
         // - donorWeights : weights for donorCellCells
-        cellInterpolationMap_.distribute(donorCellCells);
-        cellInterpolationMap_.distribute(donorWeights);
-        cellInterpolationMap_.distribute(samples);
+        cellInterpolationMap().distribute(donorCellCells);
+        cellInterpolationMap().distribute(donorWeights);
+        cellInterpolationMap().distribute(samples);
 
         // Check which acceptor has won and transfer
         forAll(interpolationCells_, i)
@@ -1635,8 +1635,15 @@ void Foam::cellCellStencils::inverseDistance::createStencil
 
     // Re-do the mapDistribute
     List<Map<label>> compactMap;
-    mapDistribute map(globalCells, cellStencil_, compactMap);
-    cellInterpolationMap_.transfer(map);
+    cellInterpolationMap_.reset
+    (
+        new mapDistribute
+        (
+            globalCells,
+            cellStencil_,
+            compactMap
+        )
+    );
 }
 
 
@@ -1982,6 +1989,12 @@ bool Foam::cellCellStencils::inverseDistance::update()
         }
     }
 
+    if (debug)
+    {
+        tmp<volScalarField> tfld(createField("allCellTypes", allCellTypes));
+        //tfld.ref().correctBoundaryConditions();
+        tfld().write();
+    }
 
     // Use the patch types and weights to decide what to do
     forAll(allPatchTypes, cellI)
@@ -2017,15 +2030,55 @@ bool Foam::cellCellStencils::inverseDistance::update()
         }
     }
 
+    if (debug)
+    {
+        tmp<volScalarField> tfld
+        (
+            createField("allCellTypes_patch", allCellTypes)
+        );
+        //tfld.ref().correctBoundaryConditions();
+        tfld().write();
+    }
 
     // Mark unreachable bits
     findHoles(globalCells, mesh_, zoneID, allStencil, allCellTypes);
 
+    if (debug)
+    {
+        tmp<volScalarField> tfld
+        (
+            createField("allCellTypes_hole", allCellTypes)
+        );
+        //tfld.ref().correctBoundaryConditions();
+        tfld().write();
+    }
+    if (debug)
+    {
+        labelList stencilSize(mesh_.nCells());
+        forAll(allStencil, celli)
+        {
+            stencilSize[celli] = allStencil[celli].size();
+        }
+        tmp<volScalarField> tfld(createField("allStencil_hole", stencilSize));
+        //tfld.ref().correctBoundaryConditions();
+        tfld().write();
+    }
+
 
     // Add buffer interpolation layer(s) around holes
     scalarField allWeight(mesh_.nCells(), 0.0);
     walkFront(layerRelax, allStencil, allCellTypes, allWeight);
 
+    if (debug)
+    {
+        tmp<volScalarField> tfld
+        (
+            createField("allCellTypes_front", allCellTypes)
+        );
+        //tfld.ref().correctBoundaryConditions();
+        tfld().write();
+    }
+
 
     // Check previous iteration cellTypes_ for any hole->calculated changes
     {
@@ -2092,9 +2145,10 @@ bool Foam::cellCellStencils::inverseDistance::update()
     interpolationCells_.transfer(interpolationCells);
 
     List<Map<label>> compactMap;
-    mapDistribute map(globalCells, cellStencil_, compactMap);
-    cellInterpolationMap_.transfer(map);
-
+    cellInterpolationMap_.reset
+    (
+        new mapDistribute(globalCells, cellStencil_, compactMap)
+    );
     cellInterpolationWeight_.transfer(allWeight);
     cellInterpolationWeight_.correctBoundaryConditions();
 
@@ -2110,7 +2164,7 @@ bool Foam::cellCellStencils::inverseDistance::update()
         Pout<< type() << " : dumping injectionStencil to "
             << str.name() << endl;
         pointField cc(mesh_.cellCentres());
-        cellInterpolationMap_.distribute(cc);
+        cellInterpolationMap().distribute(cc);
 
         forAll(cellStencil_, celli)
         {
@@ -2140,21 +2194,7 @@ bool Foam::cellCellStencils::inverseDistance::update()
 
         // Dump max weight
         {
-            volScalarField maxMagWeight
-            (
-                IOobject
-                (
-                    "maxMagWeight",
-                    mesh_.time().timeName(),
-                    mesh_,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh_,
-                dimensionedScalar(dimless, Zero),
-                zeroGradientFvPatchScalarField::typeName
-            );
+            scalarField maxMagWeight(mesh_.nCells(), 0.0);
             forAll(cellStencil_, celli)
             {
                 const scalarList& wghts = cellInterpolationWeights_[celli];
@@ -2180,44 +2220,25 @@ bool Foam::cellCellStencils::inverseDistance::update()
                         << endl;
                 }
             }
-            maxMagWeight.correctBoundaryConditions();
-            maxMagWeight.write();
+            tmp<volScalarField> tfld(createField("maxMagWeight", maxMagWeight));
+            tfld.ref().correctBoundaryConditions();
+            tfld().write();
         }
 
         // Dump cell types
         {
-            volScalarField volTypes
-            (
-                IOobject
-                (
-                    "cellTypes",
-                    mesh_.time().timeName(),
-                    mesh_,
-                    IOobject::NO_READ,
-                    IOobject::NO_WRITE,
-                    false
-                ),
-                mesh_,
-                dimensionedScalar(dimless, Zero),
-                zeroGradientFvPatchScalarField::typeName
-            );
-
-            forAll(volTypes.internalField(), cellI)
-            {
-                volTypes[cellI] = cellTypes_[cellI];
-            }
-            volTypes.correctBoundaryConditions();
-            volTypes.write();
+            tmp<volScalarField> tfld(createField("cellTypes", cellTypes_));
+            tfld.ref().correctBoundaryConditions();
+            tfld().write();
         }
 
 
-
         // Dump stencil
         mkDir(mesh_.time().timePath());
         OBJstream str(mesh_.time().timePath()/"stencil.obj");
         Pout<< type() << " : dumping to " << str.name() << endl;
         pointField cc(mesh_.cellCentres());
-        cellInterpolationMap_.distribute(cc);
+        cellInterpolationMap().distribute(cc);
 
         forAll(cellStencil_, celli)
         {
diff --git a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
index 22bf2531c8..ae7da72beb 100644
--- a/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
+++ b/src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2017-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,7 +84,7 @@ protected:
         labelList interpolationCells_;
 
         //- Fetch interpolated cells
-        mapDistribute cellInterpolationMap_;
+        autoPtr<mapDistribute> cellInterpolationMap_;
 
         //- Interpolation stencil
         labelListList cellStencil_;
@@ -302,7 +302,11 @@ public:
         //- Return a communication schedule
         virtual const mapDistribute& cellInterpolationMap() const
         {
-            return cellInterpolationMap_;
+            if (!cellInterpolationMap_.valid())
+            {
+                const_cast<inverseDistance&>(*this).update();
+            }
+            return cellInterpolationMap_();
         }
 
         //- Per interpolated cell the neighbour cells (in terms of slots as
diff --git a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
index e595d07c30..98d5df0525 100644
--- a/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
+++ b/src/overset/cellCellStencil/trackingInverseDistance/trackingInverseDistanceCellCellStencil.C
@@ -787,9 +787,15 @@ bool Foam::cellCellStencils::trackingInverseDistance::update()
     interpolationCells_.transfer(interpolationCells);
 
     List<Map<label>> compactMap;
-    mapDistribute map(globalCells, cellStencil_, compactMap);
-    cellInterpolationMap_.transfer(map);
-
+    cellInterpolationMap_.reset
+    (
+        new mapDistribute
+        (
+            globalCells,
+            cellStencil_,
+            compactMap
+        )
+    );
     cellInterpolationWeight_.transfer(allWeight);
     cellInterpolationWeight_.correctBoundaryConditions();
 
@@ -802,7 +808,7 @@ bool Foam::cellCellStencils::trackingInverseDistance::update()
         Pout<< typeName << " : dumping injectionStencil to "
             << str.name() << endl;
         pointField cc(mesh_.cellCentres());
-        cellInterpolationMap_.distribute(cc);
+        cellInterpolationMap().distribute(cc);
 
         forAll(cellStencil_, celli)
         {
@@ -862,7 +868,7 @@ bool Foam::cellCellStencils::trackingInverseDistance::update()
         OBJstream str(mesh_.time().timePath()/"stencil.obj");
         Pout<< typeName << " : dumping to " << str.name() << endl;
         pointField cc(mesh_.cellCentres());
-        cellInterpolationMap_.distribute(cc);
+        cellInterpolationMap().distribute(cc);
 
         forAll(cellStencil_, celli)
         {
diff --git a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
index 05969e3245..378516e334 100644
--- a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
+++ b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
@@ -44,15 +44,6 @@ namespace Foam
 bool Foam::dynamicOversetFvMesh::updateAddressing() const
 {
     const cellCellStencilObject& overlap = Stencil::New(*this);
-    // Make sure that stencil is not still in the initial, non-uptodate
-    // state. This gets triggered by e.g. Poisson wall distance that
-    // triggers the stencil even though time has not been updated (and hence
-    // mesh.update() has not been called.
-    if (!stencilIsUpToDate_)
-    {
-        stencilIsUpToDate_ = true;
-        const_cast<cellCellStencilObject&>(overlap).update();
-    }
 
     // The (processor-local part of the) stencil determines the local
     // faces to add to the matrix. tbd: parallel
@@ -236,7 +227,6 @@ Foam::dynamicOversetFvMesh::dynamicOversetFvMesh(const IOobject& io)
 {
     // Load stencil (but do not update)
     (void)Stencil::New(*this, false);
-    stencilIsUpToDate_ = false;
 }
 
 
diff --git a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.H b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.H
index 70a064516c..21d875dea1 100644
--- a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.H
+++ b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.H
@@ -65,8 +65,6 @@ protected:
         //  lduAddressing (true)
         mutable bool active_;
 
-        mutable bool stencilIsUpToDate_;
-
         //- Extended addressing (extended with local interpolation stencils)
         mutable autoPtr<fvMeshPrimitiveLduAddressing> lduPtr_;
 

From f7c85b034bd448a772d61b5f17eadac13d1575dc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 11 Oct 2018 08:32:43 +0200
Subject: [PATCH 16/43] STYLE: clearer handling of argList -case internals
 (issue #1037)

---
 applications/test/argList/Test-argList.C | 10 ++-
 src/OpenFOAM/global/argList/argList.C    | 98 +++++++++++-------------
 src/OpenFOAM/global/argList/argList.H    | 17 ++--
 src/OpenFOAM/global/argList/argListI.H   |  6 ++
 4 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/applications/test/argList/Test-argList.C b/applications/test/argList/Test-argList.C
index ac62fce0ba..f36ac730a0 100644
--- a/applications/test/argList/Test-argList.C
+++ b/applications/test/argList/Test-argList.C
@@ -40,7 +40,6 @@ int main(int argc, char *argv[])
     argList::noBanner();
     argList::noParallel();
     // argList::noFunctionObjects();
-    argList::removeOption("case");
     argList::addOption("label",  "value", "Test parsing of label");
     argList::addOption("scalar", "value", "Test parsing of scalar");
     argList::addOption("string", "value", "Test string lookup");
@@ -73,6 +72,15 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv, false, true);
 
+    Info<< "command-line ("
+        << args.options().size() << " options, "
+        << args.args().size() << " args)" << nl
+        << "    " << args.commandLine().c_str() << nl << nl;
+
+    Info<< "rootPath:   " << args.rootPath() << nl
+        << "globalCase: " << args.globalCaseName() << nl
+        << "globalPath: " << args.globalPath() << nl
+        << nl;
 
     Info<<"have: "
         <<args.count({"label", "scalar"}) << " options" << nl;
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index acb268e37f..92ac5235d4 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -706,72 +706,59 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
     args_.resize(nArgs);
 
     std::string::size_type len = (nArgs-1); // Spaces between args
-    forAll(args_, argi)
+    for (const auto& s : args_)
     {
-        len += args_[argi].size();
+        len += s.length();
     }
 
     // Length needed for regrouped command-line
-    argListStr_.reserve(len);
+    commandLine_.reserve(len);
 
     return nArgs < argc;
 }
 
 
-void Foam::argList::getRootCase()
+void Foam::argList::setCasePaths()
 {
-    fileName casePath;
+    fileName caseDir;
 
-    // [-case dir] specified
-    const auto optIter = options_.cfind("case");
+    const auto optIter = options_.cfind("case");  // [-case dir] specified?
 
     if (optIter.found())
     {
-        casePath = optIter.object();
-        casePath.clean();
+        caseDir = optIter.object();
+        caseDir.clean();
 
-        if (casePath.empty() || casePath == ".")
+        if (caseDir.empty() || caseDir == ".")
         {
-            // Handle degenerate form and '-case .' like no -case specified
-            casePath = cwd();
+            // Treat "", "." and "./" as if -case was not specified
+            caseDir = cwd();
             options_.erase("case");
         }
-        else if (!casePath.isAbsolute() && casePath.name() == "..")
+        else if (!caseDir.isAbsolute())
         {
-            // Avoid relative cases ending in '..' - makes for very ugly names
-            casePath = cwd()/casePath;
-            casePath.clean();
+            caseDir = cwd()/caseDir;
+            caseDir.clean();
         }
     }
     else
     {
         // Nothing specified, use the current dir
-        casePath = cwd();
+        caseDir = cwd();
     }
 
-    rootPath_   = casePath.path();
-    globalCase_ = casePath.name();
-    case_       = globalCase_;
+    // The caseDir is a cleaned, absolute path
 
-    // The name of the executable, unless already present in the environment
+    rootPath_   = caseDir.path();
+    globalCase_ = caseDir.name();
+    case_       = globalCase_;  // The (processor) local case name
+
+    // Global case (directory) and case-name as environment variables
+    setEnv("FOAM_CASE", caseDir, true);
+    setEnv("FOAM_CASENAME", globalCase_, true);
+
+    // Executable name, unless already present in the environment
     setEnv("FOAM_EXECUTABLE", executable_, false);
-
-    // Set the case and case-name as an environment variable
-    if (rootPath_.isAbsolute())
-    {
-        // Absolute path - use as-is
-        setEnv("FOAM_CASE", rootPath_/globalCase_, true);
-        setEnv("FOAM_CASENAME", globalCase_, true);
-    }
-    else
-    {
-        // Qualify relative path
-        casePath = cwd()/rootPath_/globalCase_;
-        casePath.clean();
-
-        setEnv("FOAM_CASE", casePath, true);
-        setEnv("FOAM_CASENAME", casePath.name(), true);
-    }
 }
 
 
@@ -837,7 +824,7 @@ Foam::argList::argList
 
     // Convert argv -> args_ and capture ( ... ) lists
     regroupArgv(argc, argv);
-    argListStr_ += args_[0];
+    commandLine_ += args_[0];
 
     // Set executable name immediately - useful when emitting errors.
     executable_ = fileName(args_[0]).name();
@@ -846,8 +833,8 @@ Foam::argList::argList
     int nArgs = 1;
     for (int argi = 1; argi < args_.size(); ++argi)
     {
-        argListStr_ += ' ';
-        argListStr_ += args_[argi];
+        commandLine_ += ' ';
+        commandLine_ += args_[argi];
 
         if (args_[argi][0] == '-')
         {
@@ -881,8 +868,8 @@ Foam::argList::argList
                     Pstream::exit(1); // works for serial and parallel
                 }
 
-                argListStr_ += ' ';
-                argListStr_ += args_[argi];
+                commandLine_ += ' ';
+                commandLine_ += args_[argi];
                 // Handle duplicates by taking the last -option specified
                 options_.set(optName, args_[argi]);
             }
@@ -926,7 +913,7 @@ Foam::argList::argList
     rootPath_(args.rootPath_),
     globalCase_(args.globalCase_),
     case_(args.case_),
-    argListStr_(args.argListStr_)
+    commandLine_(args.commandLine_)
 {
     parse(checkArgs, checkOpts, initialise);
 }
@@ -1013,7 +1000,7 @@ void Foam::argList::parse
                 #endif
                 << nl
                 << "Arch   : " << Foam::FOAMbuildArch << nl
-                << "Exec   : " << argListStr_.c_str() << nl
+                << "Exec   : " << commandLine_.c_str() << nl
                 << "Date   : " << dateString.c_str() << nl
                 << "Time   : " << timeString.c_str() << nl
                 << "Host   : " << hostName().c_str() << nl
@@ -1025,7 +1012,7 @@ void Foam::argList::parse
         jobInfo.add("userName", userName());
         jobInfo.add("foamVersion", word(Foam::FOAMversion));
         jobInfo.add("code", executable_);
-        jobInfo.add("argList", argListStr_);
+        jobInfo.add("argList", commandLine_);
         jobInfo.add("currentDir", cwd());
         jobInfo.add("PPID", ppid());
         jobInfo.add("PGID", pgid());
@@ -1128,7 +1115,7 @@ void Foam::argList::parse
         if (Pstream::master())
         {
             // Establish rootPath_/globalCase_/case_ for master
-            getRootCase();
+            setCasePaths();
 
             // Establish location of decomposeParDict, allow override with
             // the -decomposeParDict option.
@@ -1288,9 +1275,9 @@ void Foam::argList::parse
                         << exit(FatalError);
                 }
 
-                forAll(roots, i)
+                for (fileName& dir : roots)
                 {
-                    roots[i].expand();
+                    dir.expand();
                 }
 
                 // Distribute the master's argument list (with new root)
@@ -1330,8 +1317,8 @@ void Foam::argList::parse
                     (
                         isDir
                         (
-                            rootPath_/globalCase_/"processor"
-                          + name(++nProcDirs)
+                            rootPath_/globalCase_
+                          / "processor" + Foam::name(++nProcDirs)
                         )
                     )
                     {}
@@ -1371,19 +1358,20 @@ void Foam::argList::parse
             fromMaster >> args_ >> options_ >> distributed_;
 
             // Establish rootPath_/globalCase_/case_ for slave
-            getRootCase();
+            setCasePaths();
         }
 
         nProcs = Pstream::nProcs();
-        case_ = globalCase_/(word("processor") + name(Pstream::myProcNo()));
+        case_ = globalCase_/("processor" + Foam::name(Pstream::myProcNo()));
     }
     else
     {
         // Establish rootPath_/globalCase_/case_
-        getRootCase();
-        case_ = globalCase_;
+        setCasePaths();
+        case_ = globalCase_;   // Redundant, but extra safety?
     }
 
+
     // Keep or discard slave and root information for reporting:
     if (Pstream::master() && parRunControl_.parRun())
     {
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index b319b5e165..d55219e785 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -143,7 +143,9 @@ class argList
         bool distributed_;
         fileName globalCase_;
         fileName case_;
-        string argListStr_;
+
+        //- The command line options and arguments concatenated as a string
+        string commandLine_;
 
 
     // Private Member Functions
@@ -176,14 +178,14 @@ class argList
         template<class T>
         static inline void readList(ITstream& is, List<T>& list);
 
-        //- Get rootPath_ / globalCase_ from one of the following forms
+        //- Set rootPath_, globalCase_, case_ from one of the following forms
         //   * [-case dir]
         //   * cwd
         //
         // Also export FOAM_CASE and FOAM_CASENAME environment variables
         // so they can be used immediately (eg, in decomposeParDict), as well
         // as the FOAM_EXECUTABLE environment.
-        void getRootCase();
+        void setCasePaths();
 
         //- Transcribe argv into internal args_.
         //  Transform sequences with "(" ... ")" into string lists
@@ -280,6 +282,9 @@ public:
         //- Name of executable without the path
         inline const word& executable() const;
 
+        //- The command line options and arguments concatenated as a string
+        inline const string& commandLine() const;
+
         //- Return root path
         inline const fileName& rootPath() const;
 
@@ -296,10 +301,12 @@ public:
         //- Return parRunControl
         inline const ParRunControl& parRunControl() const;
 
-        //- Return the path to the caseName
+        //- Return the full path to the (processor local) case
+        //  \note This is guaranteed to be an absolute path
         inline fileName path() const;
 
-        //- Return the path to the globalCaseName
+        //- Return the full path to the global case
+        //  \note This is guaranteed to be an absolute path
         inline fileName globalPath() const;
 
         //- Return the number of arguments
diff --git a/src/OpenFOAM/global/argList/argListI.H b/src/OpenFOAM/global/argList/argListI.H
index c473becff1..2848add507 100644
--- a/src/OpenFOAM/global/argList/argListI.H
+++ b/src/OpenFOAM/global/argList/argListI.H
@@ -51,6 +51,12 @@ inline const Foam::word& Foam::argList::executable() const
 }
 
 
+inline const Foam::string& Foam::argList::commandLine() const
+{
+    return commandLine_;
+}
+
+
 inline const Foam::fileName& Foam::argList::rootPath() const
 {
     return rootPath_;

From a77ab5d4eb90de10b8e2ca9ad8dc05f0144501a7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 11 Oct 2018 09:12:01 +0200
Subject: [PATCH 17/43] STYLE: relocate distributed flag into ParRunControl

- adjust member order in TimePaths to better packing
---
 applications/test/sizeof/Test-sizeof.C        |  8 +++
 .../redistributePar/redistributePar.C         | 50 +++++++++----------
 src/OpenFOAM/db/Time/TimePaths.C              |  6 +--
 src/OpenFOAM/db/Time/TimePaths.H              |  3 +-
 src/OpenFOAM/global/argList/argList.C         | 13 +++--
 src/OpenFOAM/global/argList/argList.H         | 17 +++----
 src/OpenFOAM/global/argList/argListI.H        | 24 ++++-----
 src/OpenFOAM/global/argList/parRun.H          | 34 +++++++++----
 8 files changed, 90 insertions(+), 65 deletions(-)

diff --git a/applications/test/sizeof/Test-sizeof.C b/applications/test/sizeof/Test-sizeof.C
index 40f33de650..c20ce172a2 100644
--- a/applications/test/sizeof/Test-sizeof.C
+++ b/applications/test/sizeof/Test-sizeof.C
@@ -33,6 +33,7 @@ Description
 #include "nil.H"
 #include "IOstreams.H"
 #include "PstreamBuffers.H"
+#include "argList.H"
 #include "Time.H"
 
 namespace Foam
@@ -63,6 +64,13 @@ int main(int argc, char *argv[])
         nil x;
         cout<<"nil:" << sizeof(x) << nl;
     }
+    {
+        argList x(argc, argv);
+        cout<<"argList:" << sizeof(x) << nl;
+
+        TimePaths y(x);
+        cout<<"TimePaths:" << sizeof(y) << nl;
+    }
     {
         zero x;
         cout<<"zero:" << sizeof(x) << nl;
diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
index b7ae617422..89b3e0296c 100644
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@@ -336,8 +336,7 @@ void determineDecomposition
     {
         Info<< "Setting caseName to " << baseRunTime.caseName()
             << " to read decomposeParDict" << endl;
-        const_cast<Time&>(mesh.time()).TimePaths::caseName() =
-            baseRunTime.caseName();
+        const_cast<Time&>(mesh.time()).caseName() = baseRunTime.caseName();
     }
 
     scalarField cellWeights;
@@ -366,8 +365,7 @@ void determineDecomposition
     if (Pstream::master() && decompose)
     {
         Info<< "Restoring caseName to " << proc0CaseName << endl;
-        const_cast<Time&>(mesh.time()).TimePaths::caseName() =
-            proc0CaseName;
+        const_cast<Time&>(mesh.time()).caseName() = proc0CaseName;
     }
 
     // Dump decomposition to volScalarField
@@ -383,10 +381,10 @@ void determineDecomposition
 
                 Time& tm = const_cast<Time&>(mesh.time());
 
-                tm.TimePaths::caseName() = baseRunTime.caseName();
+                tm.caseName() = baseRunTime.caseName();
                 writeDecomposition("cellDist", mesh, decomp);
                 Info<< "Restoring caseName to " << proc0CaseName << endl;
-                tm.TimePaths::caseName() = proc0CaseName;
+                tm.caseName() = proc0CaseName;
             }
         }
         else
@@ -908,12 +906,12 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
         // Get original objects (before incrementing time!)
         if (Pstream::master() && decompose)
         {
-            runTime.TimePaths::caseName() = baseRunTime.caseName();
+            runTime.caseName() = baseRunTime.caseName();
         }
         IOobjectList objects(mesh, runTime.timeName());
         if (Pstream::master() && decompose)
         {
-            runTime.TimePaths::caseName() = proc0CaseName;
+            runTime.caseName() = proc0CaseName;
         }
 
         Info<< "From time " << runTime.timeName()
@@ -932,7 +930,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
 
         if (Pstream::master() && decompose)
         {
-            runTime.TimePaths::caseName() = baseRunTime.caseName();
+            runTime.caseName() = baseRunTime.caseName();
         }
         readFields
         (
@@ -1112,7 +1110,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
 
         if (Pstream::master() && decompose)
         {
-            runTime.TimePaths::caseName() = proc0CaseName;
+            runTime.caseName() = proc0CaseName;
         }
     }
 
@@ -1192,7 +1190,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
         {
             Info<< "Setting caseName to " << baseRunTime.caseName()
                 << " to write reconstructed mesh and fields." << endl;
-            runTime.TimePaths::caseName() = baseRunTime.caseName();
+            runTime.caseName() = baseRunTime.caseName();
 
             mesh.write();
             topoSet::removeFiles(mesh);
@@ -1212,7 +1210,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
 
             // Now we've written all. Reset caseName on master
             Info<< "Restoring caseName to " << proc0CaseName << endl;
-            runTime.TimePaths::caseName() = proc0CaseName;
+            runTime.caseName() = proc0CaseName;
         }
     }
     else
@@ -1258,7 +1256,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
         // Read refinement data
         if (Pstream::master() && decompose)
         {
-            runTime.TimePaths::caseName() = baseRunTime.caseName();
+            runTime.caseName() = baseRunTime.caseName();
         }
         IOobject io
         (
@@ -1274,7 +1272,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
         hexRef8Data refData(io);
         if (Pstream::master() && decompose)
         {
-            runTime.TimePaths::caseName() = proc0CaseName;
+            runTime.caseName() = proc0CaseName;
         }
 
         // Make sure all processors have valid data (since only some will
@@ -1294,13 +1292,13 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
             {
                 Info<< "Setting caseName to " << baseRunTime.caseName()
                     << " to write reconstructed refinement data." << endl;
-                runTime.TimePaths::caseName() = baseRunTime.caseName();
+                runTime.caseName() = baseRunTime.caseName();
 
                 refData.write();
 
                 // Now we've written all. Reset caseName on master
                 Info<< "Restoring caseName to " << proc0CaseName << endl;
-                runTime.TimePaths::caseName() = proc0CaseName;
+                runTime.caseName() = proc0CaseName;
             }
         }
         else
@@ -1314,7 +1312,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
     //    // Read sets
     //    if (Pstream::master() && decompose)
     //    {
-    //        runTime.TimePaths::caseName() = baseRunTime.caseName();
+    //        runTime.caseName() = baseRunTime.caseName();
     //    }
     //    IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
     //
@@ -1323,7 +1321,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
     //
     //    if (Pstream::master() && decompose)
     //    {
-    //        runTime.TimePaths::caseName() = proc0CaseName;
+    //        runTime.caseName() = proc0CaseName;
     //    }
     //
     //    forAll(cellSets, i)
@@ -1337,7 +1335,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
     //        {
     //            Info<< "Setting caseName to " << baseRunTime.caseName()
     //                << " to write reconstructed refinement data." << endl;
-    //            runTime.TimePaths::caseName() = baseRunTime.caseName();
+    //            runTime.caseName() = baseRunTime.caseName();
     //
     //            forAll(cellSets, i)
     //            {
@@ -1346,7 +1344,7 @@ autoPtr<mapDistributePolyMesh> redistributeAndWrite
     //
     //            // Now we've written all. Reset caseName on master
     //            Info<< "Restoring caseName to " << proc0CaseName << endl;
-    //            runTime.TimePaths::caseName() = proc0CaseName;
+    //            runTime.caseName() = proc0CaseName;
     //        }
     //    }
     //    else
@@ -2931,7 +2929,7 @@ int main(int argc, char *argv[])
                 {
                     Info<< "Setting caseName to " << baseRunTime.caseName()
                         << " to find undecomposed mesh" << endl;
-                    runTime.TimePaths::caseName() = baseRunTime.caseName();
+                    runTime.caseName() = baseRunTime.caseName();
                 }
 
                 masterInstDir = runTime.findInstance
@@ -2944,7 +2942,7 @@ int main(int argc, char *argv[])
                 if (decompose)
                 {
                     Info<< "Restoring caseName to " << proc0CaseName << endl;
-                    runTime.TimePaths::caseName() = proc0CaseName;
+                    runTime.caseName() = proc0CaseName;
                 }
             }
             Pstream::scatter(masterInstDir);
@@ -2970,7 +2968,7 @@ int main(int argc, char *argv[])
             {
                 Info<< "Setting caseName to " << baseRunTime.caseName()
                     << " to read undecomposed mesh" << endl;
-                runTime.TimePaths::caseName() = baseRunTime.caseName();
+                runTime.caseName() = baseRunTime.caseName();
             }
 
             autoPtr<fvMesh> meshPtr = loadOrCreateMesh
@@ -2987,7 +2985,7 @@ int main(int argc, char *argv[])
             if (Pstream::master() && decompose)
             {
                 Info<< "Restoring caseName to " << proc0CaseName << endl;
-                runTime.TimePaths::caseName() = proc0CaseName;
+                runTime.caseName() = proc0CaseName;
             }
 
             fvMesh& mesh = meshPtr();
@@ -3046,7 +3044,7 @@ int main(int argc, char *argv[])
             // Detect lagrangian fields
             if (Pstream::master() && decompose)
             {
-                runTime.TimePaths::caseName() = baseRunTime.caseName();
+                runTime.caseName() = baseRunTime.caseName();
             }
             parLagrangianRedistributor::findClouds
             (
@@ -3069,7 +3067,7 @@ int main(int argc, char *argv[])
             );
             if (Pstream::master() && decompose)
             {
-                runTime.TimePaths::caseName() = proc0CaseName;
+                runTime.caseName() = proc0CaseName;
             }
 
 
diff --git a/src/OpenFOAM/db/Time/TimePaths.C b/src/OpenFOAM/db/Time/TimePaths.C
index 894e2fafc5..78378463ab 100644
--- a/src/OpenFOAM/db/Time/TimePaths.C
+++ b/src/OpenFOAM/db/Time/TimePaths.C
@@ -70,8 +70,8 @@ Foam::TimePaths::TimePaths
 )
 :
     processorCase_(args.parRunControl().parRun()),
+    distributed_(args.parRunControl().distributed()),
     rootPath_(args.rootPath()),
-    distributed_(args.distributed()),
     globalCaseName_(args.globalCaseName()),
     case_(args.caseName()),
     system_(systemName),
@@ -93,8 +93,8 @@ Foam::TimePaths::TimePaths
 )
 :
     processorCase_(false),
-    rootPath_(rootPath),
     distributed_(false),
+    rootPath_(rootPath),
     globalCaseName_(caseName),
     case_(caseName),
     system_(systemName),
@@ -117,8 +117,8 @@ Foam::TimePaths::TimePaths
 )
 :
     processorCase_(processorCase),
-    rootPath_(rootPath),
     distributed_(distributed),
+    rootPath_(rootPath),
     globalCaseName_(globalCaseName),
     case_(caseName),
     system_(systemName),
diff --git a/src/OpenFOAM/db/Time/TimePaths.H b/src/OpenFOAM/db/Time/TimePaths.H
index c5067b9227..55b6901d24 100644
--- a/src/OpenFOAM/db/Time/TimePaths.H
+++ b/src/OpenFOAM/db/Time/TimePaths.H
@@ -56,8 +56,9 @@ class TimePaths
     // Private data
 
         bool processorCase_;
-        const fileName rootPath_;
         bool distributed_;
+
+        const fileName rootPath_;
         fileName globalCaseName_;
         fileName case_;
         const word system_;
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 92ac5235d4..467002727e 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -774,8 +774,7 @@ Foam::argList::argList
 )
 :
     args_(argc),
-    options_(argc),
-    distributed_(false)
+    options_(argc)
 {
     // Check for -fileHandler, which requires an argument.
     word handlerType(getEnv("FOAM_FILEHANDLER"));
@@ -1150,7 +1149,7 @@ void Foam::argList::parse
             label dictNProcs = -1;
             if (this->readListIfPresent("roots", roots))
             {
-                distributed_ = true;
+                parRunControl_.distributed(true);
                 source = "-roots";
                 if (roots.size() != 1)
                 {
@@ -1222,7 +1221,7 @@ void Foam::argList::parse
 
                 if (decompDict.lookupOrDefault("distributed", false))
                 {
-                    distributed_ = true;
+                    parRunControl_.distributed(true);
                     decompDict.readEntry("roots", roots);
                 }
             }
@@ -1350,12 +1349,16 @@ void Foam::argList::parse
         else
         {
             // Collect the master's argument list
+            label nroots;
+
             IPstream fromMaster
             (
                 Pstream::commsTypes::scheduled,
                 Pstream::masterNo()
             );
-            fromMaster >> args_ >> options_ >> distributed_;
+            fromMaster >> args_ >> options_ >> nroots;
+
+            parRunControl_.distributed(nroots);
 
             // Establish rootPath_/globalCase_/case_ for slave
             setCasePaths();
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index d55219e785..aba5043d51 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -129,7 +129,7 @@ class argList
         static bool checkProcessorDirectories_;
 
         //- Switch on/off parallel mode.
-        //  Must be first to be constructed so destructor is done last.
+        //  Construct first so destructor is done last.
         ParRunControl parRunControl_;
 
         //- The arguments after removing known options
@@ -140,7 +140,6 @@ class argList
 
         word executable_;
         fileName rootPath_;
-        bool distributed_;
         fileName globalCase_;
         fileName case_;
 
@@ -288,19 +287,12 @@ public:
         //- Return root path
         inline const fileName& rootPath() const;
 
-        //- Return distributed flag
-        //- (i.e. are rootPaths different on different machines)
-        inline bool distributed() const;
-
         //- Return case name (parallel run) or global case (serial run)
         inline const fileName& caseName() const;
 
         //- Return global case name
         inline const fileName& globalCaseName() const;
 
-        //- Return parRunControl
-        inline const ParRunControl& parRunControl() const;
-
         //- Return the full path to the (processor local) case
         //  \note This is guaranteed to be an absolute path
         inline fileName path() const;
@@ -309,6 +301,13 @@ public:
         //  \note This is guaranteed to be an absolute path
         inline fileName globalPath() const;
 
+        //- Return distributed flag
+        //- (i.e. are rootPaths different on different machines)
+        inline bool distributed() const;
+
+        //- Return the ParRunControl
+        inline const ParRunControl& parRunControl() const;
+
         //- Return the number of arguments
         inline label size() const;
 
diff --git a/src/OpenFOAM/global/argList/argListI.H b/src/OpenFOAM/global/argList/argListI.H
index 2848add507..81e8a6443c 100644
--- a/src/OpenFOAM/global/argList/argListI.H
+++ b/src/OpenFOAM/global/argList/argListI.H
@@ -63,12 +63,6 @@ inline const Foam::fileName& Foam::argList::rootPath() const
 }
 
 
-inline bool Foam::argList::distributed() const
-{
-    return distributed_;
-}
-
-
 inline const Foam::fileName& Foam::argList::caseName() const
 {
     return case_;
@@ -81,12 +75,6 @@ inline const Foam::fileName& Foam::argList::globalCaseName() const
 }
 
 
-inline const Foam::ParRunControl& Foam::argList::parRunControl() const
-{
-    return parRunControl_;
-}
-
-
 inline Foam::fileName Foam::argList::path() const
 {
     return rootPath()/caseName();
@@ -99,6 +87,18 @@ inline Foam::fileName Foam::argList::globalPath() const
 }
 
 
+inline bool Foam::argList::distributed() const
+{
+    return parRunControl_.distributed();
+}
+
+
+inline const Foam::ParRunControl& Foam::argList::parRunControl() const
+{
+    return parRunControl_;
+}
+
+
 inline Foam::label Foam::argList::size() const
 {
     return args_.size();
diff --git a/src/OpenFOAM/global/argList/parRun.H b/src/OpenFOAM/global/argList/parRun.H
index 3c21a6ad0c..d2b4dc5db6 100644
--- a/src/OpenFOAM/global/argList/parRun.H
+++ b/src/OpenFOAM/global/argList/parRun.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,18 +49,22 @@ namespace Foam
 
 class ParRunControl
 {
-    bool RunPar;
+    bool parallel_;
+    bool distributed_;
 
 public:
 
+    //- Construct null
     ParRunControl()
     :
-        RunPar(false)
+        parallel_(false),
+        distributed_(false)
     {}
 
+    //- Destructor, triggers Pstream::exit
     ~ParRunControl()
     {
-        if (RunPar)
+        if (parallel_)
         {
             Info<< "Finalising parallel run" << endl;
         }
@@ -69,10 +73,11 @@ public:
         Pstream::exit(0);
     }
 
+
     //- Initialize Pstream for a parallel run
-    void runPar(int& argc, char**& argv, const bool needsThread)
+    void runPar(int& argc, char**& argv, bool needsThread)
     {
-        RunPar = true;
+        parallel_ = true;
 
         if (!Pstream::init(argc, argv, needsThread))
         {
@@ -81,11 +86,22 @@ public:
         }
     }
 
-
-    //- Is this a parallel run?
+    //- True if this is parallel run.
     bool parRun() const
     {
-        return RunPar;
+        return parallel_;
+    }
+
+    //- True if this is a parallel run and uses distributed roots.
+    bool distributed() const
+    {
+        return parallel_ && distributed_;
+    }
+
+    //- Set use of distributed roots.
+    void distributed(bool on)
+    {
+        distributed_ = (parallel_ ? on : false);
     }
 };
 

From c4542294a86c11cd959fe67f7c6f33faf68aa6f7 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 11 Oct 2018 10:07:11 +0200
Subject: [PATCH 18/43] ENH: more stringent checks for fileName concatenation

- avoids some doubled slashes

STYLE: simplify concatenation of processor directory names
---
 .../extrude/extrudeMesh/extrudeMesh.C         |  3 +--
 .../decomposePar/decomposePar.C               |  8 +++----
 .../decomposePar/domainDecomposition.C        |  2 +-
 .../decomposePar/faMeshDecomposition.C        |  9 ++++----
 .../reconstructPar/reconstructPar.C           |  2 +-
 .../reconstructParMesh/reconstructParMesh.C   |  4 ++--
 .../profilingSummary/profilingSummary.C       |  4 ++--
 .../preProcessing/mapFields/mapFields.C       |  9 ++++----
 src/OpenFOAM/global/argList/argList.C         |  2 +-
 .../masterUncollatedFileOperation.C           |  3 +--
 .../primitives/strings/fileName/fileName.C    | 23 ++++++++++++++-----
 11 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 26b33a8605..1529ce7822 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -358,8 +358,7 @@ int main(int argc, char *argv[])
         if (Pstream::parRun())
         {
             sourceCaseDir =
-                sourceCaseDir
-               /"processor" + Foam::name(Pstream::myProcNo());
+                sourceCaseDir/("processor" + Foam::name(Pstream::myProcNo()));
         }
         wordList sourcePatches;
         dict.readEntry("sourcePatches", sourcePatches);
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index e061325c84..d7354e91ac 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -589,7 +589,7 @@ int main(int argc, char *argv[])
                 (
                     Time::controlDictName,
                     args.rootPath(),
-                    args.caseName()/fileName(word("processor") + name(proci))
+                    args.caseName()/("processor" + Foam::name(proci))
                 );
                 processorDb.setTime(runTime);
 
@@ -1016,7 +1016,7 @@ int main(int argc, char *argv[])
                                 Time::controlDictName,
                                 args.rootPath(),
                                 args.caseName()
-                               /fileName(word("processor") + name(proci))
+                              / ("processor" + Foam::name(proci))
                             )
                         );
                     }
@@ -1374,8 +1374,8 @@ int main(int argc, char *argv[])
                         (
                             Time::controlDictName,
                             args.rootPath(),
-                            args.caseName()/
-                            fileName(word("processor") + name(procI))
+                            args.caseName()
+                          / ("processor" + Foam::name(procI))
                         );
 
                         processorDb.setTime(runTime);
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
index 3576fd3404..1d34f53a5a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
@@ -305,7 +305,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
 
         fileName processorCasePath
         (
-            time().caseName()/fileName(word("processor") + Foam::name(proci))
+            time().caseName()/("processor" + Foam::name(proci))
         );
 
         // create a database
diff --git a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
index a1296bd86e..bcefd8c7c9 100644
--- a/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
+++ b/applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
@@ -50,7 +50,7 @@ void Foam::faMeshDecomposition::distributeFaces()
         (
             Time::controlDictName,
             time().rootPath(),
-            time().caseName()/fileName(word("processor") + Foam::name(procI))
+            time().caseName()/("processor" + Foam::name(procI))
         );
 
         fvMesh procMesh
@@ -250,7 +250,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
         (
             Time::controlDictName,
             time().rootPath(),
-            time().caseName()/fileName(word("processor") + Foam::name(procI))
+            time().caseName()/("processor" + Foam::name(procI))
         );
 
         fvMesh procFvMesh
@@ -1059,8 +1059,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
     {
         fileName processorCasePath
         (
-            time().caseName()/fileName(word("processor")
-          + Foam::name(procI))
+            time().caseName()/("processor" + Foam::name(procI))
         );
 
         // create a database
@@ -1179,7 +1178,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
 
         fileName processorCasePath
         (
-            time().caseName()/fileName(word("processor") + Foam::name(procI))
+            time().caseName()/("processor" + Foam::name(procI))
         );
 
         // create a database
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index 37e179440d..6429453e7b 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
             (
                 Time::controlDictName,
                 args.rootPath(),
-                args.caseName()/fileName(word("processor") + name(proci))
+                args.caseName()/("processor" + Foam::name(proci))
             )
         );
     }
diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
index 5236940d40..8bc73b9040 100644
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@@ -550,7 +550,7 @@ int main(int argc, char *argv[])
     forAll(databases, proci)
     {
         Info<< "Reading database "
-            << args.caseName()/fileName(word("processor") + name(proci))
+            << args.caseName()/("processor" + Foam::name(proci))
             << endl;
 
         databases.set
@@ -560,7 +560,7 @@ int main(int argc, char *argv[])
             (
                 Time::controlDictName,
                 args.rootPath(),
-                args.caseName()/fileName(word("processor") + name(proci))
+                args.caseName()/("processor" + Foam::name(proci))
             )
         );
     }
diff --git a/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C b/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
index 877bdf3de5..920ba165a5 100644
--- a/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
+++ b/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
     const label nProcs = fileHandler().nProcs(args.path());
     #else
     label nProcs = 0;
-    while (isDir(args.path()/(word("processor") + name(nProcs))))
+    while (isDir(args.path()/("processor" + Foam::name(nProcs))))
     {
         ++nProcs;
     }
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
             (
                 Time::controlDictName,
                 args.rootPath(),
-                args.caseName()/fileName(word("processor") + name(proci))
+                args.caseName()/("processor" + Foam::name(proci))
             )
         );
     }
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index d6fe357854..649e908d6a 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -396,7 +396,7 @@ int main(int argc, char *argv[])
             (
                 Time::controlDictName,
                 rootDirSource,
-                caseDirSource/fileName(word("processor") + name(proci))
+                caseDirSource/("processor" + Foam::name(proci))
             );
 
             #include "setTimeIndex.H"
@@ -471,7 +471,7 @@ int main(int argc, char *argv[])
             (
                 Time::controlDictName,
                 rootDirTarget,
-                caseDirTarget/fileName(word("processor") + name(proci))
+                caseDirTarget/("processor" + Foam::name(proci))
             );
 
             fvMesh meshTarget
@@ -536,7 +536,7 @@ int main(int argc, char *argv[])
             (
                 Time::controlDictName,
                 rootDirSource,
-                caseDirSource/fileName(word("processor") + name(procISource))
+                caseDirSource/("processor" + Foam::name(procISource))
             );
 
             #include "setTimeIndex.H"
@@ -572,8 +572,7 @@ int main(int argc, char *argv[])
                     (
                         Time::controlDictName,
                         rootDirTarget,
-                        caseDirTarget/fileName(word("processor")
-                      + name(procITarget))
+                        caseDirTarget/("processor" + Foam::name(procITarget))
                     );
 
                     fvMesh meshTarget
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 467002727e..b2f0d979cc 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -1317,7 +1317,7 @@ void Foam::argList::parse
                         isDir
                         (
                             rootPath_/globalCase_
-                          / "processor" + Foam::name(++nProcDirs)
+                          / ("processor" + Foam::name(++nProcDirs))
                         )
                     )
                     {}
diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 18ff87a6cb..13a28663c5 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -367,8 +367,7 @@ Foam::fileOperations::masterUncollatedFileOperation::localObjectPath
             // Uncollated type, e.g. processor1
             const word procName
             (
-                "processor"
-               +Foam::name(Pstream::myProcNo(Pstream::worldComm))
+                "processor" + Foam::name(Pstream::myProcNo(Pstream::worldComm))
             );
             return
                 processorsPath
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index 83a6d0b70a..6fda7a5c8f 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -426,13 +426,17 @@ Foam::fileName& Foam::fileName::operator/=(const string& other)
         {
             // Two non-empty strings: can concatenate
 
-            s.append("/");
+            if (s.back() != '/' && other.front() != '/')
+            {
+                s += '/';
+            }
+
             s.append(other);
         }
     }
     else if (other.size())
     {
-        // Or, if the first string is empty
+        // The first string is empty
         s = other;
     }
 
@@ -449,16 +453,23 @@ Foam::fileName Foam::operator/(const string& a, const string& b)
         if (b.size())
         {
             // Two non-empty strings: can concatenate
-            return fileName(a + '/' + b);
+
+            if (a.back() == '/' || b.front() == '/')
+            {
+                return fileName(a + b);
+            }
+            else
+            {
+                return fileName(a + '/' + b);
+            }
         }
 
-        return a;
+        return a;  // The second string was empty
     }
 
-    // Or, if the first string is empty
-
     if (b.size())
     {
+        // The first string is empty
         return b;
     }
 

From 990d00d40d2e850c8a9652daf9dcedca59039da9 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 Oct 2018 09:09:36 +0200
Subject: [PATCH 19/43] ENH: additional boolToken token type

- not used by the ISstream parser, but suitable for other parsing
  methods where true/false concept should be distinguishable from
  integer values.

  Only constructed via the token::boolean() static method, not
  directly assignable.
  This avoids any potential ambiguities with label.
---
 src/OpenFOAM/db/IOstreams/token/token.H   | 39 ++++++++----
 src/OpenFOAM/db/IOstreams/token/tokenI.H  | 72 +++++++++++++++++++----
 src/OpenFOAM/db/IOstreams/token/tokenIO.C | 14 ++++-
 3 files changed, 97 insertions(+), 28 deletions(-)

diff --git a/src/OpenFOAM/db/IOstreams/token/token.H b/src/OpenFOAM/db/IOstreams/token/token.H
index 48d5cde872..eb2b19a1d0 100644
--- a/src/OpenFOAM/db/IOstreams/token/token.H
+++ b/src/OpenFOAM/db/IOstreams/token/token.H
@@ -79,6 +79,7 @@ public:
         UNDEFINED = 0,    //!< An undefined token-type
 
         // Fundamental types
+        BOOL,             //!< boolean type
         FLAG,             //!< stream flag (1-byte bitmask)
         PUNCTUATION,      //!< single character punctuation
         LABEL,            //!< label (integer) type
@@ -92,7 +93,7 @@ public:
                           //!< dictionary \c $variable expansion
         VERBATIMSTRING,   //!< Contents are a Foam::string representing verbatim
                           //!< content
-        COMPOUND,         //!< Compound type such as List\<label\> etc.
+        COMPOUND,         //!< Compound type such as \c List\<label\> etc.
 
         ERROR             //!< A token error encountered
     };
@@ -115,20 +116,22 @@ public:
         TAB            = '\t',
         NL             = '\n',
 
-        END_STATEMENT  = ';', //!< End entry [#isseparator]
-        BEGIN_LIST     = '(', //!< Begin list [#isseparator]
-        END_LIST       = ')', //!< End list [#isseparator]
-        BEGIN_SQR      = '[', //!< Begin dimensions [#isseparator]
-        END_SQR        = ']', //!< End dimensions [#isseparator]
-        BEGIN_BLOCK    = '{', //!< Begin block [#isseparator]
-        END_BLOCK      = '}', //!< End block [#isseparator]
-        COLON          = ':', //!< Colon [#isseparator]
-        COMMA          = ',', //!< Comma [#isseparator]
+        END_STATEMENT  = ';',   //!< End entry [#isseparator]
+        BEGIN_LIST     = '(',   //!< Begin list [#isseparator]
+        END_LIST       = ')',   //!< End list [#isseparator]
+        BEGIN_SQR      = '[',   //!< Begin dimensions [#isseparator]
+        END_SQR        = ']',   //!< End dimensions [#isseparator]
+        BEGIN_BLOCK    = '{',   //!< Begin block [#isseparator]
+        END_BLOCK      = '}',   //!< End block [#isseparator]
+        COLON          = ':',   //!< Colon [#isseparator]
+        COMMA          = ',',   //!< Comma [#isseparator]
         HASH           = '#',
         ATSYM          = '@',
+        SQUOTE         = '\'',  //!< Single quote
+        DQUOTE         = '"',   //!< Double quote
 
-        BEGIN_STRING   = '"',
-        END_STRING     = BEGIN_STRING,
+        BEGIN_STRING   = DQUOTE, //!< Double quote for begin string
+        END_STRING     = DQUOTE, //!< Double quote for end string
 
         ASSIGN         = '=', //!< Assignment/equals [#isseparator]
         ADD            = '+', //!< Addition [#isseparator]
@@ -358,6 +361,9 @@ public:
 
     // Static Member Functions
 
+        //- Create a bool token.
+        inline static token boolean(bool on);
+
         //- Create a token with stream flags, no sanity check
         //
         //  \param bitmask the flags to set
@@ -406,6 +412,9 @@ public:
         //- True if token is ERROR
         inline bool error() const;
 
+        //- True if token is BOOL
+        inline bool isBool() const;
+
         //- True if token is FLAG
         inline bool isFlag() const;
 
@@ -445,7 +454,11 @@ public:
 
     // Access
 
-        //- Return flag bitmask
+        //- Return boolean token value.
+        //  Report FatalIOError and return false if token is not BOOL
+        inline bool boolToken() const;
+
+        //- Return flag bitmask value.
         //  Report FatalIOError and return NO_FLAG if token is not FLAG
         inline int flagToken() const;
 
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenI.H b/src/OpenFOAM/db/IOstreams/token/tokenI.H
index da3f0abcdf..6c37a3c7b1 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenI.H
+++ b/src/OpenFOAM/db/IOstreams/token/tokenI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,16 @@ License
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
+inline Foam::token Foam::token::boolean(bool on)
+{
+    token tok;
+    tok.type_ = tokenType::BOOL;
+    tok.data_.labelVal = on;
+
+    return tok;
+}
+
+
 inline Foam::token Foam::token::flag(int bitmask)
 {
     token tok;
@@ -306,6 +316,23 @@ inline bool Foam::token::setType(token::tokenType variant)
 
     switch (variant)
     {
+        case tokenType::BOOL:
+        case tokenType::LABEL:
+        {
+            switch (type_)
+            {
+                case tokenType::BOOL:
+                case tokenType::LABEL:
+                    type_ = variant;
+                    return true;
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        break;
+
         case tokenType::STRING:
         case tokenType::VARIABLE:
         case tokenType::VERBATIMSTRING:
@@ -321,10 +348,10 @@ inline bool Foam::token::setType(token::tokenType variant)
                     break;
 
                 default:
-                    return false;
                     break;
             }
         }
+        break;
 
         default:
             break;
@@ -364,6 +391,24 @@ inline bool Foam::token::error() const
 }
 
 
+inline bool Foam::token::isBool() const
+{
+    return (type_ == tokenType::BOOL);
+}
+
+
+inline bool Foam::token::boolToken() const
+{
+    if (type_ == tokenType::BOOL)
+    {
+        return data_.labelVal;
+    }
+
+    parseError("bool");
+    return false;
+}
+
+
 inline bool Foam::token::isFlag() const
 {
     return (type_ == tokenType::FLAG);
@@ -423,7 +468,7 @@ inline Foam::label Foam::token::labelToken() const
         return data_.labelVal;
     }
 
-    parseError(pTraits<label>::typeName);
+    parseError("label");
     return 0;
 }
 
@@ -441,8 +486,8 @@ inline Foam::floatScalar Foam::token::floatScalarToken() const
         return data_.floatVal;
     }
 
-    parseError("floatScalar");
-    return 0.0;
+    parseError("float");
+    return 0;
 }
 
 
@@ -459,8 +504,8 @@ inline Foam::doubleScalar Foam::token::doubleScalarToken() const
         return data_.doubleVal;
     }
 
-    parseError("doubleScalar");
-    return 0.0;
+    parseError("double");
+    return 0;
 }
 
 
@@ -485,8 +530,8 @@ inline Foam::scalar Foam::token::scalarToken() const
         return data_.doubleVal;
     }
 
-    parseError(pTraits<scalar>::typeName);
-    return 0.0;
+    parseError("scalar");
+    return 0;
 }
 
 
@@ -508,7 +553,7 @@ inline Foam::scalar Foam::token::number() const
     }
 
     parseError("number (label or scalar)");
-    return 0.0;
+    return 0;
 }
 
 
@@ -525,7 +570,7 @@ inline const Foam::word& Foam::token::wordToken() const
         return *data_.wordPtr;
     }
 
-    parseError(word::typeName);
+    parseError("word");
     return word::null;
 }
 
@@ -559,7 +604,7 @@ inline const Foam::string& Foam::token::stringToken() const
         return *data_.stringPtr;
     }
 
-    parseError(string::typeName);
+    parseError("string");
     return string::null;
 }
 
@@ -742,6 +787,9 @@ inline bool Foam::token::operator==(const token& tok) const
         case tokenType::UNDEFINED:
             return true;
 
+        case tokenType::BOOL:
+            return data_.labelVal == tok.data_.labelVal;
+
         case tokenType::FLAG:
             return data_.flagVal == tok.data_.flagVal;
 
diff --git a/src/OpenFOAM/db/IOstreams/token/tokenIO.C b/src/OpenFOAM/db/IOstreams/token/tokenIO.C
index cbd4af1ac1..4a1c28668f 100644
--- a/src/OpenFOAM/db/IOstreams/token/tokenIO.C
+++ b/src/OpenFOAM/db/IOstreams/token/tokenIO.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,6 +43,10 @@ static OS& printTokenInfo(OS& os, const token& tok)
             os  << "undefined token";
         break;
 
+        case token::tokenType::BOOL:
+            os  << "bool '" << (tok.boolToken() ? "true" : "false") << '\'';
+        break;
+
         case token::tokenType::FLAG:
             os  << "flag '" << int(tok.flagToken()) << '\'';
         break;
@@ -121,6 +125,7 @@ Foam::word Foam::token::name() const
     switch (type_)
     {
         case token::tokenType::UNDEFINED: return "undefined";
+        case token::tokenType::BOOL: return "bool";
         case token::tokenType::FLAG: return "flag";
         case token::tokenType::PUNCTUATION: return "punctuation";
         case token::tokenType::LABEL: return "label";
@@ -160,6 +165,10 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const token& tok)
                 << "Undefined token" << endl;
         break;
 
+        case token::tokenType::BOOL:
+            os << tok.data_.labelVal;
+        break;
+
         case token::tokenType::FLAG:
             // Swallow the flag
         break;
@@ -207,8 +216,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const token& tok)
         default:
             os << "UNKNOWN";
             SeriousErrorInFunction
-                << "Unknown token"
-                << endl;
+                << "Unknown token" << endl;
     }
 
     os.check(FUNCTION_NAME);

From 8eddcc072a3d705faa3915cc633da44146ffd48c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 Oct 2018 08:14:47 +0200
Subject: [PATCH 20/43] ENH: avoid readScalar, readLabel etc from dictionary
 (#762, #1033)

- use the dictionary 'get' methods instead of readScalar for
  additional checking

     Unchecked:  readScalar(dict.lookup("key"));
     Checked:    dict.get<scalar>("key");

- In templated classes that also inherit from a dictionary, an additional
  'template' keyword will be required. Eg,

     this->coeffsDict().template get<scalar>("key");

  For this common use case, the predefined getXXX shortcuts may be
  useful. Eg,

     this->coeffsDict().getScalar("key");
---
 .../XiGModels/basicXiSubG/basicXiSubG.C       |  2 +-
 .../XiModels/XiEqModels/Gulder/Gulder.C       |  9 +--
 .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C | 13 ++-
 .../instabilityXiEq/instabilityXiEq.C         |  2 +-
 .../PDRFoam/XiModels/XiGModels/KTS/KTS.C      |  2 +-
 .../PDRFoam/XiModels/algebraic/algebraic.C    |  2 +-
 .../PDRFoam/XiModels/transport/transport.C    |  2 +-
 .../SCOPE/SCOPELaminarFlameSpeed.C            | 31 +++----
 .../combustion/chemFoam/createFields.H        |  4 +-
 .../chemFoam/readInitialConditions.H          |  4 +-
 .../combustion/reactingFoam/setRDeltaT.H      |  4 +-
 .../T/smoluchowskiJumpTFvPatchScalarField.C   |  2 +-
 .../BCs/U/maxwellSlipUFvPatchVectorField.C    |  2 +-
 .../rhoPimpleAdiabaticFoam/EEqn.H             |  4 +-
 .../readmdEquilibrationDict.H                 |  4 +-
 .../solvers/lagrangian/DPMFoam/createFields.H |  5 +-
 .../lagrangian/coalChemistryFoam/setRDeltaT.H |  2 +-
 .../reactingParcelFoam/setRDeltaT.H           |  2 +-
 .../multiphase/MPPICInterFoam/createFields.H  |  5 +-
 .../solvers/multiphase/VoF/alphaCourantNo.H   |  2 +-
 .../cavitatingDyMFoam/createControls.H        |  2 +-
 .../cavitatingFoam/cavitatingDyMFoam/pEqn.H   |  4 +-
 .../cavitatingFoam/createControls.H           |  2 +-
 .../solvers/multiphase/cavitatingFoam/pEqn.H  |  4 +-
 .../multiphaseMixtureThermo.C                 |  4 +-
 .../multiphase/driftFluxFoam/alphaControls.H  |  4 +-
 .../alphaCourantNo.H                          |  2 +-
 .../laserDTRM/laserDTRM.C                     | 14 ++--
 .../FresnelLaser/FresnelLaser.C               |  2 +-
 .../VollerPrakash/VollerPrakash.C             |  4 +-
 .../MultiComponentPhaseModel.C                |  2 +-
 .../multiphaseSystem/multiphaseSystem.C       |  4 +-
 ...newtemperaturePhaseChangeTwoPhaseMixture.C |  5 +-
 .../interFoam/interMixingFoam/alphaControls.H |  4 +-
 .../threePhaseInterfaceProperties.C           |  9 +--
 .../overInterDyMFoam/alphaCourantNo.H         |  2 +-
 .../multiphase/interIsoFoam/alphaControls.H   |  2 +-
 .../multiphase/interIsoFoam/alphaCourantNo.H  |  2 +-
 .../interPhaseChangeFoam/alphaControls.H      |  4 +-
 .../multiphaseSystem/multiphaseSystem.C       |  2 +-
 .../multiphaseMixture/multiphaseMixture.C     |  4 +-
 .../wallLubricationModels/Frank/Frank.C       |  2 +-
 .../multiphaseSystem/multiphaseSystem.C       |  2 +-
 .../KocamustafaogullariIshii.C                |  2 +-
 .../Lavieville/Lavieville.C                   |  2 +-
 .../partitioningModels/cosine/cosine.C        |  4 +-
 .../partitioningModels/linear/linear.C        |  4 +-
 .../phasePressureModel/phasePressureModel.C   |  6 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |  4 +-
 .../twoLiquidMixingFoam/alphaControls.H       |  2 +-
 .../twoLiquidMixingFoam/alphaCourantNo.H      |  2 +-
 .../wallLubricationModels/Frank/Frank.C       |  2 +-
 .../phasePressureModel/phasePressureModel.C   |  6 +-
 .../twoPhaseSystem/twoPhaseSystem.C           |  4 +-
 .../readMechanicalProperties.H                | 12 +--
 .../readThermalProperties.H                   | 12 +--
 .../readSteadyStressFoamControls.H            |  2 +-
 applications/test/Function1/Test-Function1.C  |  4 +-
 .../pendulumAndSpring/pendulumAndSpring.C     |  2 +-
 .../sphericalJoint/sphericalJoint.C           |  2 +-
 .../test/rigidBodyDynamics/spring/spring.C    |  2 +-
 .../conformalVoronoiMeshCalcDualMesh.C        |  2 +-
 .../conformalVoronoiMeshIO.C                  |  2 +-
 etc/codeTemplates/BC/BC.C                     |  2 +-
 src/OpenFOAM/db/dictionary/dictionary.H       | 32 +++++++-
 src/OpenFOAM/global/argList/argList.C         |  2 +-
 .../interpolationLookUpTable.C                | 12 +--
 .../tableReaders/csv/csvTableReader.C         |  6 +-
 .../uniformInterpolationTable.C               |  6 +-
 .../dummyAgglomeration/dummyAgglomeration.C   |  2 +-
 .../procFacesGAMGProcAgglomeration.C          |  2 +-
 src/OpenFOAM/matrices/solution/solution.C     | 20 ++---
 src/OpenFOAM/matrices/tolerances/tolerances.C |  6 +-
 .../constraint/processor/processorPolyPatch.C |  4 +-
 .../polyPatches/polyPatch/polyPatch.C         |  6 +-
 .../primitives/functions/Function1/CSV/CSV.C  | 10 +--
 .../functions/Function1/ramp/ramp.C           |  2 +-
 ...convectiveHeatTransferFvPatchScalarField.C |  2 +-
 ...pedMassWallTemperatureFvPatchScalarField.C |  4 +-
 ...tletMachNumberPressureFvPatchScalarField.C |  2 +-
 ...ppedUniformInletHeatAdditionFvPatchField.C |  2 +-
 ...ayatillekeWallFunctionFvPatchScalarField.C |  2 +-
 .../LES/LESdeltas/smoothDelta/smoothDelta.C   |  5 +-
 .../anisotropicFilter/anisotropicFilter.C     |  2 +-
 .../LESfilters/laplaceFilter/laplaceFilter.C  |  2 +-
 ...thDissipationRateInletFvPatchScalarField.C |  2 +-
 ...ngLengthFrequencyInletFvPatchScalarField.C |  2 +-
 .../porousBafflePressureFvPatchField.C        |  2 +-
 .../nutURoughWallFunctionFvPatchScalarField.C |  6 +-
 .../atmBoundaryLayer/atmBoundaryLayer.C       |  4 +-
 .../kEpsilonLopesdaCosta.C                    |  4 +-
 .../powerLawLopesdaCosta.C                    |  6 +-
 src/combustionModels/FSD/FSD.C                |  4 +-
 .../consumptionSpeed/consumptionSpeed.C       |  8 +-
 .../relaxation/relaxation.C                   |  7 +-
 src/combustionModels/PaSR/PaSR.C              |  2 +-
 src/combustionModels/diffusion/diffusion.C    |  2 +-
 .../eddyDissipationDiffusionModel.C           |  2 +-
 .../eddyDissipationModelBase.C                |  2 +-
 .../infinitelyFastChemistry.C                 |  2 +-
 .../singleStepCombustion.C                    |  2 +-
 src/conversion/ccm/writer/ccmWriterSolution.C |  2 +-
 .../dynamicInkJetFvMesh/dynamicInkJetFvMesh.C |  6 +-
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 24 +++---
 src/dynamicMesh/boundaryPatch/boundaryPatch.C |  4 +-
 .../extrudePatchMesh/extrudePatchMesh.C       |  2 +-
 .../layerAdditionRemoval.C                    |  4 +-
 .../motionSmoother/motionSmootherAlgo.C       | 10 +--
 .../motionSmoother/motionSmootherAlgoCheck.C  | 48 +++++------
 .../perfectInterface/perfectInterface.C       |  2 +-
 .../polyMeshFilter/polyMeshFilterSettings.C   |  4 +-
 src/engine/ignition/ignitionSiteIO.C          | 22 +++--
 src/engine/include/StCorr.H                   | 14 +---
 .../constraint/processor/processorFaPatch.H   |  4 +-
 .../cfdTools/general/SRF/SRFModel/rpm/rpm.C   |  2 +-
 .../general/findRefCell/findRefCell.C         | 12 ++-
 .../cfdTools/general/include/alphaControls.H  |  4 +-
 .../general/pressureControl/pressureControl.C | 26 +++---
 .../solutionControl/solutionControl.C         | 12 +--
 .../activeBaffleVelocityFvPatchVectorField.C  |  8 +-
 ...ureForceBaffleVelocityFvPatchVectorField.C | 12 +--
 .../fixedProfile/fixedProfileFvPatchField.C   |  2 +-
 ...OutletTotalTemperatureFvPatchScalarField.C |  2 +-
 ...utletPhaseMeanVelocityFvPatchVectorField.C |  2 +-
 ...aseHydrostaticPressureFvPatchScalarField.C |  4 +-
 .../plenumPressureFvPatchScalarField.C        | 24 +++---
 ...IDControlInletVelocityFvPatchVectorField.C |  8 +-
 .../supersonicFreestreamFvPatchVectorField.C  |  6 +-
 .../syringePressureFvPatchScalarField.C       | 20 ++---
 .../totalPressureFvPatchScalarField.C         |  2 +-
 .../totalTemperatureFvPatchScalarField.C      |  2 +-
 .../turbulentDFSEMInletFvPatchVectorField.C   |  2 +-
 ...sityKineticEnergyInletFvPatchScalarField.C |  2 +-
 ...ityHydrostaticPressureFvPatchScalarField.C |  4 +-
 .../uniformTotalPressureFvPatchScalarField.C  |  2 +-
 .../variableHeightFlowRateFvPatchField.C      |  4 +-
 .../waveTransmissiveFvPatchField.C            |  2 +-
 .../solvers/MULES/CMULESTemplates.C           |  2 +-
 .../columnFvMesh/columnFvMesh.C               |  8 +-
 .../field/nearWallFields/nearWallFields.C     |  2 +-
 .../field/valueAverage/valueAverage.C         |  2 +-
 .../MGridGenGAMGAgglomeration.C               |  6 +-
 .../pairPatchAgglomeration.C                  |  4 +-
 .../surfaceAlignedSBRStressFvMotionSolver.C   |  2 +-
 ...llatingDisplacementPointPatchVectorField.C |  6 +-
 ...OscillatingVelocityPointPatchVectorField.C |  6 +-
 ...llatingDisplacementPointPatchVectorField.C |  2 +-
 ...oscillatingVelocityPointPatchVectorField.C |  2 +-
 .../waveDisplacementPointPatchVectorField.C   |  2 +-
 .../velocityDampingConstraint.C               |  2 +-
 .../trimModel/targetCoeff/targetCoeffTrim.C   |  8 +-
 .../solidificationMeltingSource.C             |  2 +-
 .../variableHeatTransfer.C                    | 11 +--
 .../clouds/Templates/DSMCCloud/DSMCCloud.C    | 13 ++-
 .../Templates/DSMCParcel/DSMCParcelI.H        | 11 +--
 .../LarsenBorgnakkeVariableHardSphere.C       |  4 +-
 .../VariableHardSphere/VariableHardSphere.C   |  2 +-
 .../FreeStream/FreeStream.C                   |  7 +-
 .../MixedDiffuseSpecular.C                    |  2 +-
 .../COxidationDiffusionLimitedRate.C          |  4 +-
 .../COxidationHurtMitchell.C                  |  2 +-
 .../COxidationIntrinsicRate.C                 | 14 ++--
 .../COxidationKineticDiffusionLimitedRate.C   |  8 +-
 .../COxidationMurphyShaddix.C                 | 16 ++--
 .../RosinRammler/RosinRammler.C               |  8 +-
 .../exponential/exponential.C                 |  6 +-
 .../fixedValue/fixedValue.C                   |  2 +-
 .../massRosinRammler/massRosinRammler.C       |  8 +-
 .../multiNormal/multiNormal.C                 |  4 +-
 .../distributionModels/normal/normal.C        |  8 +-
 .../distributionModels/uniform/uniform.C      |  4 +-
 .../ParticleCollector/ParticleCollector.C     |  7 +-
 .../ParticleErosion/ParticleErosion.C         |  2 +-
 .../ParticleTracks/ParticleTracks.C           |  4 +-
 .../ParticleTrap/ParticleTrap.C               |  2 +-
 .../PatchPostProcessing/PatchPostProcessing.C |  2 +-
 .../PairCollision/PairCollision.C             |  2 +-
 .../PairSpringSliderDashpot.C                 | 12 +--
 .../WallLocalSpringSliderDashpot.C            | 23 +++---
 .../WallSpringSliderDashpot.C                 | 19 ++---
 .../CellZoneInjection/CellZoneInjection.C     |  2 +-
 .../ConeInjection/ConeInjection.C             |  4 +-
 .../ConeNozzleInjection/ConeNozzleInjection.C | 11 +--
 .../FieldActivatedInjection.C                 |  4 +-
 .../InflationInjection/InflationInjection.C   |  4 +-
 .../InjectedParticleDistributionInjection.C   |  8 +-
 .../InjectionModel/InjectionModel.C           |  6 +-
 .../KinematicLookupTableInjection.C           |  9 +--
 .../kinematicParcelInjectionData.C            |  6 +-
 .../PatchFlowRateInjection.C                  |  4 +-
 .../PatchInjection/PatchInjection.C           |  4 +-
 .../Drag/NonSphereDrag/NonSphereDragForce.C   |  2 +-
 .../ParticleForces/Interface/InterfaceForce.C |  2 +-
 .../Lift/TomiyamaLift/TomiyamaLiftForce.C     |  2 +-
 .../Paramagnetic/ParamagneticForce.C          |  2 +-
 .../VirtualMass/VirtualMassForce.C            |  2 +-
 .../MultiInteraction/MultiInteraction.C       |  3 +-
 .../PatchInteractionModel/Rebound/Rebound.C   |  2 +-
 .../absolute/absolute.C                       |  2 +-
 .../relative/relative.C                       |  2 +-
 .../MPPIC/PackingModels/Implicit/Implicit.C   |  4 +-
 .../HarrisCrighton/HarrisCrighton.C           |  6 +-
 .../MPPIC/ParticleStressModels/Lun/Lun.C      |  4 +-
 .../ParticleStressModel/ParticleStressModel.C |  8 +-
 .../exponential/exponential.C                 |  6 +-
 .../TimeScaleModel/TimeScaleModel.C           |  4 +-
 .../ReactingLookupTableInjection.C            |  9 +--
 .../ConstantRateDevolatilisation.C            |  2 +-
 .../SingleKineticRateDevolatilisation.C       |  2 +-
 .../ReactingMultiphaseLookupTableInjection.C  |  9 +--
 .../ThermoLookupTableInjection.C              |  9 +--
 .../thermoParcelInjectionData.C               |  4 +-
 .../correlationFunction/correlationFunction.C | 13 ++-
 .../molecule/moleculeCloud/moleculeCloud.C    | 19 +++--
 .../molecule/reducedUnits/reducedUnits.C      |  6 +-
 .../derived/doubleSigmoid/doubleSigmoid.C     |  8 +-
 .../derived/sigmoid/sigmoid.C                 |  4 +-
 .../pairPotential/basic/pairPotential.C       |  6 +-
 .../pairPotential/derived/azizChen/azizChen.C | 18 ++---
 .../derived/dampedCoulomb/dampedCoulomb.C     |  2 +-
 .../exponentialRepulsion.C                    |  4 +-
 .../derived/lennardJones/lennardJones.C       |  4 +-
 .../derived/maitlandSmith/maitlandSmith.C     |  8 +-
 .../potential/potential/potential.C           |  5 +-
 .../derived/harmonicSpring/harmonicSpring.C   |  2 +-
 .../derived/pitchForkRing/pitchForkRing.C     |  6 +-
 .../restrainedHarmonicSpring.C                |  4 +-
 .../BlobsSheetAtomization.C                   |  4 +-
 .../LISAAtomization/LISAAtomization.C         | 15 ++--
 .../BreakupModel/BreakupModel/BreakupModel.C  |  3 +-
 .../spray/submodels/BreakupModel/SHF/SHF.C    | 58 ++++++-------
 .../TrajectoryCollision/TrajectoryCollision.C |  4 +-
 .../BrownianMotion/BrownianMotionForce.C      |  4 +-
 .../extrudeModel/linearNormal/linearNormal.C  |  2 +-
 .../extrudeModel/linearRadial/linearRadial.C  |  2 +-
 src/mesh/extrudeModel/sector/sector.C         |  2 +-
 .../extrudeModel/sigmaRadial/sigmaRadial.C    |  6 +-
 .../displacementMotionSolverMeshMover.C       | 10 +--
 .../medialAxisMeshMover.C                     | 35 ++++----
 .../meshRefinementProblemCells.C              | 10 +--
 .../refinementFeatures/refinementFeatures.C   |  4 +-
 .../refinementSurfaces/refinementSurfaces.C   |  5 +-
 .../layerParameters/layerParameters.C         | 22 ++---
 .../refinementParameters.C                    | 12 +--
 .../snapParameters/snapParameters.C           |  8 +-
 .../surfaceFeatures/surfaceFeatures.C         |  8 +-
 .../decompositionMethod/decompositionMethod.C |  2 +-
 .../distributedTriSurfaceMesh.C               |  2 +-
 ...sRadiativeCoupledMixedFvPatchScalarField.C |  4 +-
 .../kinematicSingleLayer.C                    |  4 +-
 .../liquidFilmThermo/liquidFilmThermo.C       |  2 +-
 .../filmTurbulenceModel/laminar/laminar.C     |  2 +-
 .../contactAngleForce/contactAngleForce.C     |  4 +-
 .../drippingInjection/drippingInjection.C     |  4 +-
 .../constantRadiation/constantRadiation.C     |  6 +-
 .../standardRadiation/standardRadiation.C     |  4 +-
 .../constantHeatTransfer.C                    |  2 +-
 .../solidification/solidification.C           |  2 +-
 .../standardPhaseChange/standardPhaseChange.C |  4 +-
 .../waxSolventEvaporation.C                   |  8 +-
 .../thermoSingleLayer/thermoSingleLayer.C     |  4 +-
 .../thermalBaffleFvPatchScalarField.C         | 27 +++----
 .../thermalBaffle/thermalBaffle.C             |  4 +-
 .../springRenumber/springRenumber.C           |  6 +-
 src/rigidBodyDynamics/bodies/cuboid/cuboidI.H |  6 +-
 src/rigidBodyDynamics/bodies/sphere/sphereI.H |  6 +-
 .../rigidBodyInertia/rigidBodyInertiaI.H      |  2 +-
 .../rigidBodyMeshMotion/rigidBodyMeshMotion.C |  8 +-
 .../rigidBodyMeshMotionSolver.C               |  4 +-
 ...gidBodyDisplacementPointPatchVectorField.C |  2 +-
 .../sixDoFRigidBodyMotion.C                   |  2 +-
 .../sixDoFRigidBodyMotionSolver.C             |  6 +-
 .../TDACChemistryModel/reduction/DAC/DAC.C    |  2 +-
 .../TDACChemistryModel/tabulation/ISAT/ISAT.C | 17 ++--
 .../tabulation/ISAT/binaryTree/binaryTree.C   |  2 +-
 .../basicChemistryModel/basicChemistryModel.C |  2 +-
 .../EulerImplicit/EulerImplicit.C             |  2 +-
 .../laminarFlameSpeed/Gulders/Gulders.C       | 12 +--
 .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 12 +--
 .../RaviPetersen/RaviPetersen.C               |  2 +-
 .../radiationModels/fvDOM/fvDOM/fvDOM.C       |  8 +-
 .../radiationModels/viewFactor/viewFactor.C   |  5 +-
 .../greyMeanAbsorptionEmission.C              |  2 +-
 .../boundaryRadiationPropertiesPatch.C        | 81 ++++++-------------
 .../solarCalculator/solarCalculator.C         | 19 ++---
 .../mixtureFractionSoot/mixtureFractionSoot.C |  4 +-
 .../constantTransmissivity.C                  |  2 +-
 .../solidArrheniusReactionRateI.H             |  6 +-
 .../const/constAnIsoSolidTransport.C          |  2 +-
 .../transport/const/constIsoSolidTransport.C  |  2 +-
 .../exponential/exponentialSolidTransport.C   |  6 +-
 .../equationOfState/Boussinesq/Boussinesq.C   |  6 +-
 .../PengRobinsonGas/PengRobinsonGas.C         |  8 +-
 .../adiabaticPerfectFluid.C                   |  8 +-
 .../incompressiblePerfectGas.C                |  2 +-
 .../specie/equationOfState/linear/linear.C    |  4 +-
 .../perfectFluid/perfectFluid.C               |  4 +-
 .../equationOfState/rhoConst/rhoConst.C       |  2 +-
 .../ArrheniusReactionRateI.H                  |  6 +-
 .../JanevReactionRate/JanevReactionRateI.H    |  6 +-
 .../LandauTellerReactionRateI.H               | 10 +--
 .../SRIFallOffFunction/SRIFallOffFunctionI.H  | 10 +--
 .../TroeFallOffFunctionI.H                    |  8 +-
 .../powerSeries/powerSeriesReactionRateI.H    |  6 +-
 .../thirdBodyEfficienciesI.H                  |  2 +-
 .../specie/specie/specie.C                    |  2 +-
 .../specie/thermo/eConst/eConstThermo.C       |  4 +-
 .../specie/thermo/hConst/hConstThermo.C       |  4 +-
 .../thermo/hPolynomial/hPolynomialThermo.C    |  4 +-
 .../specie/thermo/hPower/hPowerThermo.C       |  8 +-
 .../specie/thermo/hRefConst/hRefConstThermo.C |  8 +-
 .../specie/thermo/janaf/janafThermo.C         |  6 +-
 .../specie/transport/const/constTransport.C   |  4 +-
 .../sutherland/sutherlandTransport.C          |  2 +-
 .../liquidProperties/liquidProperties.C       | 20 ++---
 .../solidProperties/solidProperties.C         | 18 ++---
 .../solidProperties/solidProperties.H         |  5 +-
 .../APIdiffCoefFunc/APIdiffCoefFunc.C         |  8 +-
 .../NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C    | 12 +--
 .../NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C    | 10 +--
 .../NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C  | 10 +--
 .../NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C    |  8 +-
 .../NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C    |  8 +-
 .../NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C    | 10 +--
 .../NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C    |  8 +-
 .../NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C    | 12 +--
 .../NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C    | 10 +--
 .../thermophysicalProperties.C                |  2 +-
 ...emperatureCoupledMixedFvPatchScalarField.C |  6 +-
 .../linearValveLayersFvMesh.C                 | 10 +--
 .../movingConeTopoFvMesh.C                    | 28 ++-----
 .../irregularWaveModel/irregularWaveModel.C   |  2 +-
 .../base/regularWaveModel/regularWaveModel.C  |  3 +-
 .../waveGenerationModel/waveGenerationModel.C |  2 +-
 src/waveModels/waveModel/waveModel.C          |  2 +-
 335 files changed, 1007 insertions(+), 1127 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
index 04d3b6a5a4..3da7d1af93 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C
@@ -49,7 +49,7 @@ Foam::XiGModels::basicSubGrid::basicSubGrid
 )
 :
     XiGModel(XiGProperties, thermo, turbulence, Su),
-    k1(readScalar(XiGModelCoeffs_.lookup("k1"))),
+    k1(XiGModelCoeffs_.get<scalar>("k1")),
     XiGModel_(XiGModel::New(XiGModelCoeffs_, thermo, turbulence, Su))
 {}
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
index acbe023e0c..56ff3ed5ef 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C
@@ -49,13 +49,10 @@ Foam::XiEqModels::Gulder::Gulder
 )
 :
     XiEqModel(XiEqProperties, thermo, turbulence, Su),
-    XiEqCoef_(readScalar(XiEqModelCoeffs_.lookup("XiEqCoef"))),
+    XiEqCoef_(XiEqModelCoeffs_.get<scalar>("XiEqCoef")),
     SuMin_(0.01*Su.average()),
-    uPrimeCoef_(readScalar(XiEqModelCoeffs_.lookup("uPrimeCoef"))),
-    subGridSchelkin_
-    (
-        readBool(XiEqModelCoeffs_.lookup("subGridSchelkin"))
-    )
+    uPrimeCoef_(XiEqModelCoeffs_.get<scalar>("uPrimeCoef")),
+    subGridSchelkin_(XiEqModelCoeffs_.get<bool>("subGridSchelkin"))
 {}
 
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
index 59758b889e..47e03c65ec 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
@@ -49,15 +49,12 @@ Foam::XiEqModels::SCOPEXiEq::SCOPEXiEq
 )
 :
     XiEqModel(XiEqProperties, thermo, turbulence, Su),
-    XiEqCoef_(readScalar(XiEqModelCoeffs_.lookup("XiEqCoef"))),
-    XiEqExp_(readScalar(XiEqModelCoeffs_.lookup("XiEqExp"))),
-    lCoef_(readScalar(XiEqModelCoeffs_.lookup("lCoef"))),
+    XiEqCoef_(XiEqModelCoeffs_.get<scalar>("XiEqCoef")),
+    XiEqExp_(XiEqModelCoeffs_.get<scalar>("XiEqExp")),
+    lCoef_(XiEqModelCoeffs_.get<scalar>("lCoef")),
     SuMin_(0.01*Su.average()),
-    uPrimeCoef_(readScalar(XiEqModelCoeffs_.lookup("uPrimeCoef"))),
-    subGridSchelkin_
-    (
-        readBool(XiEqModelCoeffs_.lookup("subGridSchelkin"))
-    ),
+    uPrimeCoef_(XiEqModelCoeffs_.get<scalar>("uPrimeCoef")),
+    subGridSchelkin_(XiEqModelCoeffs_.get<bool>("subGridSchelkin")),
     MaModel
     (
         Su.mesh().lookupObject<IOdictionary>("combustionProperties"),
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
index 39651e983c..15ee61375c 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.C
@@ -49,7 +49,7 @@ Foam::XiEqModels::instability::instability
 )
 :
     XiEqModel(XiEqProperties, thermo, turbulence, Su),
-    XiEqIn(readScalar(XiEqModelCoeffs_.lookup("XiEqIn"))),
+    XiEqIn(XiEqModelCoeffs_.get<scalar>("XiEqIn")),
     XiEqModel_(XiEqModel::New(XiEqModelCoeffs_, thermo, turbulence, Su))
 {}
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
index 5750278f32..58183d1bb4 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.C
@@ -49,7 +49,7 @@ Foam::XiGModels::KTS::KTS
 )
 :
     XiGModel(XiGProperties, thermo, turbulence, Su),
-    GEtaCoef_(readScalar(XiGModelCoeffs_.lookup("GEtaCoef")))
+    GEtaCoef_(XiGModelCoeffs_.get<scalar>("GEtaCoef"))
 {}
 
 
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
index 7908a578b5..f5750ce936 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C
@@ -52,7 +52,7 @@ Foam::XiModels::algebraic::algebraic
 )
 :
     XiModel(XiProperties, thermo, turbulence, Su, rho, b, phi),
-    XiShapeCoef(readScalar(XiModelCoeffs_.lookup("XiShapeCoef"))),
+    XiShapeCoef(XiModelCoeffs_.get<scalar>("XiShapeCoef")),
     XiEqModel_(XiEqModel::New(XiProperties, thermo, turbulence, Su)),
     XiGModel_(XiGModel::New(XiProperties, thermo, turbulence, Su))
 {}
diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
index b23c057a6a..e243b44d9f 100644
--- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
+++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.C
@@ -57,7 +57,7 @@ Foam::XiModels::transport::transport
 )
 :
     XiModel(XiProperties, thermo, turbulence, Su, rho, b, phi),
-    XiShapeCoef(readScalar(XiModelCoeffs_.lookup("XiShapeCoef"))),
+    XiShapeCoef(XiModelCoeffs_.get<scalar>("XiShapeCoef")),
     XiEqModel_(XiEqModel::New(XiProperties, thermo, turbulence, Su)),
     XiGModel_(XiGModel::New(XiProperties, thermo, turbulence, Su))
 {}
diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
index a6987d2ea0..9798284138 100644
--- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
+++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
@@ -53,8 +53,8 @@ Foam::laminarFlameSpeedModels::SCOPE::polynomial::polynomial
 )
 :
     FixedList<scalar, 7>(polyDict.lookup("coefficients")),
-    ll(readScalar(polyDict.lookup("lowerLimit"))),
-    ul(readScalar(polyDict.lookup("upperLimit"))),
+    ll(polyDict.get<scalar>("lowerLimit")),
+    ul(polyDict.get<scalar>("upperLimit")),
     llv(polyPhi(ll, *this)),
     ulv(polyPhi(ul, *this)),
     lu(0)
@@ -75,39 +75,30 @@ Foam::laminarFlameSpeedModels::SCOPE::SCOPE
         (
             IFstream
             (
-                fileName
-                (
-                    dict.lookup("fuelFile")
-                )
+                dict.get<fileName>("fuelFile")
             )()
         ).optionalSubDict(typeName + "Coeffs")
     ),
     LFL_
     (
-        readScalar
+        coeffsDict_.getCompat<scalar>
         (
-            coeffsDict_.lookupCompat
-            (
-                "lowerFlammabilityLimit",
-                {{"lowerFlamabilityLimit", 1712}}
-            )
+            "lowerFlammabilityLimit",
+            {{"lowerFlamabilityLimit", 1712}}
         )
     ),
     UFL_
     (
-        readScalar
+        coeffsDict_.getCompat<scalar>
         (
-            coeffsDict_.lookupCompat
-            (
-                "upperFlammabilityLimit",
-                {{"upperFlamabilityLimit", 1712}}
-            )
+            "upperFlammabilityLimit",
+            {{"upperFlamabilityLimit", 1712}}
         )
     ),
     SuPolyL_(coeffsDict_.subDict("lowerSuPolynomial")),
     SuPolyU_(coeffsDict_.subDict("upperSuPolynomial")),
-    Texp_(readScalar(coeffsDict_.lookup("Texp"))),
-    pexp_(readScalar(coeffsDict_.lookup("pexp"))),
+    Texp_(coeffsDict_.get<scalar>("Texp")),
+    pexp_(coeffsDict_.get<scalar>("pexp")),
     MaPolyL_(coeffsDict_.subDict("lowerMaPolynomial")),
     MaPolyU_(coeffsDict_.subDict("upperMaPolynomial"))
 {
diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H
index 34fcf68290..7cc28d4562 100644
--- a/applications/solvers/combustion/chemFoam/createFields.H
+++ b/applications/solvers/combustion/chemFoam/createFields.H
@@ -18,8 +18,8 @@
         )
     );
 
-    scalar p0 = readScalar(initialConditions.lookup("p"));
-    scalar T0 = readScalar(initialConditions.lookup("T"));
+    scalar p0 = initialConditions.get<scalar>("p");
+    scalar T0 = initialConditions.get<scalar>("T");
 
     #include "createBaseFields.H"
 
diff --git a/applications/solvers/combustion/chemFoam/readInitialConditions.H b/applications/solvers/combustion/chemFoam/readInitialConditions.H
index 8e340a7e16..c321fcbf3b 100644
--- a/applications/solvers/combustion/chemFoam/readInitialConditions.H
+++ b/applications/solvers/combustion/chemFoam/readInitialConditions.H
@@ -40,7 +40,7 @@
             const word& name = Y[i].name();
             if (fractions.found(name))
             {
-                X0[i] = readScalar(fractions.lookup(name));
+                X0[i] = fractions.get<scalar>(name);
             }
         }
 
@@ -64,7 +64,7 @@
             const word& name = Y[i].name();
             if (fractions.found(name))
             {
-                Y0[i] = readScalar(fractions.lookup(name));
+                Y0[i] = fractions.get<scalar>(name);
             }
         }
 
diff --git a/applications/solvers/combustion/reactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
index 2f028e45d2..3b8a3ae96f 100644
--- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H
+++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H
@@ -29,7 +29,7 @@ License
     const dictionary& pimpleDict = pimple.dict();
 
     // Maximum flow Courant number
-    scalar maxCo(readScalar(pimpleDict.lookup("maxCo")));
+    scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
     scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
@@ -118,7 +118,7 @@ License
                 if (Yref.found(Yi.name()))
                 {
                     foundY = true;
-                    scalar Yrefi = readScalar(Yref.lookup(Yi.name()));
+                    const scalar Yrefi = Yref.get<scalar>(Yi.name());
 
                     rDeltaTY.field() = max
                     (
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
index 0590e8d098..4e12e668e2 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C
@@ -84,7 +84,7 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
     muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
-    accommodationCoeff_(readScalar(dict.lookup("accommodationCoeff"))),
+    accommodationCoeff_(dict.get<scalar>("accommodationCoeff")),
     Twall_("Twall", dict, p.size()),
     gamma_(dict.lookupOrDefault<scalar>("gamma", 1.4))
 {
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index defbf3fe22..aa6e13648b 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -85,7 +85,7 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
     psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
     muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
     tauMCName_(dict.lookupOrDefault<word>("tauMC", "tauMC")),
-    accommodationCoeff_(readScalar(dict.lookup("accommodationCoeff"))),
+    accommodationCoeff_(dict.get<scalar>("accommodationCoeff")),
     Uwall_("Uwall", dict, p.size()),
     thermalCreep_(dict.lookupOrDefault("thermalCreep", true)),
     curvature_(dict.lookupOrDefault("curvature", true))
diff --git a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H
index a3bd66654d..e15261990a 100644
--- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H
+++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/EEqn.H
@@ -25,8 +25,8 @@
 
     if (!local)
     {
-        const scalar T0 = readScalar(eosDict.lookup("T0"));
-        const scalar p0 = readScalar(eosDict.lookup("p0"));
+        const scalar T0 = eosDict.get<scalar>("T0");
+        const scalar p0 = eosDict.get<scalar>("p0");
 
         he = thermo.he(p, pow(p/p0, (gamma - scalar(1))/gamma)*T0);
     }
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H
index 3f43981907..8c9a222f16 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H
@@ -12,7 +12,7 @@ IOdictionary mdEquilibrationDict
     )
 );
 
-scalar targetTemperature = readScalar
+scalar targetTemperature
 (
-    mdEquilibrationDict.lookup("targetTemperature")
+    mdEquilibrationDict.get<scalar>("targetTemperature")
 );
diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H
index ea19bf758c..55c3608ac9 100644
--- a/applications/solvers/lagrangian/DPMFoam/createFields.H
+++ b/applications/solvers/lagrangian/DPMFoam/createFields.H
@@ -139,10 +139,9 @@ basicKinematicTypeCloud kinematicCloud
 scalar alphacMin
 (
     1.0
-  - readScalar
-    (
+  - (
         kinematicCloud.particleProperties().subDict("constantProperties")
-       .lookup("alphaMax")
+       .get<scalar>("alphaMax")
     )
 );
 
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
index 3b2d3a77cf..00664ea0c6 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H
@@ -29,7 +29,7 @@ License
     const dictionary& pimpleDict = pimple.dict();
 
     // Maximum flow Courant number
-    scalar maxCo(readScalar(pimpleDict.lookup("maxCo")));
+    scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
     scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
index 1a57519eac..c9deaa4e0e 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H
@@ -29,7 +29,7 @@ License
     const dictionary& pimpleDict = pimple.dict();
 
     // Maximum flow Courant number
-    scalar maxCo(readScalar(pimpleDict.lookup("maxCo")));
+    scalar maxCo(pimpleDict.get<scalar>("maxCo"));
 
     // Maximum time scale
     scalar maxDeltaT(pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT));
diff --git a/applications/solvers/multiphase/MPPICInterFoam/createFields.H b/applications/solvers/multiphase/MPPICInterFoam/createFields.H
index 95746f2f6d..61f4def128 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/createFields.H
+++ b/applications/solvers/multiphase/MPPICInterFoam/createFields.H
@@ -160,10 +160,9 @@ basicKinematicMPPICCloud kinematicCloud
 scalar alphacMin
 (
     1.0
-  - readScalar
-    (
+  - (
         kinematicCloud.particleProperties().subDict("constantProperties")
-       .lookup("alphaMax")
+       .get<scalar>("alphaMax")
     )
 );
 
diff --git a/applications/solvers/multiphase/VoF/alphaCourantNo.H b/applications/solvers/multiphase/VoF/alphaCourantNo.H
index 24f6e48a22..d67638a3c2 100644
--- a/applications/solvers/multiphase/VoF/alphaCourantNo.H
+++ b/applications/solvers/multiphase/VoF/alphaCourantNo.H
@@ -31,7 +31,7 @@ Description
 
 scalar maxAlphaCo
 (
-    readScalar(runTime.controlDict().lookup("maxAlphaCo"))
+    runTime.controlDict().get<scalar>("maxAlphaCo")
 );
 
 scalar alphaCoNum = 0.0;
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H
index d47cf78b5a..70acf5b5ee 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H
@@ -2,5 +2,5 @@
 
 scalar maxAcousticCo
 (
-    readScalar(runTime.controlDict().lookup("maxAcousticCo"))
+    runTime.controlDict().get<scalar>("maxAcousticCo")
 );
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
index 51a2da33bd..f5b1d8ef01 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H
@@ -70,10 +70,10 @@
     // Remove the swirl component of velocity for "wedge" cases
     if (pimple.dict().found("removeSwirl"))
     {
-        label swirlCmpt(readLabel(pimple.dict().lookup("removeSwirl")));
+        label swirlCmpt(pimple.dict().get<label>("removeSwirl"));
 
         Info<< "Removing swirl component-" << swirlCmpt << " of U" << endl;
-        U.field().replace(swirlCmpt, 0.0);
+        U.field().replace(swirlCmpt, Zero);
     }
 
     U.correctBoundaryConditions();
diff --git a/applications/solvers/multiphase/cavitatingFoam/createControls.H b/applications/solvers/multiphase/cavitatingFoam/createControls.H
index e5c7eea9f7..8c9a75cf16 100644
--- a/applications/solvers/multiphase/cavitatingFoam/createControls.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createControls.H
@@ -2,5 +2,5 @@
 
 scalar maxAcousticCo
 (
-    readScalar(runTime.controlDict().lookup("maxAcousticCo"))
+    runTime.controlDict().get<scalar>("maxAcousticCo")
 );
diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
index 4c337c4269..2cb7b0fc5a 100644
--- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H
+++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H
@@ -73,10 +73,10 @@
     // Remove the swirl component of velocity for "wedge" cases
     if (pimple.dict().found("removeSwirl"))
     {
-        label swirlCmpt(readLabel(pimple.dict().lookup("removeSwirl")));
+        label swirlCmpt(pimple.dict().get<label>("removeSwirl"));
 
         Info<< "Removing swirl component-" << swirlCmpt << " of U" << endl;
-        U.field().replace(swirlCmpt, 0.0);
+        U.field().replace(swirlCmpt, Zero);
     }
 
     U.correctBoundaryConditions();
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
index 114b29c46c..0a0ab0f4e7 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
@@ -763,8 +763,8 @@ void Foam::multiphaseMixtureThermo::solve()
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    scalar cAlpha(readScalar(alphaControls.lookup("cAlpha")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
+    scalar cAlpha(alphaControls.get<scalar>("cAlpha"));
 
     volScalarField& alpha = phases_.first();
 
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H b/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
index 95154c6a15..b677b4ae99 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaControls.H
@@ -1,8 +1,8 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
 bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));
 
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/alphaCourantNo.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/alphaCourantNo.H
index c1dfd7ca1f..d5521370e8 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/alphaCourantNo.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/alphaCourantNo.H
@@ -31,7 +31,7 @@ Description
 
 scalar maxAlphaCo
 (
-    readScalar(runTime.controlDict().lookup("maxAlphaCo"))
+    runTime.controlDict().get<scalar>("maxAlphaCo")
 );
 
 scalar maxAlphaDdt
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
index a60ba21ae8..f941743c47 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
@@ -198,7 +198,7 @@ void Foam::radiation::laserDTRM::initialise()
     {
         case pdGaussian:
         {
-            sigma_ = readScalar(lookup("sigma"));
+            sigma_ = get<scalar>("sigma");
             break;
         }
         case pdManual:
@@ -325,8 +325,8 @@ Foam::radiation::laserDTRM::laserDTRM(const volScalarField& T)
     mode_(powerDistNames_.lookup("mode", *this)),
     DTRMCloud_(mesh_, "DTRMCloud", IDLList<DTRMParticle>()),
     nParticles_(0),
-    ndTheta_(readLabel(lookup("nTheta"))),
-    ndr_(readLabel(lookup("nr"))),
+    ndTheta_(get<label>("nTheta")),
+    ndr_(get<label>("nr")),
     maxTrackLength_(mesh_.bounds().mag()),
 
     focalLaserPosition_
@@ -339,7 +339,7 @@ Foam::radiation::laserDTRM::laserDTRM(const volScalarField& T)
         Function1<vector>::New("laserDirection", *this)
     ),
 
-    focalLaserRadius_(readScalar(lookup("focalLaserRadius"))),
+    focalLaserRadius_(get<scalar>("focalLaserRadius")),
     qualityBeamLaser_
     (
         lookupOrDefault<scalar>("qualityBeamLaser", 0.0)
@@ -435,8 +435,8 @@ Foam::radiation::laserDTRM::laserDTRM
     mode_(powerDistNames_.lookup("mode", *this)),
     DTRMCloud_(mesh_, "DTRMCloud", IDLList<DTRMParticle>()),
     nParticles_(0),
-    ndTheta_(readLabel(lookup("nTheta"))),
-    ndr_(readLabel(lookup("nr"))),
+    ndTheta_(get<label>("nTheta")),
+    ndr_(get<label>("nr")),
     maxTrackLength_(mesh_.bounds().mag()),
 
     focalLaserPosition_
@@ -448,7 +448,7 @@ Foam::radiation::laserDTRM::laserDTRM
         Function1<vector>::New("laserDirection", *this)
     ),
 
-    focalLaserRadius_(readScalar(lookup("focalLaserRadius"))),
+    focalLaserRadius_(get<scalar>("focalLaserRadius")),
     qualityBeamLaser_
     (
         lookupOrDefault<scalar>("qualityBeamLaser", 0.0)
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/reflectionModel/FresnelLaser/FresnelLaser.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/reflectionModel/FresnelLaser/FresnelLaser.C
index a6b7b549b8..81d565345d 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/reflectionModel/FresnelLaser/FresnelLaser.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/reflectionModel/FresnelLaser/FresnelLaser.C
@@ -53,7 +53,7 @@ Foam::radiation::FresnelLaser::FresnelLaser
 )
 :
     reflectionModel(dict, mesh),
-    epsilon_(readScalar(dict.lookup("epsilon")))
+    epsilon_(dict.get<scalar>("epsilon"))
 {}
 
 
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
index d6ac5b4b48..95eb161819 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
@@ -53,8 +53,8 @@ Foam::porousModels::VollerPrakash::VollerPrakash
 )
 :
     porousModel(dict, mesh),
-    Cu_(readScalar(dict.lookup("Cu"))),
-    solidPhase_(dict.lookup("solidPhase"))
+    Cu_(dict.get<scalar>("Cu")),
+    solidPhase_(dict.get<word>("solidPhase"))
 {}
 
 
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index 16e8a94be6..6c00cd3a76 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -191,7 +191,7 @@ void Foam::MultiComponentPhaseModel<BasePhaseModel, phaseThermo>::solveYi
 
     const dictionary& MULEScontrols = mesh.solverDict(alpha1.name());
 
-    scalar cAlpha(readScalar(MULEScontrols.lookup("cYi")));
+    scalar cAlpha(MULEScontrols.get<scalar>("cYi"));
 
     PtrList<surfaceScalarField> phiYiCorrs(species_.size());
     const surfaceScalarField& phi = this->fluid().phi();
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystem.C
index e7d8c06615..2440b43e02 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/multiphaseSystem/multiphaseSystem.C
@@ -269,8 +269,8 @@ void Foam::multiphaseSystem::solve()
     const fvMesh& mesh = this->mesh();
 
     const dictionary& alphaControls = mesh.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
+    label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
     mesh.solverDict("alpha").readEntry("cAlphas", cAlphas_);
 
     // Reset ddtAlphaMax
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
index 137710d217..6169ab62f4 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
@@ -50,10 +50,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
 
     const word modelType
     (
-        phaseChangePropertiesDict.lookup
-        (
-            "phaseChangeTwoPhaseModel"
-        )
+        phaseChangePropertiesDict.get<word>("phaseChangeTwoPhaseModel")
     );
 
     Info<< "Selecting phaseChange model " << modelType << endl;
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
index a99a0b39e2..cb83b15a9e 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaControls.H
@@ -1,5 +1,5 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
index 70cc298fe9..03b8bc9aad 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
@@ -155,13 +155,10 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
     mixture_(mixture),
     cAlpha_
     (
-        readScalar
+        mixture.U().mesh().solverDict
         (
-            mixture.U().mesh().solverDict
-            (
-                mixture_.alpha1().name()
-            ).lookup("cAlpha")
-        )
+            mixture_.alpha1().name()
+        ).get<scalar>("cAlpha")
     ),
     sigma12_("sigma12", dimensionSet(1, 0, -2, 0, 0), mixture),
     sigma13_("sigma13", dimensionSet(1, 0, -2, 0, 0), mixture),
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/alphaCourantNo.H b/applications/solvers/multiphase/interFoam/overInterDyMFoam/alphaCourantNo.H
index 8666b664ac..d93afbb817 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/alphaCourantNo.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/alphaCourantNo.H
@@ -31,7 +31,7 @@ Description
 
 scalar maxAlphaCo
 (
-    readScalar(runTime.controlDict().lookup("maxAlphaCo"))
+    runTime.controlDict().get<scalar>("maxAlphaCo")
 );
 
 scalar alphaCoNum = 0.0;
diff --git a/applications/solvers/multiphase/interIsoFoam/alphaControls.H b/applications/solvers/multiphase/interIsoFoam/alphaControls.H
index db77d94af4..2e94f34d75 100644
--- a/applications/solvers/multiphase/interIsoFoam/alphaControls.H
+++ b/applications/solvers/multiphase/interIsoFoam/alphaControls.H
@@ -1,3 +1,3 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
diff --git a/applications/solvers/multiphase/interIsoFoam/alphaCourantNo.H b/applications/solvers/multiphase/interIsoFoam/alphaCourantNo.H
index 24f6e48a22..d67638a3c2 100644
--- a/applications/solvers/multiphase/interIsoFoam/alphaCourantNo.H
+++ b/applications/solvers/multiphase/interIsoFoam/alphaCourantNo.H
@@ -31,7 +31,7 @@ Description
 
 scalar maxAlphaCo
 (
-    readScalar(runTime.controlDict().lookup("maxAlphaCo"))
+    runTime.controlDict().get<scalar>("maxAlphaCo")
 );
 
 scalar alphaCoNum = 0.0;
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H b/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H
index bd26f0b927..41d51c9135 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/alphaControls.H
@@ -1,8 +1,8 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
 bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));
 
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index e48594f970..df770b3f0f 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -844,7 +844,7 @@ void Foam::multiphaseSystem::solve()
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
     if (nAlphaSubCycles > 1)
     {
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index c6c366951d..93ff2ee04b 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -311,8 +311,8 @@ void Foam::multiphaseMixture::solve()
     volScalarField& alpha = phases_.first();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    scalar cAlpha(readScalar(alphaControls.lookup("cAlpha")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
+    scalar cAlpha(alphaControls.get<scalar>("cAlpha"));
 
     if (nAlphaSubCycles > 1)
     {
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
index 8c068653f8..fdf37e5885 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -55,7 +55,7 @@ Foam::wallLubricationModels::Frank::Frank
     wallLubricationModel(dict, pair),
     Cwd_("Cwd", dimless, dict),
     Cwc_("Cwc", dimless, dict),
-    p_(readScalar(dict.lookup("p")))
+    p_(dict.get<scalar>("p"))
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
index e7b7121d45..70c75214c0 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
@@ -606,7 +606,7 @@ void Foam::multiphaseSystem::solve()
     const Time& runTime = mesh_.time();
 
     const dictionary& alphaControls = mesh_.solverDict("alpha");
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
     bool LTS = fv::localEulerDdt::enabled(mesh_);
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
index c18a01cf0b..28b3dfe832 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
@@ -60,7 +60,7 @@ KocamustafaogullariIshii::KocamustafaogullariIshii
 )
 :
     departureDiameterModel(),
-    phi_(readScalar(dict.lookup("phi")))
+    phi_(dict.get<scalar>("phi"))
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
index 581a83a6d1..e1e999dff3 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::partitioningModels::
 Lavieville::Lavieville(const dictionary& dict)
 :
     partitioningModel(),
-    alphaCrit_(readScalar(dict.lookup("alphaCrit")))
+    alphaCrit_(dict.get<scalar>("alphaCrit"))
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
index f9528677d4..3d7163446f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
@@ -52,8 +52,8 @@ Foam::wallBoilingModels::partitioningModels::
 cosine::cosine(const dictionary& dict)
 :
     partitioningModel(),
-    alphaLiquid1_(readScalar(dict.lookup("alphaLiquid1"))),
-    alphaLiquid0_(readScalar(dict.lookup("alphaLiquid0")))
+    alphaLiquid1_(dict.get<scalar>("alphaLiquid1")),
+    alphaLiquid0_(dict.get<scalar>("alphaLiquid0"))
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
index cc6d648f84..b0bb37aaed 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
@@ -52,8 +52,8 @@ Foam::wallBoilingModels::partitioningModels::
 linear::linear(const dictionary& dict)
 :
     partitioningModel(),
-    alphaLiquid1_(readScalar(dict.lookup("alphaLiquid1"))),
-    alphaLiquid0_(readScalar(dict.lookup("alphaLiquid0")))
+    alphaLiquid1_(dict.get<scalar>("alphaLiquid1")),
+    alphaLiquid0_(dict.get<scalar>("alphaLiquid0"))
 {}
 
 
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index 90549eda9c..05cf94b90b 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -57,9 +57,9 @@ Foam::RASModels::phasePressureModel::phasePressureModel
 
     phase_(phase),
 
-    alphaMax_(readScalar(coeffDict_.lookup("alphaMax"))),
-    preAlphaExp_(readScalar(coeffDict_.lookup("preAlphaExp"))),
-    expMax_(readScalar(coeffDict_.lookup("expMax"))),
+    alphaMax_(coeffDict_.get<scalar>("alphaMax")),
+    preAlphaExp_(coeffDict_.get<scalar>("preAlphaExp")),
+    expMax_(coeffDict_.get<scalar>("expMax")),
     g0_
     (
         "g0",
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index bbe3c41925..07c640f895 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -193,8 +193,8 @@ void Foam::twoPhaseSystem::solve()
 
     const dictionary& alphaControls = mesh_.solverDict(alpha1.name());
 
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
+    label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
     bool LTS = fv::localEulerDdt::enabled(mesh_);
 
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
index db77d94af4..2e94f34d75 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaControls.H
@@ -1,3 +1,3 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H
index 9c8e27d975..a8adce7eed 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H
@@ -31,7 +31,7 @@ Description
 
 scalar maxAlphaCo
 (
-    readScalar(runTime.controlDict().lookup("maxAlphaCo"))
+    runTime.controlDict().get<scalar>("maxAlphaCo")
 );
 
 scalar alphaCoNum = 0.0;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
index 033aaa82aa..15b206041b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -55,7 +55,7 @@ Foam::wallLubricationModels::Frank::Frank
     wallLubricationModel(dict, pair),
     Cwd_("Cwd", dimless, dict),
     Cwc_("Cwc", dimless, dict),
-    p_(readScalar(dict.lookup("p")))
+    p_(dict.get<scalar>("p"))
 {}
 
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
index b00f887c98..64fb24755e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
@@ -60,9 +60,9 @@ Foam::RASModels::phasePressureModel::phasePressureModel
 
     phase_(phase),
 
-    alphaMax_(readScalar(coeffDict_.lookup("alphaMax"))),
-    preAlphaExp_(readScalar(coeffDict_.lookup("preAlphaExp"))),
-    expMax_(readScalar(coeffDict_.lookup("expMax"))),
+    alphaMax_(coeffDict_.get<scalar>("alphaMax")),
+    preAlphaExp_(coeffDict_.get<scalar>("preAlphaExp")),
+    expMax_(coeffDict_.get<scalar>("expMax")),
     g0_
     (
         "g0",
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
index 339e755c72..b875ed74ef 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
@@ -360,8 +360,8 @@ void Foam::twoPhaseSystem::solve()
         alpha1.name()
     );
 
-    label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-    label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+    label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
+    label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
     word alphaScheme("div(phi," + alpha1.name() + ')');
     word alpharScheme("div(phir," + alpha1.name() + ')');
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
index a592de04e9..80d92971a2 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H
@@ -13,7 +13,7 @@
     );
 
     const dictionary& rhoDict(mechanicalProperties.subDict("rho"));
-    word rhoType(rhoDict.lookup("type"));
+    word rhoType(rhoDict.get<word>("type"));
 
     autoPtr<volScalarField> rhoPtr;
 
@@ -28,7 +28,7 @@
 
     if (rhoType == "uniform")
     {
-        scalar rhoValue(readScalar(rhoDict.lookup("value")));
+        scalar rhoValue(rhoDict.get<scalar>("value"));
 
         rhoPtr.reset
         (
@@ -68,7 +68,7 @@
     volScalarField& rho = rhoPtr();
 
     const dictionary& EDict(mechanicalProperties.subDict("E"));
-    word EType(EDict.lookup("type"));
+    word EType(EDict.get<word>("type"));
 
     autoPtr<volScalarField> EPtr;
 
@@ -83,7 +83,7 @@
 
     if (EType == "uniform")
     {
-        scalar rhoEValue(readScalar(EDict.lookup("value")));
+        scalar rhoEValue(EDict.get<scalar>("value"));
 
         EPtr.reset
         (
@@ -134,11 +134,11 @@
     );
 
     const dictionary& nuDict(mechanicalProperties.subDict("nu"));
-    word nuType(nuDict.lookup("type"));
+    word nuType(nuDict.get<word>("type"));
 
     if (nuType == "uniform")
     {
-        scalar nuValue(readScalar(nuDict.lookup("value")));
+        scalar nuValue(nuDict.get<scalar>("value"));
         nuPtr.reset
         (
             new volScalarField
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
index 3c889fc1c8..8d9ccda5e4 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H
@@ -58,10 +58,10 @@ if (thermalStress)
     );
 
     const dictionary& CDict(thermalProperties.subDict("C"));
-    word CType(CDict.lookup("type"));
+    word CType(CDict.get<word>("type"));
     if (CType == "uniform")
     {
-        scalar CValue(readScalar(CDict.lookup("value")));
+        scalar CValue(CDict.get<scalar>("value"));
 
         CPtr.reset
         (
@@ -113,10 +113,10 @@ if (thermalStress)
     );
 
     const dictionary& kDict(thermalProperties.subDict("k"));
-    word kType(kDict.lookup("type"));
+    word kType(kDict.get<word>("type"));
     if (kType == "uniform")
     {
-        scalar rhoKValue(readScalar(kDict.lookup("value")));
+        scalar rhoKValue(kDict.get<scalar>("value"));
 
         rhoKPtr.reset
         (
@@ -169,11 +169,11 @@ if (thermalStress)
 
 
     const dictionary& alphaDict(thermalProperties.subDict("alpha"));
-    word alphaType(alphaDict.lookup("type"));
+    word alphaType(alphaDict.get<word>("type"));
 
     if (alphaType == "uniform")
     {
-        scalar alphaValue(readScalar(alphaDict.lookup("value")));
+        scalar alphaValue(alphaDict.get<scalar>("value"));
         alphaPtr.reset
         (
             new volScalarField
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
index dd7af1704a..eefb3bbffa 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
@@ -1 +1 @@
-scalar accFac(readScalar(stressControl.lookup("accelerationFactor")));
+scalar accFac(stressControl.get<scalar>("accelerationFactor"));
diff --git a/applications/test/Function1/Test-Function1.C b/applications/test/Function1/Test-Function1.C
index d1d3b1f073..32da39e44f 100644
--- a/applications/test/Function1/Test-Function1.C
+++ b/applications/test/Function1/Test-Function1.C
@@ -120,8 +120,8 @@ int main(int argc, char *argv[])
         )
     );
 
-    scalar x0 = readScalar(function1Properties.lookup("x0"));
-    scalar x1 = readScalar(function1Properties.lookup("x1"));
+    scalar x0 = function1Properties.get<scalar>("x0");
+    scalar x1 = function1Properties.get<scalar>("x1");
 
     Info<< "Data entry type: " << function1().type() << nl << endl;
 
diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
index 5da5d7f336..211d1452f0 100644
--- a/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
+++ b/applications/test/rigidBodyDynamics/pendulumAndSpring/pendulumAndSpring.C
@@ -55,7 +55,7 @@ int main(int argc, char *argv[])
     // Create the pendulumAndSpring model from dictionary
     rigidBodyMotion pendulumAndSpring(runTime, pendulumAndSpringDict);
 
-    label nIter(readLabel(pendulumAndSpringDict.lookup("nIter")));
+    label nIter(pendulumAndSpringDict.get<label>("nIter"));
 
     Info<< pendulumAndSpring << endl;
     Info<< "// Joint state " << endl;
diff --git a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
index f61dfe03b4..a6b19ebb5f 100644
--- a/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
+++ b/applications/test/rigidBodyDynamics/sphericalJoint/sphericalJoint.C
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
     // Create the sphericalJoint model from dictionary
     rigidBodyMotion sphericalJoint(runTime, sphericalJointDict);
 
-    label nIter(readLabel(sphericalJointDict.lookup("nIter")));
+    label nIter(sphericalJointDict.get<label>("nIter"));
 
     Info<< sphericalJoint << endl;
 
diff --git a/applications/test/rigidBodyDynamics/spring/spring.C b/applications/test/rigidBodyDynamics/spring/spring.C
index 00bed9032e..ad4613fe01 100644
--- a/applications/test/rigidBodyDynamics/spring/spring.C
+++ b/applications/test/rigidBodyDynamics/spring/spring.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     // Create the spring model from dictionary
     rigidBodyMotion spring(springDict);
 
-    label nIter(readLabel(springDict.lookup("nIter")));
+    label nIter(springDict.get<label>("nIter"));
 
     Info<< spring << endl;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 00bad93cd8..c7e2544634 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -751,7 +751,7 @@ Foam::conformalVoronoiMesh::createPolyMeshFromPoints
 
     forAll(patches, p)
     {
-        label totalPatchSize = patchDicts[p].get<label>("nFaces");
+        const label totalPatchSize = patchDicts[p].get<label>("nFaces");
 
         if
         (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 5268583281..bf4944deea 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -816,7 +816,7 @@ void Foam::conformalVoronoiMesh::writeMesh
 
     forAll(patches, p)
     {
-        label totalPatchSize = patchDicts[p].get<label>("nFaces");
+        const label totalPatchSize = patchDicts[p].get<label>("nFaces");
 
         if
         (
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index b0091f6900..173e7a5a45 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -73,7 +73,7 @@ CONSTRUCT
 )
 :
     PARENT(p, iF),
-    scalarData_(readScalar(dict.lookup("scalarData"))),
+    scalarData_(dict.get<scalar>("scalarData")),
     data_(pTraits<TYPE>(dict.lookup("data"))),
     fieldData_("fieldData", dict, p.size()),
     timeVsData_(Function1<TYPE>::New("timeVsData", dict)),
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index dafb0b5179..6364c722cb 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -85,6 +85,7 @@ SeeAlso
 #ifndef dictionary_H
 #define dictionary_H
 
+#include <type_traits>
 #include "entry.H"
 #include "IDLList.H"
 #include "DLList.H"
@@ -93,7 +94,10 @@ SeeAlso
 #include "HashTable.H"
 #include "wordList.H"
 #include "className.H"
-#include <type_traits>
+
+// Some common data types
+#include "label.H"
+#include "scalar.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -450,7 +454,7 @@ public:
     virtual ~dictionary();
 
 
-    // Member functions
+    // Member Functions
 
     // Access
 
@@ -1146,6 +1150,30 @@ public:
 
         //- Write dictionary to Ostream
         friend Ostream& operator<<(Ostream& os, const dictionary& dict);
+
+
+    // Shortcuts - may be more useable in templated code
+
+        #undef defineDictionaryGetter
+        #define defineDictionaryGetter(Func,Type)                             \
+            /** Same as get\<Type\> */                                        \
+            Type Func                                                         \
+            (                                                                 \
+                const word& keyword,                                          \
+                bool recursive = false,                                       \
+                bool patternMatch = true                                      \
+            ) const                                                           \
+            {                                                                 \
+                return get<Type>(keyword, recursive, patternMatch);           \
+            }
+
+        defineDictionaryGetter(getBool, bool);
+        defineDictionaryGetter(getLabel, label);
+        defineDictionaryGetter(getScalar, scalar);
+        defineDictionaryGetter(getWord, word);
+        defineDictionaryGetter(getFileName, fileName);
+
+        #undef defineDictionaryGetter
 };
 
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index b2f0d979cc..aa7f6fe8ec 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -1217,7 +1217,7 @@ void Foam::argList::parse
 
                 dictionary decompDict(decompDictStream);
 
-                dictNProcs = decompDict.get<label>("numberOfSubdomains");
+                decompDict.readEntry("numberOfSubdomains", dictNProcs);
 
                 if (decompDict.lookupOrDefault("distributed", false))
                 {
diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
index affa384e78..be1b0c8e43 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
@@ -158,19 +158,19 @@ void Foam::interpolationLookUpTable<Type>::dimensionTable()
 
     forAll(entries_,i)
     {
-        dim_[i] = readLabel(entries_[i].lookup("N"));
-        max_[i] = readScalar(entries_[i].lookup("max"));
-        min_[i] = readScalar(entries_[i].lookup("min"));
+        dim_[i] = entries_[i].get<label>("N");
+        max_[i] = entries_[i].get<scalar>("max");
+        min_[i] = entries_[i].get<scalar>("min");
         delta_[i] = (max_[i] - min_[i])/dim_[i];
         tableDim *= dim_[i] + 1;
-        fieldIndices_.insert(entries_[i].lookup("name"), index);
+        fieldIndices_.insert(entries_[i].get<word>("name"), index);
         entryIndices_[i] = index;
         index++;
     }
 
     forAll(output_,i)
     {
-        fieldIndices_.insert(output_[i].lookup("name"), index);
+        fieldIndices_.insert(output_[i].get<word>("name"), index);
         outputIndices_[i] = index;
         index++;
     }
@@ -284,7 +284,7 @@ Foam::interpolationLookUpTable<Type>::interpolationLookUpTable
 )
 :
     List<scalarField>(),
-    fileName_(fileName(dict.lookup("file")).expand()),
+    fileName_(dict.get<fileName>("file").expand()),
     dim_(0),
     min_(0.0),
     delta_(0.0),
diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
index bf972fda0a..f5490c2af0 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
+++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C
@@ -33,10 +33,10 @@ template<class Type>
 Foam::csvTableReader<Type>::csvTableReader(const dictionary& dict)
 :
     tableReader<Type>(dict),
-    headerLine_(readBool(dict.lookup("hasHeaderLine"))),
-    timeColumn_(readLabel(dict.lookup("timeColumn"))),
+    headerLine_(dict.get<bool>("hasHeaderLine")),
+    timeColumn_(dict.get<label>("timeColumn")),
     componentColumns_(dict.lookup("valueColumns")),
-    separator_(dict.lookupOrDefault<string>("separator", string(","))[0])
+    separator_(dict.lookupOrDefault<string>("separator", ",")[0])
 {
     if (componentColumns_.size() != pTraits<Type>::nComponents)
     {
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
index 58d3018e3e..8a48fffb73 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
@@ -94,14 +94,14 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
         false // if used in BCs, could be used by multiple patches
     ),
     List<scalar>(2, 0.0),
-    x0_(readScalar(dict.lookup("x0"))),
-    dx_(readScalar(dict.lookup("dx"))),
+    x0_(dict.get<scalar>("x0")),
+    dx_(dict.get<scalar>("dx")),
     log10_(dict.lookupOrDefault<Switch>("log10", false)),
     bound_(dict.lookupOrDefault<Switch>("bound", false))
 {
     if (initialiseOnly)
     {
-        const scalar xMax = readScalar(dict.lookup("xMax"));
+        const scalar xMax = dict.get<scalar>("xMax");
         const label nIntervals = static_cast<label>(xMax - x0_)/dx_ + 1;
         this->setSize(nIntervals);
     }
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
index b189aaaf2c..6d6df0ab11 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/dummyAgglomeration/dummyAgglomeration.C
@@ -50,7 +50,7 @@ Foam::dummyAgglomeration::dummyAgglomeration
 )
 :
     GAMGAgglomeration(mesh, controlDict),
-    nLevels_(readLabel(controlDict.lookup("nLevels")))
+    nLevels_(controlDict.get<label>("nLevels"))
 {
     const label nCoarseCells = mesh.lduAddr().size();
 
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 360877ba7e..484289bedc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
@@ -223,7 +223,7 @@ Foam::procFacesGAMGProcAgglomeration::procFacesGAMGProcAgglomeration
 )
 :
     GAMGProcAgglomeration(agglom, controlDict),
-    nAgglomeratingCells_(readLabel(controlDict.lookup("nAgglomeratingCells")))
+    nAgglomeratingCells_(controlDict.get<label>("nAgglomeratingCells"))
 {}
 
 
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index 982c3398b6..b08dde5b91 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -74,7 +74,7 @@ void Foam::solution::read(const dictionary& dict)
             forAll(entryNames, i)
             {
                 const word& e = entryNames[i];
-                scalar value = readScalar(relaxDict.lookup(e));
+                scalar value = relaxDict.get<scalar>(e);
 
                 if (e.startsWith("p"))
                 {
@@ -274,7 +274,7 @@ Foam::scalar Foam::solution::fieldRelaxationFactor(const word& name) const
 
     if (fieldRelaxDict_.found(name))
     {
-        return readScalar(fieldRelaxDict_.lookup(name));
+        return fieldRelaxDict_.get<scalar>(name);
     }
     else if (fieldRelaxDefault_ > SMALL)
     {
@@ -303,7 +303,7 @@ Foam::scalar Foam::solution::equationRelaxationFactor(const word& name) const
 
     if (eqnRelaxDict_.found(name))
     {
-        return readScalar(eqnRelaxDict_.lookup(name));
+        return eqnRelaxDict_.get<scalar>(name);
     }
     else if (eqnRelaxDefault_ > SMALL)
     {
@@ -327,12 +327,10 @@ const Foam::dictionary& Foam::solution::solutionDict() const
 {
     if (found("select"))
     {
-        return subDict(word(lookup("select")));
-    }
-    else
-    {
-        return *this;
+        return subDict(get<word>("select"));
     }
+
+    return *this;
 }
 
 
@@ -366,10 +364,8 @@ bool Foam::solution::read()
 
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 
diff --git a/src/OpenFOAM/matrices/tolerances/tolerances.C b/src/OpenFOAM/matrices/tolerances/tolerances.C
index 8d4303cfac..76e4440a13 100644
--- a/src/OpenFOAM/matrices/tolerances/tolerances.C
+++ b/src/OpenFOAM/matrices/tolerances/tolerances.C
@@ -93,13 +93,13 @@ bool Foam::tolerances::relax(const word& name) const
 
 Foam::scalar Foam::tolerances::relaxationFactor(const word& name) const
 {
-    return readScalar(relaxationFactors_.lookup(name));
+    return relaxationFactors_.get<scalar>(name);
 }
 
 
 Foam::scalar Foam::tolerances::solverTolerance(const word& name) const
 {
-    return readScalar(solverTolerances_.lookup(name));
+    return solverTolerances_.get<scalar>(name);
 }
 
 
@@ -111,7 +111,7 @@ bool Foam::tolerances::solverRelativeTolerances() const
 
 Foam::scalar Foam::tolerances::solverRelativeTolerance(const word& name) const
 {
-    return readScalar(solverRelativeTolerances_.lookup(name));
+    return solverRelativeTolerances_.get<scalar>(name);
 }
 
 
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index 42b89d400d..9288f7809b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -109,8 +109,8 @@ Foam::processorPolyPatch::processorPolyPatch
 )
 :
     coupledPolyPatch(name, dict, index, bm, patchType),
-    myProcNo_(readLabel(dict.lookup("myProcNo"))),
-    neighbProcNo_(readLabel(dict.lookup("neighbProcNo"))),
+    myProcNo_(dict.get<label>("myProcNo")),
+    neighbProcNo_(dict.get<label>("neighbProcNo")),
     neighbFaceCentres_(),
     neighbFaceAreas_(),
     neighbFaceCellCentres_()
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index f1cb956a57..2c9a8aaedf 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -146,12 +146,12 @@ Foam::polyPatch::polyPatch
         faceSubList
         (
             bm.mesh().faces(),
-            readLabel(dict.lookup("nFaces")),
-            readLabel(dict.lookup("startFace"))
+            dict.get<label>("nFaces"),
+            dict.get<label>("startFace")
         ),
         bm.mesh().points()
     ),
-    start_(readLabel(dict.lookup("startFace"))),
+    start_(dict.get<label>("startFace")),
     boundaryMesh_(bm),
     faceCellsPtr_(nullptr),
     mePtr_(nullptr)
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index 4ddc9123dc..93836d807b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -209,12 +209,12 @@ Foam::Function1Types::CSV<Type>::CSV
 )
 :
     TableBase<Type>(entryName, dict),
-    nHeaderLine_(readLabel(dict.lookup("nHeaderLine"))),
-    refColumn_(readLabel(dict.lookup("refColumn"))),
+    nHeaderLine_(dict.get<label>("nHeaderLine")),
+    refColumn_(dict.get<label>("refColumn")),
     componentColumns_(dict.lookup("componentColumns")),
-    separator_(dict.lookupOrDefault<string>("separator", string(","))[0]),
-    mergeSeparators_(readBool(dict.lookup("mergeSeparators"))),
-    fName_(fName != fileName::null ? fName : dict.lookup("file"))
+    separator_(dict.lookupOrDefault<string>("separator", ",")[0]),
+    mergeSeparators_(dict.get<bool>("mergeSeparators")),
+    fName_(fName.empty() ? dict.get<fileName>("file") : fName)
 {
     if (componentColumns_.size() != pTraits<Type>::nComponents)
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
index 1f39dafa3e..61b5435b6a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
@@ -30,7 +30,7 @@ License
 void Foam::Function1Types::ramp::read(const dictionary& coeffs)
 {
     start_ = coeffs.lookupOrDefault<scalar>("start", 0);
-    duration_ = coeffs.get<scalar>("duration");
+    coeffs.readEntry("duration", duration_);
 }
 
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
index 6ba0630240..ea72a774f9 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
@@ -72,7 +72,7 @@ convectiveHeatTransferFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    L_(readScalar(dict.lookup("L")))
+    L_(dict.get<scalar>("L"))
 {}
 
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
index fefc7a9409..9a9da7fa01 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
@@ -77,8 +77,8 @@ lumpedMassWallTemperatureFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF),
     temperatureCoupledBase(patch(), dict),
-    Cp_(readScalar(dict.lookup("Cp"))),
-    mass_(readScalar(dict.lookup("mass"))),
+    Cp_(dict.get<scalar>("Cp")),
+    mass_(dict.get<scalar>("mass")),
     curTimeIndex_(-1)
 {
     refGrad() = 0.0;
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
index 16335a2ba2..0e4f3e24a3 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
@@ -63,7 +63,7 @@ outletMachNumberPressureFvPatchScalarField
 :
     fixedValueFvPatchScalarField(p, iF, dict),
     M_(dict.lookupOrDefault<scalar>("M", 0.0)),
-    pBack_(readScalar(dict.lookup("pBack"))),
+    pBack_(dict.get<scalar>("pBack")),
     c1_(dict.lookupOrDefault<scalar>("c1", 0.0)),
     A1_(dict.lookupOrDefault<scalar>("A1", 0.0)),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index 3cf2ce56d6..28b3f220f1 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -76,7 +76,7 @@ outletMappedUniformInletHeatAdditionFvPatchField
     fixedValueFvPatchScalarField(p, iF, dict),
     outletPatchName_(dict.lookup("outletPatch")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    Q_(readScalar(dict.lookup("Q"))),
+    Q_(dict.get<scalar>("Q")),
     TMin_(dict.lookupOrDefault<scalar>("TMin", 0)),
     TMax_(dict.lookupOrDefault<scalar>("TMax", 5000))
 {}
diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
index f4988cd4aa..cb337c1d0b 100644
--- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
@@ -175,7 +175,7 @@ alphatJayatillekeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    Prt_(readScalar(dict.lookup("Prt"))), // force read to avoid ambiguity
+    Prt_(dict.get<scalar>("Prt")), // force read to avoid ambiguity
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     E_(dict.lookupOrDefault<scalar>("E", 9.8))
 {
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
index d12932df9a..2d01bf89bc 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C
@@ -161,10 +161,7 @@ Foam::LESModels::smoothDelta::smoothDelta
     ),
     maxDeltaRatio_
     (
-        readScalar
-        (
-            dict.optionalSubDict(type() + "Coeffs").lookup("maxDeltaRatio")
-        )
+        dict.optionalSubDict(type() + "Coeffs").get<scalar>("maxDeltaRatio")
     )
 {
     calcDelta();
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
index b4ef0a2bb8..56982e732a 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
@@ -86,7 +86,7 @@ Foam::anisotropicFilter::anisotropicFilter
     LESfilter(mesh),
     widthCoeff_
     (
-        readScalar(bd.optionalSubDict(type() + "Coeffs").lookup("widthCoeff"))
+        bd.optionalSubDict(type() + "Coeffs").get<scalar>("widthCoeff")
     ),
     coeff_
     (
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
index 8f2e985c98..8d48acabf4 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
@@ -66,7 +66,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, const dictionary& bd)
     LESfilter(mesh),
     widthCoeff_
     (
-        readScalar(bd.optionalSubDict(type() + "Coeffs").lookup("widthCoeff"))
+        bd.optionalSubDict(type() + "Coeffs").get<scalar>("widthCoeff")
     ),
     coeff_
     (
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index 5da68948f9..cbf192fe9a 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -78,7 +78,7 @@ turbulentMixingLengthDissipationRateInletFvPatchScalarField
 )
 :
     inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(readScalar(dict.lookup("mixingLength"))),
+    mixingLength_(dict.get<scalar>("mixingLength")),
     kName_(dict.lookupOrDefault<word>("k", "k"))
 {
     this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 7107217c85..84ae93b19d 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -76,7 +76,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 )
 :
     inletOutletFvPatchScalarField(p, iF),
-    mixingLength_(readScalar(dict.lookup("mixingLength"))),
+    mixingLength_(dict.get<scalar>("mixingLength")),
     kName_(dict.lookupOrDefault<word>("k", "k"))
 {
     this->phiName_ = dict.lookupOrDefault<word>("phi", "phi");
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index be957dcaac..2dced993d6 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -58,7 +58,7 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     D_(Function1<scalar>::New("D", dict)),
     I_(Function1<scalar>::New("I", dict)),
-    length_(readScalar(dict.lookup("length"))),
+    length_(dict.get<scalar>("length")),
     uniformJump_(dict.lookupOrDefault("uniformJump", false))
 {
     fvPatchField<scalar>::operator=
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
index cef7574691..5e256b515b 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C
@@ -238,9 +238,9 @@ nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField
 )
 :
     nutWallFunctionFvPatchScalarField(p, iF, dict),
-    roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
-    roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
-    roughnessFactor_(readScalar(dict.lookup("roughnessFactor")))
+    roughnessHeight_(dict.get<scalar>("roughnessHeight")),
+    roughnessConstant_(dict.get<scalar>("roughnessConstant")),
+    roughnessFactor_(dict.get<scalar>("roughnessFactor"))
 {}
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
index aabf2bab69..9c4faaf498 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
@@ -52,8 +52,8 @@ atmBoundaryLayer::atmBoundaryLayer(const vectorField& p, const dictionary& dict)
     zDir_(dict.lookup("zDir")),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
     Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
-    Uref_(readScalar(dict.lookup("Uref"))),
-    Zref_(readScalar(dict.lookup("Zref"))),
+    Uref_(dict.get<scalar>("Uref")),
+    Zref_(dict.get<scalar>("Zref")),
     z0_("z0", dict, p.size()),
     zGround_("zGround", dict, p.size()),
     Ustar_(p.size())
diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
index 6686114c1d..cd5407a8b9 100644
--- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
+++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C
@@ -48,7 +48,7 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::setPorosityCoefficient
     {
         const labelList& cellZoneIDs = pm.cellZoneIDs();
 
-        const scalar Cpm = readScalar(pm.dict().lookup(C.name()));
+        const scalar Cpm = pm.dict().get<scalar>(C.name());
 
         for (const label zonei : cellZoneIDs)
         {
@@ -75,7 +75,7 @@ void kEpsilonLopesdaCosta<BasicTurbulenceModel>::setCdSigma
         const labelList& cellZoneIDs = pm.cellZoneIDs();
         const scalarField& Sigma = pm.Sigma();
 
-        const scalar Cpm = readScalar(pm.dict().lookup(C.name()));
+        const scalar Cpm = pm.dict().get<scalar>(C.name());
 
         for (const label zonei : cellZoneIDs)
         {
diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
index e5d13f50e9..c138ee9336 100644
--- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
+++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
@@ -60,7 +60,7 @@ Foam::porosityModels::powerLawLopesdaCostaZone::powerLawLopesdaCostaZone
     vector zDir(coeffs.lookup("zDir"));
 
     // Span of the search for the cells in the porous region
-    scalar searchSpan(readScalar(coeffs.lookup("searchSpan")));
+    scalar searchSpan(coeffs.get<scalar>("searchSpan"));
 
     // Top surface file name defining the extent of the porous region
     word topSurfaceFileName(coeffs.lookup("topSurface"));
@@ -305,8 +305,8 @@ Foam::porosityModels::powerLawLopesdaCosta::powerLawLopesdaCosta
         dict,
         powerLawLopesdaCostaZone::zoneName_
     ),
-    Cd_(readScalar(coeffs_.lookup("Cd"))),
-    C1_(readScalar(coeffs_.lookup("C1"))),
+    Cd_(coeffs_.get<scalar>("Cd")),
+    C1_(coeffs_.get<scalar>("C1")),
     rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho"))
 {}
 
diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C
index aef2d8a24a..8e0b549839 100644
--- a/src/combustionModels/FSD/FSD.C
+++ b/src/combustionModels/FSD/FSD.C
@@ -76,12 +76,12 @@ FSD<ReactionThermo, ThermoType>::FSD
     ),
     YFuelFuelStream_(dimensionedScalar("YFuelStream", dimless, 1.0)),
     YO2OxiStream_(dimensionedScalar("YOxiStream", dimless, 0.23)),
-    Cv_(readScalar(this->coeffs().lookup("Cv"))),
+    Cv_(this->coeffs().getScalar("Cv")),
     C_(5.0),
     ftMin_(0.0),
     ftMax_(1.0),
     ftDim_(300),
-    ftVarMin_(readScalar(this->coeffs().lookup("ftVarMin")))
+    ftVarMin_(this->coeffs().getScalar("ftVarMin"))
 {}
 
 
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
index 4e87601c0f..afdc516f38 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
@@ -39,10 +39,10 @@ Foam::consumptionSpeed::consumptionSpeed
 (
     const dictionary& dict
 )
-:   omega0_(readScalar(dict.lookup("omega0"))),
-    eta_(readScalar(dict.lookup("eta"))),
-    sigmaExt_(readScalar(dict.lookup("sigmaExt"))),
-    omegaMin_(readScalar(dict.lookup("omegaMin")))
+:   omega0_(dict.get<scalar>("omega0")),
+    eta_(dict.get<scalar>("eta")),
+    sigmaExt_(dict.get<scalar>("sigmaExt")),
+    omegaMin_(dict.get<scalar>("omegaMin"))
 {}
 
 
diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
index 5d17baa771..f3d23c6a78 100644
--- a/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
+++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/relaxation/relaxation.C
@@ -57,11 +57,8 @@ Foam::reactionRateFlameAreaModels::relaxation::relaxation
 :
     reactionRateFlameArea(modelType, dict, mesh, combModel),
     correlation_(dict.optionalSubDict(typeName + "Coeffs").subDict(fuel_)),
-    C_(readScalar(dict.optionalSubDict(typeName + "Coeffs").lookup("C"))),
-    alpha_
-    (
-        readScalar(dict.optionalSubDict(typeName + "Coeffs").lookup("alpha"))
-    )
+    C_(dict.optionalSubDict(typeName + "Coeffs").get<scalar>("C")),
+    alpha_(dict.optionalSubDict(typeName + "Coeffs").get<scalar>("alpha"))
 {}
 
 
diff --git a/src/combustionModels/PaSR/PaSR.C b/src/combustionModels/PaSR/PaSR.C
index 2dd35b878e..113e643f57 100644
--- a/src/combustionModels/PaSR/PaSR.C
+++ b/src/combustionModels/PaSR/PaSR.C
@@ -37,7 +37,7 @@ Foam::combustionModels::PaSR<ReactionThermo>::PaSR
 )
 :
     laminar<ReactionThermo>(modelType, thermo, turb, combustionProperties),
-    Cmix_(readScalar(this->coeffs().lookup("Cmix"))),
+    Cmix_(this->coeffs().getScalar("Cmix")),
     kappa_
     (
         IOobject
diff --git a/src/combustionModels/diffusion/diffusion.C b/src/combustionModels/diffusion/diffusion.C
index b4a919e0c4..0bc874883d 100644
--- a/src/combustionModels/diffusion/diffusion.C
+++ b/src/combustionModels/diffusion/diffusion.C
@@ -49,7 +49,7 @@ diffusion<ReactionThermo, ThermoType>::diffusion
         turb,
         combustionProperties
     ),
-    C_(readScalar(this->coeffs().lookup("C"))),
+    C_(this->coeffs().getScalar("C")),
     oxidantName_(this->coeffs().template lookupOrDefault<word>("oxidant", "O2"))
 {}
 
diff --git a/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.C b/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.C
index 4f95db380f..ed63f0f246 100644
--- a/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.C
+++ b/src/combustionModels/eddyDissipationDiffusionModel/eddyDissipationDiffusionModel.C
@@ -48,7 +48,7 @@ eddyDissipationDiffusionModel
         turb,
         combustionProperties
     ),
-    Cd_(readScalar(this->coeffs().lookup("Cd")))
+    Cd_(this->coeffs().getScalar("Cd"))
 {}
 
 
diff --git a/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.C b/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.C
index a2f280f5b8..cd7f45e7db 100644
--- a/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.C
+++ b/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.C
@@ -48,7 +48,7 @@ eddyDissipationModelBase<ReactionThermo, ThermoType>::eddyDissipationModelBase
         turb,
         combustionProperties
     ),
-    CEDC_(readScalar(this->coeffs().lookup("CEDC")))
+    CEDC_(this->coeffs().getScalar("CEDC"))
 {}
 
 
diff --git a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
index eb80809feb..68661ee081 100644
--- a/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
+++ b/src/combustionModels/infinitelyFastChemistry/infinitelyFastChemistry.C
@@ -48,7 +48,7 @@ infinitelyFastChemistry<ReactionThermo, ThermoType>::infinitelyFastChemistry
         turb,
         combustionProperties
     ),
-    C_(readScalar(this->coeffs().lookup("C")))
+    C_(this->coeffs().getScalar("C"))
 {}
 
 
diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
index 718aedd69a..f5800e556d 100644
--- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C
+++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C
@@ -57,7 +57,7 @@ singleStepCombustion<ReactionThermo, ThermoType>::singleStepCombustion
         this->mesh(),
         dimensionedScalar(dimMass/dimVolume/dimTime, Zero)
     ),
-    semiImplicit_(readBool(this->coeffs_.lookup("semiImplicit")))
+    semiImplicit_(this->coeffs_.getBool("semiImplicit"))
 {
     if (isA<singleStepReactingMixture<ThermoType>>(this->thermo()))
     {
diff --git a/src/conversion/ccm/writer/ccmWriterSolution.C b/src/conversion/ccm/writer/ccmWriterSolution.C
index 5a48e864e6..32f7e01ee8 100644
--- a/src/conversion/ccm/writer/ccmWriterSolution.C
+++ b/src/conversion/ccm/writer/ccmWriterSolution.C
@@ -371,7 +371,7 @@ void Foam::ccm::writer::writeSolution
 
             if (io.typeHeaderOk<IOdictionary>(true))
             {
-                timeIndex = IOdictionary(io).get<label>("index");
+                IOdictionary(io).readEntry("index", timeIndex);
             }
         }
 
diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
index 03e4290f3e..a25277ed9c 100644
--- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
+++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
@@ -57,9 +57,9 @@ Foam::dynamicInkJetFvMesh::dynamicInkJetFvMesh(const IOobject& io)
             )
         ).optionalSubDict(typeName + "Coeffs")
     ),
-    amplitude_(readScalar(dynamicMeshCoeffs_.lookup("amplitude"))),
-    frequency_(readScalar(dynamicMeshCoeffs_.lookup("frequency"))),
-    refPlaneX_(readScalar(dynamicMeshCoeffs_.lookup("refPlaneX"))),
+    amplitude_(dynamicMeshCoeffs_.get<scalar>("amplitude")),
+    frequency_(dynamicMeshCoeffs_.get<scalar>("frequency")),
+    refPlaneX_(dynamicMeshCoeffs_.get<scalar>("refPlaneX")),
     stationaryPoints_
     (
         IOobject
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 266d2c3dbf..466b7d4e5e 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -192,10 +192,8 @@ void Foam::dynamicRefineFvMesh::readDict()
         ).optionalSubDict(typeName + "Coeffs")
     );
 
-    List<Pair<word>> fluxVelocities = List<Pair<word>>
-    (
-        refineDict.lookup("correctFluxes")
-    );
+    auto fluxVelocities = refineDict.get<List<Pair<word>>>("correctFluxes");
+
     // Rework into hashtable.
     correctFluxes_.resize(fluxVelocities.size());
     forAll(fluxVelocities, i)
@@ -203,7 +201,7 @@ void Foam::dynamicRefineFvMesh::readDict()
         correctFluxes_.insert(fluxVelocities[i][0], fluxVelocities[i][1]);
     }
 
-    dumpLevel_ = refineDict.get<bool>("dumpLevel");
+    refineDict.readEntry("dumpLevel", dumpLevel_);
 }
 
 
@@ -1209,7 +1207,7 @@ bool Foam::dynamicRefineFvMesh::update()
         ).optionalSubDict(typeName + "Coeffs")
     );
 
-    label refineInterval = readLabel(refineDict.lookup("refineInterval"));
+    label refineInterval = refineDict.get<label>("refineInterval");
 
     bool hasChanged = false;
 
@@ -1236,7 +1234,7 @@ bool Foam::dynamicRefineFvMesh::update()
 
     if (time().timeIndex() > 0 && time().timeIndex() % refineInterval == 0)
     {
-        label maxCells = readLabel(refineDict.lookup("maxCells"));
+        label maxCells = refineDict.get<label>("maxCells");
 
         if (maxCells <= 0)
         {
@@ -1247,7 +1245,7 @@ bool Foam::dynamicRefineFvMesh::update()
                 << exit(FatalError);
         }
 
-        label maxRefinement = readLabel(refineDict.lookup("maxRefinement"));
+        label maxRefinement = refineDict.get<label>("maxRefinement");
 
         if (maxRefinement <= 0)
         {
@@ -1258,21 +1256,23 @@ bool Foam::dynamicRefineFvMesh::update()
                 << exit(FatalError);
         }
 
-        const word fieldName(refineDict.lookup("field"));
+        const word fieldName(refineDict.get<word>("field"));
 
         const volScalarField& vFld = lookupObject<volScalarField>(fieldName);
 
         const scalar lowerRefineLevel =
-            readScalar(refineDict.lookup("lowerRefineLevel"));
+            refineDict.get<scalar>("lowerRefineLevel");
         const scalar upperRefineLevel =
-            readScalar(refineDict.lookup("upperRefineLevel"));
+            refineDict.get<scalar>("upperRefineLevel");
+
         const scalar unrefineLevel = refineDict.lookupOrDefault<scalar>
         (
             "unrefineLevel",
             GREAT
         );
+
         const label nBufferLayers =
-            readLabel(refineDict.lookup("nBufferLayers"));
+            refineDict.get<label>("nBufferLayers");
 
         // Cells marked for refinement or otherwise protected from unrefinement.
         bitSet refineCell(nCells());
diff --git a/src/dynamicMesh/boundaryPatch/boundaryPatch.C b/src/dynamicMesh/boundaryPatch/boundaryPatch.C
index 9655b995bb..11ac059902 100644
--- a/src/dynamicMesh/boundaryPatch/boundaryPatch.C
+++ b/src/dynamicMesh/boundaryPatch/boundaryPatch.C
@@ -52,8 +52,8 @@ Foam::boundaryPatch::boundaryPatch
 )
 :
     patchIdentifier(name, dict, index),
-    size_(readLabel(dict.lookup("nFaces"))),
-    start_(readLabel(dict.lookup("startFace")))
+    size_(dict.get<label>("nFaces")),
+    start_(dict.get<label>("startFace"))
 {}
 
 
diff --git a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
index da956b3403..2642507098 100644
--- a/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
+++ b/src/dynamicMesh/extrudePatchMesh/extrudePatchMesh.C
@@ -145,7 +145,7 @@ void extrudePatchMesh::extrudeMesh(const List<polyPatch*>& regionPatches)
 {
     if (this->boundaryMesh().size() == 0)
     {
-        bool columnCells = readBool(dict_.lookup("columnCells"));
+        const bool columnCells = dict_.get<bool>("columnCells");
 
         bitSet nonManifoldEdge(extrudedPatch_.nEdges());
         for (label edgeI = 0; edgeI < extrudedPatch_.nInternalEdges(); edgeI++)
diff --git a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
index 631f247c5c..e5854a771a 100644
--- a/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
+++ b/src/dynamicMesh/layerAdditionRemoval/layerAdditionRemoval.C
@@ -168,8 +168,8 @@ Foam::layerAdditionRemoval::layerAdditionRemoval
 :
     polyMeshModifier(name, index, ptc, dict.get<bool>("active")),
     faceZoneID_(dict.lookup("faceZoneName"), ptc.mesh().faceZones()),
-    minLayerThickness_(readScalar(dict.lookup("minLayerThickness"))),
-    maxLayerThickness_(readScalar(dict.lookup("maxLayerThickness"))),
+    minLayerThickness_(dict.get<scalar>("minLayerThickness")),
+    maxLayerThickness_(dict.get<scalar>("maxLayerThickness")),
     thicknessFromVolume_(dict.lookupOrDefault("thicknessFromVolume", true)),
     oldLayerThickness_(readOldThickness(dict)),
     pointsPairingPtr_(nullptr),
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index a5be6f412b..e565582e86 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -728,12 +728,12 @@ Foam::scalar Foam::motionSmootherAlgo::setErrorReduction
     const scalar errorReduction
 )
 {
-    scalar oldErrorReduction = readScalar(paramDict_.lookup("errorReduction"));
+    scalar old = paramDict_.get<scalar>("errorReduction");
 
     paramDict_.remove("errorReduction");
     paramDict_.add("errorReduction", errorReduction);
 
-    return oldErrorReduction;
+    return old;
 }
 
 
@@ -890,10 +890,8 @@ bool Foam::motionSmootherAlgo::scaleMesh
         }
     }
 
-    const scalar errorReduction =
-        readScalar(paramDict.lookup("errorReduction"));
-    const label nSmoothScale =
-        readLabel(paramDict.lookup("nSmoothScale"));
+    const scalar errorReduction = paramDict.get<scalar>("errorReduction");
+    const label nSmoothScale = paramDict.get<label>("nSmoothScale");
 
 
     // Note: displacement_ should already be synced already from setDisplacement
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
index 2521d3932f..8a5aadee53 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
@@ -62,53 +62,53 @@ bool Foam::motionSmootherAlgo::checkMesh
 {
     const scalar maxNonOrtho
     (
-        readScalar(dict.lookup("maxNonOrtho", true))
+        dict.get<scalar>("maxNonOrtho", true)
     );
     const scalar minVol
     (
-        readScalar(dict.lookup("minVol", true))
+        dict.get<scalar>("minVol", true)
     );
     const scalar minTetQuality
     (
-        readScalar(dict.lookup("minTetQuality", true))
+        dict.get<scalar>("minTetQuality", true)
     );
     const scalar maxConcave
     (
-        readScalar(dict.lookup("maxConcave", true))
+        dict.get<scalar>("maxConcave", true)
     );
     const scalar minArea
     (
-        readScalar(dict.lookup("minArea", true))
+        dict.get<scalar>("minArea", true)
     );
     const scalar maxIntSkew
     (
-        readScalar(dict.lookup("maxInternalSkewness", true))
+        dict.get<scalar>("maxInternalSkewness", true)
     );
     const scalar maxBounSkew
     (
-        readScalar(dict.lookup("maxBoundarySkewness", true))
+        dict.get<scalar>("maxBoundarySkewness", true)
     );
     const scalar minWeight
     (
-        readScalar(dict.lookup("minFaceWeight", true))
+        dict.get<scalar>("minFaceWeight", true)
     );
     const scalar minVolRatio
     (
-        readScalar(dict.lookup("minVolRatio", true))
+        dict.get<scalar>("minVolRatio", true)
     );
     const scalar minTwist
     (
-        readScalar(dict.lookup("minTwist", true))
+        dict.get<scalar>("minTwist", true)
     );
     const scalar minTriangleTwist
     (
-        readScalar(dict.lookup("minTriangleTwist", true))
+        dict.get<scalar>("minTriangleTwist", true)
     );
     scalar minFaceFlatness = -1.0;
     dict.readIfPresent("minFaceFlatness", minFaceFlatness, true);
     const scalar minDet
     (
-        readScalar(dict.lookup("minDeterminant", true))
+        dict.get<scalar>("minDeterminant", true)
     );
     label nWrongFaces = 0;
 
@@ -467,53 +467,53 @@ bool Foam::motionSmootherAlgo::checkMesh
 {
     const scalar maxNonOrtho
     (
-        readScalar(dict.lookup("maxNonOrtho", true))
+        dict.get<scalar>("maxNonOrtho", true)
     );
     const scalar minVol
     (
-        readScalar(dict.lookup("minVol", true))
+        dict.get<scalar>("minVol", true)
     );
     const scalar minTetQuality
     (
-        readScalar(dict.lookup("minTetQuality", true))
+        dict.get<scalar>("minTetQuality", true)
     );
     const scalar maxConcave
     (
-        readScalar(dict.lookup("maxConcave", true))
+        dict.get<scalar>("maxConcave", true)
     );
     const scalar minArea
     (
-        readScalar(dict.lookup("minArea", true))
+        dict.get<scalar>("minArea", true)
     );
     const scalar maxIntSkew
     (
-        readScalar(dict.lookup("maxInternalSkewness", true))
+        dict.get<scalar>("maxInternalSkewness", true)
     );
     const scalar maxBounSkew
     (
-        readScalar(dict.lookup("maxBoundarySkewness", true))
+        dict.get<scalar>("maxBoundarySkewness", true)
     );
     const scalar minWeight
     (
-        readScalar(dict.lookup("minFaceWeight", true))
+        dict.get<scalar>("minFaceWeight", true)
     );
     const scalar minVolRatio
     (
-        readScalar(dict.lookup("minVolRatio", true))
+        dict.get<scalar>("minVolRatio", true)
     );
     const scalar minTwist
     (
-        readScalar(dict.lookup("minTwist", true))
+        dict.get<scalar>("minTwist", true)
     );
     const scalar minTriangleTwist
     (
-        readScalar(dict.lookup("minTriangleTwist", true))
+        dict.get<scalar>("minTriangleTwist", true)
     );
     scalar minFaceFlatness = -1.0;
     dict.readIfPresent("minFaceFlatness", minFaceFlatness, true);
     const scalar minDet
     (
-        readScalar(dict.lookup("minDeterminant", true))
+        dict.get<scalar>("minDeterminant", true)
     );
     label nWrongFaces = 0;
 
diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C
index 977ac41e0b..8751b82df0 100644
--- a/src/dynamicMesh/perfectInterface/perfectInterface.C
+++ b/src/dynamicMesh/perfectInterface/perfectInterface.C
@@ -104,7 +104,7 @@ Foam::perfectInterface::perfectInterface
     const polyTopoChanger& mme
 )
 :
-    polyMeshModifier(name, index, mme, readBool(dict.lookup("active"))),
+    polyMeshModifier(name, index, mme, dict.get<bool>("active")),
     faceZoneID_
     (
         dict.lookup("faceZoneName"),
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.C
index 74082b280f..d6632f339f 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilterSettings.C
@@ -38,14 +38,14 @@ Foam::polyMeshFilterSettings::polyMeshFilterSettings(const dictionary& dict)
     collapseEdgesCoeffDict_(dict_.subDict("collapseEdgesCoeffs")),
     collapseFacesCoeffDict_(dict_.subOrEmptyDict("collapseFacesCoeffs")),
     meshQualityCoeffDict_(dict_.subOrEmptyDict("controlMeshQualityCoeffs")),
-    minLen_(readScalar(collapseEdgesCoeffDict_.lookup("minimumEdgeLength"))),
+    minLen_(collapseEdgesCoeffDict_.get<scalar>("minimumEdgeLength")),
     maxCos_
     (
         ::cos
         (
             degToRad
             (
-                readScalar(collapseEdgesCoeffDict_.lookup("maximumMergeAngle"))
+                collapseEdgesCoeffDict_.get<scalar>("maximumMergeAngle")
             )
         )
     ),
diff --git a/src/engine/ignition/ignitionSiteIO.C b/src/engine/ignition/ignitionSiteIO.C
index 9c068394c4..e5d2d460d8 100644
--- a/src/engine/ignition/ignitionSiteIO.C
+++ b/src/engine/ignition/ignitionSiteIO.C
@@ -39,22 +39,22 @@ Foam::ignitionSite::ignitionSite
     mesh_(mesh),
     ignitionSiteDict_(is),
     location_(ignitionSiteDict_.lookup("location")),
-    diameter_(readScalar(ignitionSiteDict_.lookup("diameter"))),
+    diameter_(ignitionSiteDict_.get<scalar>("diameter")),
     time_
     (
         db_.userTimeToTime
         (
-            readScalar(ignitionSiteDict_.lookup("start"))
+            ignitionSiteDict_.get<scalar>("start")
         )
     ),
     duration_
     (
         db_.userTimeToTime
         (
-            readScalar(ignitionSiteDict_.lookup("duration"))
+            ignitionSiteDict_.get<scalar>("duration")
         )
     ),
-    strength_(readScalar(ignitionSiteDict_.lookup("strength"))),
+    strength_(ignitionSiteDict_.get<scalar>("strength")),
     timeIndex_(db_.timeIndex())
 {
     // Check state of Istream
@@ -75,22 +75,28 @@ Foam::ignitionSite::ignitionSite
     mesh_(mesh),
     ignitionSiteDict_(is),
     location_(ignitionSiteDict_.lookup("location")),
-    diameter_(readScalar(ignitionSiteDict_.lookup("diameter"))),
+    diameter_(ignitionSiteDict_.get<scalar>("diameter")),
     time_
     (
         db_.userTimeToTime
         (
-            edb.userTimeToTime(readScalar(ignitionSiteDict_.lookup("start")))
+            edb.userTimeToTime
+            (
+                ignitionSiteDict_.get<scalar>("start")
+            )
         )
     ),
     duration_
     (
         db_.userTimeToTime
         (
-            edb.userTimeToTime(readScalar(ignitionSiteDict_.lookup("duration")))
+            edb.userTimeToTime
+            (
+                ignitionSiteDict_.get<scalar>("duration")
+            )
         )
     ),
-    strength_(readScalar(ignitionSiteDict_.lookup("strength"))),
+    strength_(ignitionSiteDict_.get<scalar>("strength")),
     timeIndex_(db_.timeIndex())
 {
     // Check state of Istream
diff --git a/src/engine/include/StCorr.H b/src/engine/include/StCorr.H
index c3bdc5771f..b49fee3262 100644
--- a/src/engine/include/StCorr.H
+++ b/src/engine/include/StCorr.H
@@ -18,12 +18,9 @@
                     // Assume it is part-spherical
                     scalar sphereFraction
                     (
-                        readScalar
+                        combustionProperties.get<scalar>
                         (
-                            combustionProperties.lookup
-                            (
-                                "ignitionSphereFraction"
-                            )
+                            "ignitionSphereFraction"
                         )
                     );
 
@@ -47,12 +44,9 @@
 
                     scalar circleFraction
                     (
-                        readScalar
+                        combustionProperties.get<scalar>
                         (
-                            combustionProperties.lookup
-                            (
-                                "ignitionCircleFraction"
-                            )
+                            "ignitionCircleFraction"
                         )
                     );
 
diff --git a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
index d3f05c47ac..5f79132947 100644
--- a/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
+++ b/src/finiteArea/faMesh/faPatches/constraint/processor/processorFaPatch.H
@@ -160,8 +160,8 @@ public:
         )
         :
             coupledFaPatch(name, dict, index, bm),
-            myProcNo_(readLabel(dict.lookup("myProcNo"))),
-            neighbProcNo_(readLabel(dict.lookup("neighbProcNo"))),
+            myProcNo_(dict.get<label>("myProcNo")),
+            neighbProcNo_(dict.get<label>("neighbProcNo")),
             neighbEdgeCentres_(),
             neighbEdgeLengths_(),
             neighbEdgeFaceCentres_(),
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.C
index 4f9f090641..eab33b3ad7 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/rpm/rpm.C
@@ -62,7 +62,7 @@ bool Foam::SRF::rpm::read()
 {
     if (SRFModel::read())
     {
-        rpm_ = SRFModelCoeffs_.get<scalar>("rpm");
+        SRFModelCoeffs_.readEntry("rpm", rpm_);
 
         omega_.value() = axis_*rpmToRads(rpm_);
 
diff --git a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
index 51c222005e..f5cc8f48c6 100644
--- a/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
+++ b/src/finiteVolume/cfdTools/general/findRefCell/findRefCell.C
@@ -47,7 +47,7 @@ bool Foam::setRefCell
         {
             if (Pstream::master())
             {
-                refCelli = readLabel(dict.lookup(refCellName));
+                dict.readEntry(refCellName, refCelli);
 
                 if (refCelli < 0 || refCelli >= field.mesh().nCells())
                 {
@@ -66,7 +66,7 @@ bool Foam::setRefCell
         }
         else if (dict.found(refPointName))
         {
-            point refPointi(dict.lookup(refPointName));
+            point refPointi(dict.get<point>(refPointName));
 
             // Try fast approximate search avoiding octree construction
             refCelli = field.mesh().findCell(refPointi, polyMesh::FACE_PLANES);
@@ -107,14 +107,12 @@ bool Foam::setRefCell
                 << " or " << refPointName << nl << exit(FatalIOError);
         }
 
-        refValue = readScalar(dict.lookup(refValueName));
+        dict.readEntry(refValueName, refValue);
 
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/include/alphaControls.H b/src/finiteVolume/cfdTools/general/include/alphaControls.H
index 796a59a3f1..cb751b43ae 100644
--- a/src/finiteVolume/cfdTools/general/include/alphaControls.H
+++ b/src/finiteVolume/cfdTools/general/include/alphaControls.H
@@ -1,8 +1,8 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
+label nAlphaCorr(alphaControls.get<label>("nAlphaCorr"));
 
-label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
+label nAlphaSubCycles(alphaControls.get<label>("nAlphaSubCycles"));
 
 bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));
 
diff --git a/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.C b/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.C
index bcd8ebd5f0..64714450ce 100644
--- a/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.C
+++ b/src/finiteVolume/cfdTools/general/pressureControl/pressureControl.C
@@ -39,7 +39,7 @@ Foam::pressureControl::pressureControl
     refCell_(-1),
     refValue_(0),
     pMax_("pMax", dimPressure, GREAT),
-    pMin_("pMin", dimPressure, 0),
+    pMin_("pMin", dimPressure, Zero),
     limitMaxP_(false),
     limitMinP_(false)
 {
@@ -58,10 +58,8 @@ Foam::pressureControl::pressureControl
 
     if (dict.found("pMax") && dict.found("pMin"))
     {
-        pMax_.value() = readScalar(dict.lookup("pMax"));
-        limitMaxP_ = true;
-        pMin_.value() = readScalar(dict.lookup("pMin"));
-        limitMinP_ = true;
+        dict.readEntry("pMax", pMax_.value()); limitMaxP_ = true;
+        dict.readEntry("pMin", pMin_.value()); limitMinP_ = true;
     }
     else
     {
@@ -97,9 +95,8 @@ Foam::pressureControl::pressureControl
             reduce(rhoRefMin, minOp<scalar>());
         }
 
-        if (dict.found("pMax"))
+        if (dict.readIfPresent("pMax", pMax_.value()))
         {
-            pMax_.value() = readScalar(dict.lookup("pMax"));
             limitMaxP_ = true;
         }
         else if (dict.found("pMaxFactor"))
@@ -114,8 +111,7 @@ Foam::pressureControl::pressureControl
                     << exit(FatalIOError);
             }
 
-            const scalar pMaxFactor(readScalar(dict.lookup("pMaxFactor")));
-            pMax_.value() = pMaxFactor*pMax;
+            pMax_.value() = pMax * dict.get<scalar>("pMaxFactor");
             limitMaxP_ = true;
         }
         else if (dict.found("rhoMax"))
@@ -154,9 +150,8 @@ Foam::pressureControl::pressureControl
             limitMaxP_ = true;
         }
 
-        if (dict.found("pMin"))
+        if (dict.readIfPresent("pMin", pMin_.value()))
         {
-            pMin_.value() = readScalar(dict.lookup("pMin"));
             limitMinP_ = true;
         }
         else if (dict.found("pMinFactor"))
@@ -171,8 +166,7 @@ Foam::pressureControl::pressureControl
                     << exit(FatalIOError);
             }
 
-            const scalar pMinFactor(readScalar(dict.lookup("pMinFactor")));
-            pMin_.value() = pMinFactor*pMin;
+            pMin_.value() = pMin * dict.get<scalar>("pMinFactor");
             limitMinP_ = true;
         }
         else if (dict.found("rhoMin"))
@@ -260,10 +254,8 @@ bool Foam::pressureControl::limit(volScalarField& p) const
 
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
index 93e809efe5..d304f9cd4f 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
@@ -67,7 +67,7 @@ void Foam::solutionControl::read(const bool absTolOnly)
 
             if (absTolOnly)
             {
-                fd.absTol = readScalar(residualDict.lookup(fName));
+                fd.absTol = residualDict.get<scalar>(fName);
                 fd.relTol = -1;
                 fd.initialResidual = -1;
             }
@@ -76,8 +76,8 @@ void Foam::solutionControl::read(const bool absTolOnly)
                 if (iter().isDict())
                 {
                     const dictionary& fieldDict(iter().dict());
-                    fd.absTol = readScalar(fieldDict.lookup("tolerance"));
-                    fd.relTol = readScalar(fieldDict.lookup("relTol"));
+                    fd.absTol = fieldDict.get<scalar>("tolerance");
+                    fd.relTol = fieldDict.get<scalar>("relTol");
                     fd.initialResidual = 0.0;
                 }
                 else
@@ -96,15 +96,15 @@ void Foam::solutionControl::read(const bool absTolOnly)
             fieldData& fd = data[fieldi];
             if (absTolOnly)
             {
-                fd.absTol = readScalar(residualDict.lookup(fName));
+                fd.absTol = residualDict.get<scalar>(fName);
             }
             else
             {
                 if (iter().isDict())
                 {
                     const dictionary& fieldDict(iter().dict());
-                    fd.absTol = readScalar(fieldDict.lookup("tolerance"));
-                    fd.relTol = readScalar(fieldDict.lookup("relTol"));
+                    fd.absTol = fieldDict.get<scalar>("tolerance");
+                    fd.relTol = fieldDict.get<scalar>("relTol");
                 }
                 else
                 {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index 7b5a591063..2e8fd4ef43 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
@@ -89,7 +89,7 @@ activeBaffleVelocityFvPatchVectorField
     pName_(dict.lookupOrDefault<word>("p", "p")),
     cyclicPatchName_(dict.lookup("cyclicPatch")),
     cyclicPatchLabel_(p.patch().boundaryMesh().findPatchID(cyclicPatchName_)),
-    orientation_(readLabel(dict.lookup("orientation"))),
+    orientation_(dict.get<label>("orientation")),
     initWallSf_(p.Sf()),
     initCyclicSf_(p.boundaryMesh()[cyclicPatchLabel_].Sf()),
     nbrCyclicSf_
@@ -100,9 +100,9 @@ activeBaffleVelocityFvPatchVectorField
             dict
         ).neighbFvPatch().Sf()
     ),
-    openFraction_(readScalar(dict.lookup("openFraction"))),
-    openingTime_(readScalar(dict.lookup("openingTime"))),
-    maxOpenFractionDelta_(readScalar(dict.lookup("maxOpenFractionDelta"))),
+    openFraction_(dict.get<scalar>("openFraction")),
+    openingTime_(dict.get<scalar>("openingTime")),
+    maxOpenFractionDelta_(dict.get<scalar>("maxOpenFractionDelta")),
     curTimeIndex_(-1)
 {
     fvPatchVectorField::operator=(Zero);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index 9981cc1451..af7e199f85 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -98,14 +98,14 @@ activePressureForceBaffleVelocityFvPatchVectorField
     initWallSf_(0),
     initCyclicSf_(0),
     nbrCyclicSf_(0),
-    openFraction_(readScalar(dict.lookup("openFraction"))),
-    openingTime_(readScalar(dict.lookup("openingTime"))),
-    maxOpenFractionDelta_(readScalar(dict.lookup("maxOpenFractionDelta"))),
+    openFraction_(dict.get<scalar>("openFraction")),
+    openingTime_(dict.get<scalar>("openingTime")),
+    maxOpenFractionDelta_(dict.get<scalar>("maxOpenFractionDelta")),
     curTimeIndex_(-1),
-    minThresholdValue_(readScalar(dict.lookup("minThresholdValue"))),
-    fBased_(readBool(dict.lookup("forceBased"))),
+    minThresholdValue_(dict.get<scalar>("minThresholdValue")),
+    fBased_(dict.get<bool>("forceBased")),
     baffleActivated_(0),
-    opening_(readBool(dict.lookup("opening")))
+    opening_(dict.get<bool>("opening"))
 {
     fvPatchVectorField::operator=(Zero);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index 0d97a44926..36f3ce9bde 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -67,7 +67,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
     fixedValueFvPatchField<Type>(p, iF, dict, false),
     profile_(Function1<Type>::New("profile", dict)),
     dir_(dict.lookup("direction")),
-    origin_(readScalar(dict.lookup("origin")))
+    origin_(dict.get<scalar>("origin"))
 {
     if (mag(dir_) < SMALL)
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
index 679cb12055..463dbda48a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C
@@ -78,7 +78,7 @@ inletOutletTotalTemperatureFvPatchScalarField
     inletOutletFvPatchScalarField(p, iF),
     UName_(dict.lookupOrDefault<word>("U", "U")),
     psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
-    gamma_(readScalar(dict.lookup("gamma"))),
+    gamma_(dict.get<scalar>("gamma")),
     T0_("T0", dict, p.size())
 {
     this->patchType() = dict.lookupOrDefault<word>("patchType", word::null);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
index b1fef5b04b..5431a50408 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C
@@ -72,7 +72,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField
 )
 :
     mixedFvPatchField<vector>(p, iF),
-    Umean_(readScalar(dict.lookup("Umean"))),
+    Umean_(dict.get<scalar>("Umean")),
     alphaName_(dict.lookup("alpha"))
 {
     patchType() = dict.lookupOrDefault<word>("patchType", word::null);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
index 31d6c14f2c..99cd84fd4e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/phaseHydrostaticPressure/phaseHydrostaticPressureFvPatchScalarField.C
@@ -61,8 +61,8 @@ phaseHydrostaticPressureFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF),
     phaseFraction_(dict.lookupOrDefault<word>("phaseFraction", "alpha")),
-    rho_(readScalar(dict.lookup("rho"))),
-    pRefValue_(readScalar(dict.lookup("pRefValue"))),
+    rho_(dict.get<scalar>("rho")),
+    pRefValue_(dict.get<scalar>("pRefValue")),
     pRefPoint_(dict.lookup("pRefPoint"))
 {
     this->patchType() = dict.lookupOrDefault<word>("patchType", word::null);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
index 2b10b1441a..76521a7610 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C
@@ -66,23 +66,17 @@ Foam::plenumPressureFvPatchScalarField::plenumPressureFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    gamma_(readScalar(dict.lookup("gamma"))),
-    R_(readScalar(dict.lookup("R"))),
-    supplyMassFlowRate_(readScalar(dict.lookup("supplyMassFlowRate"))),
-    supplyTotalTemperature_
-    (
-        readScalar(dict.lookup("supplyTotalTemperature"))
-    ),
-    plenumVolume_(readScalar(dict.lookup("plenumVolume"))),
-    plenumDensity_(readScalar(dict.lookup("plenumDensity"))),
-    plenumTemperature_(readScalar(dict.lookup("plenumTemperature"))),
+    gamma_(dict.get<scalar>("gamma")),
+    R_(dict.get<scalar>("R")),
+    supplyMassFlowRate_(dict.get<scalar>("supplyMassFlowRate")),
+    supplyTotalTemperature_(dict.get<scalar>("supplyTotalTemperature")),
+    plenumVolume_(dict.get<scalar>("plenumVolume")),
+    plenumDensity_(dict.get<scalar>("plenumDensity")),
+    plenumTemperature_(dict.get<scalar>("plenumTemperature")),
     rho_(1.0),
     hasRho_(false),
-    inletAreaRatio_(readScalar(dict.lookup("inletAreaRatio"))),
-    inletDischargeCoefficient_
-    (
-        readScalar(dict.lookup("inletDischargeCoefficient"))
-    ),
+    inletAreaRatio_(dict.get<scalar>("inletAreaRatio")),
+    inletDischargeCoefficient_(dict.get<scalar>("inletDischargeCoefficient")),
     timeScale_(dict.lookupOrDefault<scalar>("timeScale", 0.0)),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     UName_(dict.lookupOrDefault<word>("U", "U"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
index 2101867dc5..0db2d9b520 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -139,14 +139,14 @@ pressurePIDControlInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(p, iF, dict),
     upstreamName_(dict.lookup("upstream")),
     downstreamName_(dict.lookup("downstream")),
-    deltaP_(readScalar(dict.lookup("deltaP"))),
+    deltaP_(dict.get<scalar>("deltaP")),
     shapeFactor_(dict.lookupOrDefault<scalar>("shapeFactor", 0)),
     pName_(dict.lookupOrDefault<word>("p", "p")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "none")),
-    P_(readScalar(dict.lookup("P"))),
-    I_(readScalar(dict.lookup("I"))),
-    D_(readScalar(dict.lookup("D"))),
+    P_(dict.get<scalar>("P")),
+    I_(dict.get<scalar>("I")),
+    D_(dict.get<scalar>("D")),
     Q_(- gSum(*this & patch().Sf())),
     error_(dict.lookupOrDefault<scalar>("error", 0)),
     errorIntegral_(dict.lookupOrDefault<scalar>("errorIntegral", 0)),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
index 39c06df42c..283fc587dd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C
@@ -65,9 +65,9 @@ supersonicFreestreamFvPatchVectorField
     pName_(dict.lookupOrDefault<word>("p", "p")),
     psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
     UInf_(dict.lookup("UInf")),
-    pInf_(readScalar(dict.lookup("pInf"))),
-    TInf_(readScalar(dict.lookup("TInf"))),
-    gamma_(readScalar(dict.lookup("gamma")))
+    pInf_(dict.get<scalar>("pInf")),
+    TInf_(dict.get<scalar>("TInf")),
+    gamma_(dict.get<scalar>("gamma"))
 {
     patchType() = dict.lookupOrDefault<word>("patchType", word::null);
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index a086f89160..c2ce94841b 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
@@ -51,16 +51,16 @@ Foam::syringePressureFvPatchScalarField::syringePressureFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict, false),
-    Ap_(readScalar(dict.lookup("Ap"))),
-    Sp_(readScalar(dict.lookup("Sp"))),
-    VsI_(readScalar(dict.lookup("VsI"))),
-    tas_(readScalar(dict.lookup("tas"))),
-    tae_(readScalar(dict.lookup("tae"))),
-    tds_(readScalar(dict.lookup("tds"))),
-    tde_(readScalar(dict.lookup("tde"))),
-    psI_(readScalar(dict.lookup("psI"))),
-    psi_(readScalar(dict.lookup("psi"))),
-    ams_(readScalar(dict.lookup("ams"))),
+    Ap_(dict.get<scalar>("Ap")),
+    Sp_(dict.get<scalar>("Sp")),
+    VsI_(dict.get<scalar>("VsI")),
+    tas_(dict.get<scalar>("tas")),
+    tae_(dict.get<scalar>("tae")),
+    tds_(dict.get<scalar>("tds")),
+    tde_(dict.get<scalar>("tde")),
+    psI_(dict.get<scalar>("psI")),
+    psi_(dict.get<scalar>("psi")),
+    ams_(dict.get<scalar>("ams")),
     ams0_(ams_),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     curTimeIndex_(-1)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
index 65461cc9c4..38bd259767 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C
@@ -60,7 +60,7 @@ Foam::totalPressureFvPatchScalarField::totalPressureFvPatchScalarField
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     psiName_(dict.lookupOrDefault<word>("psi", "none")),
-    gamma_(psiName_ != "none" ? readScalar(dict.lookup("gamma")) : 1),
+    gamma_(psiName_ != "none" ? dict.get<scalar>("gamma") : 1),
     p0_("p0", dict, p.size())
 {
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
index 771ebb53d8..6f8f3bfb3c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C
@@ -74,7 +74,7 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField
     UName_(dict.lookupOrDefault<word>("U", "U")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
-    gamma_(readScalar(dict.lookup("gamma"))),
+    gamma_(dict.get<scalar>("gamma")),
     T0_("T0", dict, p.size())
 {
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 911305d020..e22a895833 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -818,7 +818,7 @@ turbulentDFSEMInletFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict),
-    delta_(readScalar(dict.lookup("delta"))),
+    delta_(dict.get<scalar>("delta")),
     d_(dict.lookupOrDefault<scalar>("d", 1)),
     kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index 14ec2d187f..cca880908c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -70,7 +70,7 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
 )
 :
     inletOutletFvPatchScalarField(p, iF),
-    intensity_(readScalar(dict.lookup("intensity"))),
+    intensity_(dict.get<scalar>("intensity")),
     UName_(dict.lookupOrDefault<word>("U", "U"))
 {
     this->patchType() = dict.lookupOrDefault<word>("patchType", word::null);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index fb6367a51a..f8c6a08e08 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -55,8 +55,8 @@ uniformDensityHydrostaticPressureFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict, false),
-    rho_(readScalar(dict.lookup("rho"))),
-    pRefValue_(readScalar(dict.lookup("pRefValue"))),
+    rho_(dict.get<scalar>("rho")),
+    pRefValue_(dict.get<scalar>("pRefValue")),
     pRefPoint_(dict.lookup("pRefPoint"))
 {
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index eee8af784c..eb25d6cc9f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -61,7 +61,7 @@ uniformTotalPressureFvPatchScalarField
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     psiName_(dict.lookupOrDefault<word>("psi", "none")),
-    gamma_(psiName_ != "none" ? readScalar(dict.lookup("gamma")) : 1),
+    gamma_(psiName_ != "none" ? dict.get<scalar>("gamma") : 1),
     p0_(Function1<scalar>::New("p0", dict))
 {
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
index 9f9f89865a..3293e1f3d8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRate/variableHeightFlowRateFvPatchField.C
@@ -75,8 +75,8 @@ Foam::variableHeightFlowRateFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    lowerBound_(readScalar(dict.lookup("lowerBound"))),
-    upperBound_(readScalar(dict.lookup("upperBound")))
+    lowerBound_(dict.get<scalar>("lowerBound")),
+    upperBound_(dict.get<scalar>("upperBound"))
 {
     patchType() = dict.lookupOrDefault<word>("patchType", word::null);
     this->refValue() = 0.0;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index 863ede5a13..26a6420ede 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -71,7 +71,7 @@ Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 :
     advectiveFvPatchField<Type>(p, iF, dict),
     psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
-    gamma_(readScalar(dict.lookup("gamma")))
+    gamma_(dict.get<scalar>("gamma"))
 {}
 
 
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
index e1b990dc42..8642df377b 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C
@@ -153,7 +153,7 @@ void Foam::MULES::limiterCorr
 
     const label nLimiterIter
     (
-        readLabel(MULEScontrols.lookup("nLimiterIter"))
+        MULEScontrols.get<label>("nLimiterIter")
     );
 
     const scalar smoothLimiter
diff --git a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C
index dfa72c168a..67cc8c22f1 100644
--- a/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C
+++ b/src/finiteVolume/fvMesh/simplifiedFvMesh/columnFvMesh/columnFvMesh.C
@@ -80,11 +80,11 @@ bool Foam::simplifiedMeshes::columnFvMeshInfo::setPatchEntries
 
         for (const entry& e : allPatchEntries)
         {
-            const word type(e.dict().lookup("type"));
+            const word type(e.dict().get<word>("type"));
 
             if (!constraintPatches.found(type))
             {
-                if (readLabel(e.dict().lookup("nFaces")))
+                if (e.dict().get<label>("nFaces"))
                 {
                     ++nPatchWithFace_;
                 }
@@ -131,7 +131,7 @@ bool Foam::simplifiedMeshes::columnFvMeshInfo::setPatchEntries
 
         for (const entry& e : boundaryFieldDict)
         {
-            const word type(e.dict().lookup("type"));
+            const word type(e.dict().get<word>("type"));
 
             if (simplifiedFvMesh::fvPatchFieldExists(type))
             {
@@ -333,7 +333,7 @@ void Foam::simplifiedMeshes::columnFvMeshInfo::addLocalPatches
 
         DebugPout << "Setting " << patchName << endl;
 
-        label nFaces0 = readLabel(patchDict.lookup("nFaces"));
+        label nFaces0 = patchDict.get<label>("nFaces");
 
         if (nFaces0)
         {
diff --git a/src/functionObjects/field/nearWallFields/nearWallFields.C b/src/functionObjects/field/nearWallFields/nearWallFields.C
index b40a6355b3..214bea81de 100644
--- a/src/functionObjects/field/nearWallFields/nearWallFields.C
+++ b/src/functionObjects/field/nearWallFields/nearWallFields.C
@@ -261,8 +261,8 @@ bool Foam::functionObjects::nearWallFields::read(const dictionary& dict)
     fvMeshFunctionObject::read(dict);
 
     dict.readEntry("fields", fieldSet_);
+    dict.readEntry("distance", distance_);
     patchSet_ = mesh_.boundaryMesh().patchSet(dict.get<wordRes>("patches"));
-    distance_ = dict.get<scalar>("distance");
 
 
     // Clear out any previously loaded fields
diff --git a/src/functionObjects/field/valueAverage/valueAverage.C b/src/functionObjects/field/valueAverage/valueAverage.C
index 3b34734e97..d76581a06f 100644
--- a/src/functionObjects/field/valueAverage/valueAverage.C
+++ b/src/functionObjects/field/valueAverage/valueAverage.C
@@ -87,7 +87,7 @@ Foam::functionObjects::valueAverage::valueAverage
             if (dict.found(fieldName))
             {
                 const dictionary& valueDict = dict.subDict(fieldName);
-                totalTime_[fieldi] = valueDict.get<scalar>("totalTime");
+                valueDict.readEntry("totalTime", totalTime_[fieldi]);
             }
         }
     }
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
index 9b1834de5d..643bd0df19 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.C
@@ -170,14 +170,14 @@ Foam::MGridGenGAMGAgglomeration::MGridGenGAMGAgglomeration
     fvMesh_(refCast<const fvMesh>(mesh))
 {
     // Min, max size of agglomerated cells
-    label minSize(readLabel(controlDict.lookup("minSize")));
-    label maxSize(readLabel(controlDict.lookup("maxSize")));
+    label minSize(controlDict.get<label>("minSize"));
+    label maxSize(controlDict.get<label>("maxSize"));
 
     // Number of iterations applied to improve agglomeration consistency across
     // processor boundaries
     label nProcConsistencyIter
     (
-        readLabel(controlDict.lookup("nProcConsistencyIter"))
+        controlDict.get<label>("nProcConsistencyIter")
     );
 
     // Start geometric agglomeration from the cell volumes and areas of the mesh
diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
index 914a43c9ef..98d04727cb 100644
--- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
+++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C
@@ -208,11 +208,11 @@ Foam::pairPatchAgglomeration::pairPatchAgglomeration
     maxLevels_(50),
     nFacesInCoarsestLevel_
     (
-        readLabel(controlDict.lookup("nFacesInCoarsestLevel"))
+        controlDict.get<label>("nFacesInCoarsestLevel")
     ),
     nGlobalFacesInCoarsestLevel_(labelMax),
     //(
-    //    readLabel(controlDict.lookup("nGlobalFacesInCoarsestLevel"))
+    //    controlDict.get<label>("nGlobalFacesInCoarsestLevel")
     //),
     featureAngle_
     (
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C
index 5fd2a85ed0..f099a5728f 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C
@@ -81,7 +81,7 @@ surfaceAlignedSBRStressFvMotionSolver
     minAng_(coeffDict().lookupOrDefault<scalar>("minAng", 20.0)),
     accFactor_(coeffDict().lookupOrDefault<scalar>("accFactor", 1.0)),
     smoothFactor_(coeffDict().lookupOrDefault<scalar>("smoothFactor", 0.9)),
-    nNonOrthogonalCorr_(readLabel(coeffDict().lookup("nNonOrthogonalCorr"))),
+    nNonOrthogonalCorr_(coeffDict().get<label>("nNonOrthogonalCorr")),
     pointDisplacement_(pointDisplacement()),
     sigmaD_
     (
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index 843b115d07..534ddd4881 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -64,9 +64,9 @@ angularOscillatingDisplacementPointPatchVectorField
     fixedValuePointPatchField<vector>(p, iF, dict),
     axis_(dict.lookup("axis")),
     origin_(dict.lookup("origin")),
-    angle0_(readScalar(dict.lookup("angle0"))),
-    amplitude_(readScalar(dict.lookup("amplitude"))),
-    omega_(readScalar(dict.lookup("omega")))
+    angle0_(dict.get<scalar>("angle0")),
+    amplitude_(dict.get<scalar>("amplitude")),
+    omega_(dict.get<scalar>("omega"))
 {
     if (!dict.found("value"))
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index 3f64821dd7..7331832f9e 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -64,9 +64,9 @@ angularOscillatingVelocityPointPatchVectorField
     fixedValuePointPatchField<vector>(p, iF, dict),
     axis_(dict.lookup("axis")),
     origin_(dict.lookup("origin")),
-    angle0_(readScalar(dict.lookup("angle0"))),
-    amplitude_(readScalar(dict.lookup("amplitude"))),
-    omega_(readScalar(dict.lookup("omega")))
+    angle0_(dict.get<scalar>("angle0")),
+    amplitude_(dict.get<scalar>("amplitude")),
+    omega_(dict.get<scalar>("omega"))
 {
     if (!dict.found("value"))
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
index 98e83d7b88..2e5122917f 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
@@ -59,7 +59,7 @@ oscillatingDisplacementPointPatchVectorField
 :
     fixedValuePointPatchField<vector>(p, iF, dict),
     amplitude_(dict.lookup("amplitude")),
-    omega_(readScalar(dict.lookup("omega")))
+    omega_(dict.get<scalar>("omega"))
 {
     if (!dict.found("value"))
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index f99d538528..8aa059cd7a 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -60,7 +60,7 @@ oscillatingVelocityPointPatchVectorField
 :
     fixedValuePointPatchField<vector>(p, iF, dict),
     amplitude_(dict.lookup("amplitude")),
-    omega_(readScalar(dict.lookup("omega")))
+    omega_(dict.get<scalar>("omega"))
 {
     if (!dict.found("value"))
     {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
index e5196ceab9..c7cb9b7fff 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/waveDisplacement/waveDisplacementPointPatchVectorField.C
@@ -55,7 +55,7 @@ waveDisplacementPointPatchVectorField
 :
     fixedValuePointPatchField<vector>(p, iF, dict),
     amplitude_(dict.lookup("amplitude")),
-    omega_(readScalar(dict.lookup("omega"))),
+    omega_(dict.get<scalar>("omega")),
     waveNumber_(dict.lookupOrDefault<vector>("waveNumber", Zero))
 {
     if (!dict.found("value"))
diff --git a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
index 4b9835fee0..c4a4b25376 100644
--- a/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
+++ b/src/fvOptions/constraints/derived/velocityDampingConstraint/velocityDampingConstraint.C
@@ -122,7 +122,7 @@ bool Foam::fv::velocityDampingConstraint::read(const dictionary& dict)
 {
     if (cellSetOption::read(dict))
     {
-        UMax_ = coeffs_.get<scalar>("UMax");
+        coeffs_.readEntry("UMax", UMax_);
 
         if (!coeffs_.readIfPresent("UNames", fieldNames_))
         {
diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
index fd2d7a82ed..fa0c19e398 100644
--- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
@@ -225,9 +225,9 @@ void Foam::targetCoeffTrim::read(const dictionary& dict)
         ext = "Coeff";
     }
 
-    target_[0] = targetDict.get<scalar>("thrust" + ext);
-    target_[1] = targetDict.get<scalar>("pitch" + ext);
-    target_[2] = targetDict.get<scalar>("roll" + ext);
+    targetDict.readEntry("thrust" + ext, target_[0]);
+    targetDict.readEntry("pitch" + ext, target_[1]);
+    targetDict.readEntry("roll" + ext, target_[2]);
 
     const dictionary& pitchAngleDict(coeffs_.subDict("pitchAngles"));
     theta_[0] = degToRad(pitchAngleDict.get<scalar>("theta0Ini"));
@@ -245,7 +245,7 @@ void Foam::targetCoeffTrim::read(const dictionary& dict)
         dTheta_ = degToRad(dTheta_);
     }
 
-    alpha_ = coeffs_.get<scalar>("alpha");
+    coeffs_.readEntry("alpha", alpha_);
 }
 
 
diff --git a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
index 60cbf5b943..5fc0c9695e 100644
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@@ -79,7 +79,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
         {
             if (CpName_ == "CpRef")
             {
-                scalar CpRef = coeffs_.get<scalar>("CpRef");
+                const scalar CpRef = coeffs_.get<scalar>("CpRef");
 
                 return tmp<volScalarField>::New
                 (
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
index c74a87ecc8..f58ebd0adf 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C
@@ -65,11 +65,12 @@ Foam::fv::variableHeatTransfer::variableHeatTransfer
 {
     if (master_)
     {
-        a_ = coeffs_.get<scalar>("a");
-        b_ = coeffs_.get<scalar>("b");
-        c_ = coeffs_.get<scalar>("c");
-        ds_ = coeffs_.get<scalar>("ds");
-        Pr_ = coeffs_.get<scalar>("Pr");
+        coeffs_.readEntry("a", a_);
+        coeffs_.readEntry("b", b_);
+        coeffs_.readEntry("c", c_);
+        coeffs_.readEntry("ds", ds_);
+        coeffs_.readEntry("Pr", Pr_);
+
         AoV_.reset
         (
             new volScalarField
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 80ba38e403..1a3d43b0b3 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -84,10 +84,10 @@ void Foam::DSMCCloud<ParcelType>::initialise
 
     const scalar temperature
     (
-        readScalar(dsmcInitialiseDict.lookup("temperature"))
+        dsmcInitialiseDict.get<scalar>("temperature")
     );
 
-    const vector velocity(dsmcInitialiseDict.lookup("velocity"));
+    const vector velocity(dsmcInitialiseDict.get<vector>("velocity"));
 
     const dictionary& numberDensitiesDict
     (
@@ -100,10 +100,7 @@ void Foam::DSMCCloud<ParcelType>::initialise
 
     forAll(molecules, i)
     {
-        numberDensities[i] = readScalar
-        (
-            numberDensitiesDict.lookup(molecules[i])
-        );
+        numberDensities[i] = numberDensitiesDict.get<scalar>(molecules[i]);
     }
 
     numberDensities /= nParticle_;
@@ -491,7 +488,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
         )
     ),
     typeIdList_(particleProperties_.lookup("typeIdList")),
-    nParticle_(readScalar(particleProperties_.lookup("nEquivalentParticles"))),
+    nParticle_(particleProperties_.get<scalar>("nEquivalentParticles")),
     cellOccupancy_(mesh_.nCells()),
     sigmaTcRMax_
     (
@@ -722,7 +719,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
         )
     ),
     typeIdList_(particleProperties_.lookup("typeIdList")),
-    nParticle_(readScalar(particleProperties_.lookup("nEquivalentParticles"))),
+    nParticle_(particleProperties_.get<scalar>("nEquivalentParticles")),
     cellOccupancy_(),
     sigmaTcRMax_
     (
diff --git a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H
index 2bff944e14..1f8bc481de 100644
--- a/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H
+++ b/src/lagrangian/DSMC/parcels/Templates/DSMCParcel/DSMCParcelI.H
@@ -41,13 +41,10 @@ inline Foam::DSMCParcel<ParcelType>::constantProperties::constantProperties
     const dictionary& dict
 )
 :
-    mass_(readScalar(dict.lookup("mass"))),
-    d_(readScalar(dict.lookup("diameter"))),
-    internalDegreesOfFreedom_
-    (
-        readInt(dict.lookup("internalDegreesOfFreedom"))
-    ),
-    omega_(readScalar(dict.lookup("omega")))
+    mass_(dict.get<scalar>("mass")),
+    d_(dict.get<scalar>("diameter")),
+    internalDegreesOfFreedom_(dict.get<int>("internalDegreesOfFreedom")),
+    omega_(dict.get<scalar>("omega"))
 {}
 
 
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index 248c75c9aa..bc14fd8c91 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -98,10 +98,10 @@ LarsenBorgnakkeVariableHardSphere
 )
 :
     BinaryCollisionModel<CloudType>(dict, cloud, typeName),
-    Tref_(readScalar(this->coeffDict().lookup("Tref"))),
+    Tref_(this->coeffDict().getScalar("Tref")),
     relaxationCollisionNumber_
     (
-        readScalar(this->coeffDict().lookup("relaxationCollisionNumber"))
+        this->coeffDict().getScalar("relaxationCollisionNumber")
     )
 {}
 
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
index 3f20bd3bf9..369f9447b1 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
@@ -38,7 +38,7 @@ Foam::VariableHardSphere<CloudType>::VariableHardSphere
 )
 :
     BinaryCollisionModel<CloudType>(dict, cloud, typeName),
-    Tref_(readScalar(this->coeffDict().lookup("Tref")))
+    Tref_(this->coeffDict().getScalar("Tref"))
 {}
 
 
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index 4d6b0a184c..12594a53ab 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -78,7 +78,7 @@ Foam::FreeStream<CloudType>::FreeStream
         particleFluxAccumulators_[p] = List<Field<scalar>>
         (
             molecules.size(),
-            Field<scalar>(patch.size(), 0.0)
+            Field<scalar>(patch.size(), Zero)
         );
     }
 
@@ -88,10 +88,7 @@ Foam::FreeStream<CloudType>::FreeStream
 
     forAll(molecules, i)
     {
-        numberDensities_[i] = readScalar
-        (
-            numberDensitiesDict.lookup(molecules[i])
-        );
+        numberDensities_[i] = numberDensitiesDict.get<scalar>(molecules[i]);
 
         moleculeTypeIds_[i] = cloud.typeIdList().find(molecules[i]);
 
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
index 4fe4f0649d..19f95b245b 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
@@ -35,7 +35,7 @@ Foam::MixedDiffuseSpecular<CloudType>::MixedDiffuseSpecular
 )
 :
     WallInteractionModel<CloudType>(dict, cloud, typeName),
-    diffuseFraction_(readScalar(this->coeffDict().lookup("diffuseFraction")))
+    diffuseFraction_(this->coeffDict().getScalar("diffuseFraction"))
 {}
 
 
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index e51e59f1d7..5785c6fd6d 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -38,8 +38,8 @@ Foam::COxidationDiffusionLimitedRate<CloudType>::COxidationDiffusionLimitedRate
 )
 :
     SurfaceReactionModel<CloudType>(dict, owner, typeName),
-    Sb_(readScalar(this->coeffDict().lookup("Sb"))),
-    D_(readScalar(this->coeffDict().lookup("D"))),
+    Sb_(this->coeffDict().getScalar("Sb")),
+    D_(this->coeffDict().getScalar("D")),
     CsLocalId_(-1),
     O2GlobalId_(owner.composition().carrierId("O2")),
     CO2GlobalId_(owner.composition().carrierId("CO2")),
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
index d198deaf91..bd70e8cc0f 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationHurtMitchell/COxidationHurtMitchell.C
@@ -36,7 +36,7 @@ Foam::COxidationHurtMitchell<CloudType>::COxidationHurtMitchell
 )
 :
     SurfaceReactionModel<CloudType>(dict, owner, typeName),
-    Sb_(readScalar(this->coeffDict().lookup("Sb"))),
+    Sb_(this->coeffDict().getScalar("Sb")),
     CsLocalId_(-1),
     ashLocalId_(-1),
     O2GlobalId_(owner.composition().carrierId("O2")),
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
index 77435d66b4..e19fa95a65 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C
@@ -38,13 +38,13 @@ Foam::COxidationIntrinsicRate<CloudType>::COxidationIntrinsicRate
 )
 :
     SurfaceReactionModel<CloudType>(dict, owner, typeName),
-    Sb_(readScalar(this->coeffDict().lookup("Sb"))),
-    C1_(readScalar(this->coeffDict().lookup("C1"))),
-    rMean_(readScalar(this->coeffDict().lookup("rMean"))),
-    theta_(readScalar(this->coeffDict().lookup("theta"))),
-    Ai_(readScalar(this->coeffDict().lookup("Ai"))),
-    Ei_(readScalar(this->coeffDict().lookup("Ei"))),
-    Ag_(readScalar(this->coeffDict().lookup("Ag"))),
+    Sb_(this->coeffDict().getScalar("Sb")),
+    C1_(this->coeffDict().getScalar("C1")),
+    rMean_(this->coeffDict().getScalar("rMean")),
+    theta_(this->coeffDict().getScalar("theta")),
+    Ai_(this->coeffDict().getScalar("Ai")),
+    Ei_(this->coeffDict().getScalar("Ei")),
+    Ag_(this->coeffDict().getScalar("Ag")),
     tau_(this->coeffDict().lookupOrDefault("tau", sqrt(2.0))),
     CsLocalId_(-1),
     O2GlobalId_(owner.composition().carrierId("O2")),
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index f59317f407..a32af174b3 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -37,10 +37,10 @@ COxidationKineticDiffusionLimitedRate
 )
 :
     SurfaceReactionModel<CloudType>(dict, owner, typeName),
-    Sb_(readScalar(this->coeffDict().lookup("Sb"))),
-    C1_(readScalar(this->coeffDict().lookup("C1"))),
-    C2_(readScalar(this->coeffDict().lookup("C2"))),
-    E_(readScalar(this->coeffDict().lookup("E"))),
+    Sb_(this->coeffDict().getScalar("Sb")),
+    C1_(this->coeffDict().getScalar("C1")),
+    C2_(this->coeffDict().getScalar("C2")),
+    E_(this->coeffDict().getScalar("E")),
     CsLocalId_(-1),
     O2GlobalId_(owner.composition().carrierId("O2")),
     CO2GlobalId_(owner.composition().carrierId("CO2")),
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index af061f4a3e..286ae5b664 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -45,14 +45,14 @@ Foam::COxidationMurphyShaddix<CloudType>::COxidationMurphyShaddix
 )
 :
     SurfaceReactionModel<CloudType>(dict, owner, typeName),
-    D0_(readScalar(this->coeffDict().lookup("D0"))),
-    rho0_(readScalar(this->coeffDict().lookup("rho0"))),
-    T0_(readScalar(this->coeffDict().lookup("T0"))),
-    Dn_(readScalar(this->coeffDict().lookup("Dn"))),
-    A_(readScalar(this->coeffDict().lookup("A"))),
-    E_(readScalar(this->coeffDict().lookup("E"))),
-    n_(readScalar(this->coeffDict().lookup("n"))),
-    WVol_(readScalar(this->coeffDict().lookup("WVol"))),
+    D0_(this->coeffDict().getScalar("D0")),
+    rho0_(this->coeffDict().getScalar("rho0")),
+    T0_(this->coeffDict().getScalar("T0")),
+    Dn_(this->coeffDict().getScalar("Dn")),
+    A_(this->coeffDict().getScalar("A")),
+    E_(this->coeffDict().getScalar("E")),
+    n_(this->coeffDict().getScalar("n")),
+    WVol_(this->coeffDict().getScalar("WVol")),
     CsLocalId_(-1),
     O2GlobalId_(owner.composition().carrierId("O2")),
     CO2GlobalId_(owner.composition().carrierId("CO2")),
diff --git a/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
index 0ed45f62a2..f48e33c363 100644
--- a/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
+++ b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
@@ -46,10 +46,10 @@ Foam::distributionModels::RosinRammler::RosinRammler
 )
 :
     distributionModel(typeName, dict, rndGen),
-    minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
-    maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
-    d_(readScalar(distributionModelDict_.lookup("d"))),
-    n_(readScalar(distributionModelDict_.lookup("n")))
+    minValue_(distributionModelDict_.get<scalar>("minValue")),
+    maxValue_(distributionModelDict_.get<scalar>("maxValue")),
+    d_(distributionModelDict_.get<scalar>("d")),
+    n_(distributionModelDict_.get<scalar>("n"))
 {
     check();
 }
diff --git a/src/lagrangian/distributionModels/exponential/exponential.C b/src/lagrangian/distributionModels/exponential/exponential.C
index 3253151351..92b2c2335f 100644
--- a/src/lagrangian/distributionModels/exponential/exponential.C
+++ b/src/lagrangian/distributionModels/exponential/exponential.C
@@ -46,9 +46,9 @@ Foam::distributionModels::exponential::exponential
 )
 :
     distributionModel(typeName, dict, rndGen),
-    minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
-    maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
-    lambda_(readScalar(distributionModelDict_.lookup("lambda")))
+    minValue_(distributionModelDict_.get<scalar>("minValue")),
+    maxValue_(distributionModelDict_.get<scalar>("maxValue")),
+    lambda_(distributionModelDict_.get<scalar>("lambda"))
 {
     check();
 }
diff --git a/src/lagrangian/distributionModels/fixedValue/fixedValue.C b/src/lagrangian/distributionModels/fixedValue/fixedValue.C
index 0275a404ad..2213fe9017 100644
--- a/src/lagrangian/distributionModels/fixedValue/fixedValue.C
+++ b/src/lagrangian/distributionModels/fixedValue/fixedValue.C
@@ -46,7 +46,7 @@ Foam::distributionModels::fixedValue::fixedValue
 )
 :
     distributionModel(typeName, dict, rndGen),
-    value_(readScalar(distributionModelDict_.lookup("value")))
+    value_(distributionModelDict_.get<scalar>("value"))
 {}
 
 
diff --git a/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C b/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C
index 23339eca0f..b3d899b850 100644
--- a/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C
+++ b/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C
@@ -46,10 +46,10 @@ Foam::distributionModels::massRosinRammler::massRosinRammler
 )
 :
     distributionModel(typeName, dict, rndGen),
-    minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
-    maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
-    d_(readScalar(distributionModelDict_.lookup("d"))),
-    n_(readScalar(distributionModelDict_.lookup("n")))
+    minValue_(distributionModelDict_.get<scalar>("minValue")),
+    maxValue_(distributionModelDict_.get<scalar>("maxValue")),
+    d_(distributionModelDict_.get<scalar>("d")),
+    n_(distributionModelDict_.get<scalar>("n"))
 {
     check();
 }
diff --git a/src/lagrangian/distributionModels/multiNormal/multiNormal.C b/src/lagrangian/distributionModels/multiNormal/multiNormal.C
index 8779281fc0..b272500ac1 100644
--- a/src/lagrangian/distributionModels/multiNormal/multiNormal.C
+++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.C
@@ -46,8 +46,8 @@ Foam::distributionModels::multiNormal::multiNormal
 )
 :
     distributionModel(typeName, dict, rndGen),
-    minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
-    maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
+    minValue_(distributionModelDict_.get<scalar>("minValue")),
+    maxValue_(distributionModelDict_.get<scalar>("maxValue")),
     range_(maxValue_ - minValue_),
     expectation_(distributionModelDict_.lookup("expectation")),
     variance_(distributionModelDict_.lookup("variance")),
diff --git a/src/lagrangian/distributionModels/normal/normal.C b/src/lagrangian/distributionModels/normal/normal.C
index a6ebd9d594..d8e7d7c246 100644
--- a/src/lagrangian/distributionModels/normal/normal.C
+++ b/src/lagrangian/distributionModels/normal/normal.C
@@ -47,10 +47,10 @@ Foam::distributionModels::normal::normal
 )
 :
     distributionModel(typeName, dict, rndGen),
-    minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
-    maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))),
-    expectation_(readScalar(distributionModelDict_.lookup("expectation"))),
-    variance_(readScalar(distributionModelDict_.lookup("variance"))),
+    minValue_(distributionModelDict_.get<scalar>("minValue")),
+    maxValue_(distributionModelDict_.get<scalar>("maxValue")),
+    expectation_(distributionModelDict_.get<scalar>("expectation")),
+    variance_(distributionModelDict_.get<scalar>("variance")),
     a_(0.147)
 {
     if (minValue_ < 0)
diff --git a/src/lagrangian/distributionModels/uniform/uniform.C b/src/lagrangian/distributionModels/uniform/uniform.C
index ccf60544b5..91ab4c0ea8 100644
--- a/src/lagrangian/distributionModels/uniform/uniform.C
+++ b/src/lagrangian/distributionModels/uniform/uniform.C
@@ -46,8 +46,8 @@ Foam::distributionModels::uniform::uniform
 )
 :
     distributionModel(typeName, dict, rndGen),
-    minValue_(readScalar(distributionModelDict_.lookup("minValue"))),
-    maxValue_(readScalar(distributionModelDict_.lookup("maxValue")))
+    minValue_(distributionModelDict_.get<scalar>("minValue")),
+    maxValue_(distributionModelDict_.get<scalar>("maxValue"))
 {
     check();
 }
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 593da83866..166150a988 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -158,14 +158,15 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
     vector origin(this->coeffDict().lookup("origin"));
 
     this->coeffDict().readEntry("radius", radius_);
-    nSector_ = readLabel(this->coeffDict().lookup("nSector"));
+    this->coeffDict().readEntry("nSector", nSector_);
 
     label nS = nSector_;
 
     vector refDir;
     if (nSector_ > 1)
     {
-        refDir = this->coeffDict().lookup("refDir");
+        this->coeffDict().readEntry("refDir", refDir);
+
         refDir -= normal_[0]*(normal_[0] & refDir);
         refDir.normalise();
     }
@@ -543,7 +544,7 @@ Foam::ParticleCollector<CloudType>::ParticleCollector
     normal_(),
     negateParcelsOppositeNormal_
     (
-        readBool(this->coeffDict().lookup("negateParcelsOppositeNormal"))
+        this->coeffDict().getBool("negateParcelsOppositeNormal")
     ),
     surfaceFormat_(this->coeffDict().lookup("surfaceFormat")),
     resetOnWrite_(this->coeffDict().lookup("resetOnWrite")),
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
index 3da906bcdc..29a8b0a6a5 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleErosion/ParticleErosion.C
@@ -73,7 +73,7 @@ Foam::ParticleErosion<CloudType>::ParticleErosion
     CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
     QPtr_(nullptr),
     patchIDs_(),
-    p_(readScalar(this->coeffDict().lookup("p"))),
+    p_(this->coeffDict().getScalar("p")),
     psi_(this->coeffDict().template lookupOrDefault<scalar>("psi", 2.0)),
     K_(this->coeffDict().template lookupOrDefault<scalar>("K", 2.0))
 {
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
index 850eb320f2..5b9732c069 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
@@ -63,8 +63,8 @@ Foam::ParticleTracks<CloudType>::ParticleTracks
 )
 :
     CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
-    trackInterval_(readLabel(this->coeffDict().lookup("trackInterval"))),
-    maxSamples_(readLabel(this->coeffDict().lookup("maxSamples"))),
+    trackInterval_(this->coeffDict().getLabel("trackInterval")),
+    maxSamples_(this->coeffDict().getLabel("maxSamples")),
     resetOnWrite_(this->coeffDict().lookup("resetOnWrite")),
     faceHitCounter_(),
     cloudPtr_(nullptr)
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
index febe31eb45..30cb2f71f9 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTrap/ParticleTrap.C
@@ -43,7 +43,7 @@ Foam::ParticleTrap<CloudType>::ParticleTrap
     ),
     alphaPtr_(nullptr),
     gradAlphaPtr_(nullptr),
-    threshold_(readScalar(this->coeffDict().lookup("threshold")))
+    threshold_(this->coeffDict().getScalar("threshold"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
index 21752df47f..a4bcb3b36a 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchPostProcessing/PatchPostProcessing.C
@@ -129,7 +129,7 @@ Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
 )
 :
     CloudFunctionObject<CloudType>(dict, owner, modelName, typeName),
-    maxStoredParcels_(readScalar(this->coeffDict().lookup("maxStoredParcels"))),
+    maxStoredParcels_(this->coeffDict().getScalar("maxStoredParcels")),
     patchIDs_(),
     times_(),
     patchData_()
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
index 9640726337..42728aab1f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairCollision.C
@@ -549,7 +549,7 @@ Foam::PairCollision<CloudType>::PairCollision
     il_
     (
         owner.mesh(),
-        readScalar(this->coeffDict().lookup("maxInteractionDistance")),
+        this->coeffDict().getScalar("maxInteractionDistance"),
         this->coeffDict().lookupOrDefault
         (
             "writeReferredParticleCloud",
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 0e4c727a83..621e77222f 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
@@ -89,24 +89,24 @@ Foam::PairSpringSliderDashpot<CloudType>::PairSpringSliderDashpot
     PairModel<CloudType>(dict, cloud, typeName),
     Estar_(),
     Gstar_(),
-    alpha_(readScalar(this->coeffDict().lookup("alpha"))),
-    b_(readScalar(this->coeffDict().lookup("b"))),
-    mu_(readScalar(this->coeffDict().lookup("mu"))),
+    alpha_(this->coeffDict().getScalar("alpha")),
+    b_(this->coeffDict().getScalar("b")),
+    mu_(this->coeffDict().getScalar("mu")),
     cohesionEnergyDensity_
     (
-        readScalar(this->coeffDict().lookup("cohesionEnergyDensity"))
+        this->coeffDict().getScalar("cohesionEnergyDensity")
     ),
     cohesion_(false),
     collisionResolutionSteps_
     (
-        readScalar(this->coeffDict().lookup("collisionResolutionSteps"))
+        this->coeffDict().getScalar("collisionResolutionSteps")
     ),
     volumeFactor_(1.0),
     useEquivalentSize_(Switch(this->coeffDict().lookup("useEquivalentSize")))
 {
     if (useEquivalentSize_)
     {
-        volumeFactor_ = readScalar(this->coeffDict().lookup("volumeFactor"));
+        this->coeffDict().readEntry("volumeFactor", volumeFactor_);
     }
 
     scalar nu = this->owner().constProps().poissonsRatio();
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 d28d6b136f..6db09c10a3 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
@@ -189,17 +189,14 @@ Foam::WallLocalSpringSliderDashpot<CloudType>::WallLocalSpringSliderDashpot
     maxEstarIndex_(-1),
     collisionResolutionSteps_
     (
-        readScalar
-        (
-            this->coeffDict().lookup("collisionResolutionSteps")
-        )
+        this->coeffDict().getScalar("collisionResolutionSteps")
     ),
     volumeFactor_(1.0),
     useEquivalentSize_(Switch(this->coeffDict().lookup("useEquivalentSize")))
 {
     if (useEquivalentSize_)
     {
-        volumeFactor_ = readScalar(this->coeffDict().lookup("volumeFactor"));
+        this->coeffDict().readEntry("volumeFactor", volumeFactor_);
     }
 
     scalar pNu = this->owner().constProps().poissonsRatio();
@@ -243,24 +240,22 @@ Foam::WallLocalSpringSliderDashpot<CloudType>::WallLocalSpringSliderDashpot
 
         patchMap_[wallPatchIndices[wPI]] = wPI;
 
-        scalar nu = readScalar(patchCoeffDict.lookup("poissonsRatio"));
+        scalar nu = patchCoeffDict.get<scalar>("poissonsRatio");
 
-        scalar E = readScalar(patchCoeffDict.lookup("youngsModulus"));
+        scalar E = patchCoeffDict.get<scalar>("youngsModulus");
 
         Estar_[wPI] = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu))/E);
 
         Gstar_[wPI] = 1/(2*((2 + pNu - sqr(pNu))/pE + (2 + nu - sqr(nu))/E));
 
-        alpha_[wPI] = readScalar(patchCoeffDict.lookup("alpha"));
+        alpha_[wPI] = patchCoeffDict.get<scalar>("alpha");
 
-        b_[wPI] = readScalar(patchCoeffDict.lookup("b"));
+        b_[wPI] = patchCoeffDict.get<scalar>("b");
 
-        mu_[wPI] = readScalar(patchCoeffDict.lookup("mu"));
+        mu_[wPI] = patchCoeffDict.get<scalar>("mu");
 
-        cohesionEnergyDensity_[wPI] = readScalar
-        (
-            patchCoeffDict.lookup("cohesionEnergyDensity")
-        );
+        cohesionEnergyDensity_[wPI] =
+            patchCoeffDict.get<scalar>("cohesionEnergyDensity");
 
         cohesion_[wPI] = (mag(cohesionEnergyDensity_[wPI]) > VSMALL);
 
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 a42aeb14b8..5a98974d54 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
@@ -164,32 +164,29 @@ Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
     WallModel<CloudType>(dict, cloud, typeName),
     Estar_(),
     Gstar_(),
-    alpha_(readScalar(this->coeffDict().lookup("alpha"))),
-    b_(readScalar(this->coeffDict().lookup("b"))),
-    mu_(readScalar(this->coeffDict().lookup("mu"))),
+    alpha_(this->coeffDict().getScalar("alpha")),
+    b_(this->coeffDict().getScalar("b")),
+    mu_(this->coeffDict().getScalar("mu")),
     cohesionEnergyDensity_
     (
-        readScalar(this->coeffDict().lookup("cohesionEnergyDensity"))
+        this->coeffDict().getScalar("cohesionEnergyDensity")
     ),
     cohesion_(false),
     collisionResolutionSteps_
     (
-        readScalar
-        (
-            this->coeffDict().lookup("collisionResolutionSteps")
-        )
+        this->coeffDict().getScalar("collisionResolutionSteps")
     ),
     volumeFactor_(1.0),
     useEquivalentSize_(Switch(this->coeffDict().lookup("useEquivalentSize")))
 {
     if (useEquivalentSize_)
     {
-        volumeFactor_ = readScalar(this->coeffDict().lookup("volumeFactor"));
+        this->coeffDict().readEntry("volumeFactor", volumeFactor_);
     }
 
-    scalar nu = readScalar(this->coeffDict().lookup("poissonsRatio"));
+    scalar nu = this->coeffDict().getScalar("poissonsRatio");
 
-    scalar E = readScalar(this->coeffDict().lookup("youngsModulus"));
+    scalar E = this->coeffDict().getScalar("youngsModulus");
 
     scalar pNu = this->owner().constProps().poissonsRatio();
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
index 4c38895e32..c2e998c6f5 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
@@ -170,7 +170,7 @@ Foam::CellZoneInjection<CloudType>::CellZoneInjection
 :
     InjectionModel<CloudType>(dict, owner, modelName, typeName),
     cellZoneName_(this->coeffDict().lookup("cellZone")),
-    numberDensity_(readScalar(this->coeffDict().lookup("numberDensity"))),
+    numberDensity_(this->coeffDict().getScalar("numberDensity")),
     positions_(),
     injectorCells_(),
     injectorTetFaces_(),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 1e203baca6..5636cb069b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -45,10 +45,10 @@ Foam::ConeInjection<CloudType>::ConeInjection
     injectorCells_(positionAxis_.size()),
     injectorTetFaces_(positionAxis_.size()),
     injectorTetPts_(positionAxis_.size()),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    duration_(this->coeffDict().getScalar("duration")),
     parcelsPerInjector_
     (
-        readScalar(this->coeffDict().lookup("parcelsPerInjector"))
+        this->coeffDict().getScalar("parcelsPerInjector")
     ),
     flowRateProfile_
     (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 0f9be70485..e8613476c3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -132,19 +132,16 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
         injectionMethodNames.lookup("injectionMethod", this->coeffDict())
     ),
     flowType_(flowTypeNames.lookup("flowType", this->coeffDict())),
-    outerDiameter_(readScalar(this->coeffDict().lookup("outerDiameter"))),
-    innerDiameter_(readScalar(this->coeffDict().lookup("innerDiameter"))),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    outerDiameter_(this->coeffDict().getScalar("outerDiameter")),
+    innerDiameter_(this->coeffDict().getScalar("innerDiameter")),
+    duration_(this->coeffDict().getScalar("duration")),
     positionVsTime_(owner.db().time(), "position"),
     position_(vector::zero),
     injectorCell_(-1),
     tetFacei_(-1),
     tetPti_(-1),
     direction_(this->coeffDict().lookup("direction")),
-    parcelsPerSecond_
-    (
-        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
-    ),
+    parcelsPerSecond_(this->coeffDict().getScalar("parcelsPerSecond")),
     flowRateProfile_
     (
         TimeFunction1<scalar>
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index 0c457d1ad8..6b0c5f099a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -40,7 +40,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
 )
 :
     InjectionModel<CloudType>(dict, owner, modelName, typeName),
-    factor_(readScalar(this->coeffDict().lookup("factor"))),
+    factor_(this->coeffDict().getScalar("factor")),
     referenceField_
     (
         owner.db().objectRegistry::template lookupObject<volScalarField>
@@ -72,7 +72,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
     injectorTetPts_(positions_.size()),
     nParcelsPerInjector_
     (
-        readLabel(this->coeffDict().lookup("parcelsPerInjector"))
+        this->coeffDict().getLabel("parcelsPerInjector")
     ),
     nParcelsInjected_(positions_.size(), 0),
     U0_(this->coeffDict().lookup("U0")),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index 1c4ecefade..fe89abf142 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -46,7 +46,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
     inflationSetName_(this->coeffDict().lookup("inflationCellSet")),
     generationCells_(),
     inflationCells_(),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    duration_(this->coeffDict().getScalar("duration")),
     flowRateProfile_
     (
         TimeFunction1<scalar>
@@ -83,7 +83,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
 
     if (selfSeed_)
     {
-        dSeed_ = readScalar(this->coeffDict().lookup("dSeed"));
+        this->coeffDict().readEntry("dSeed", dSeed_);
     }
 
     cellSet generationCells(this->owner().mesh(), generationSetName_);
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
index 3947b86519..024abb64b6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
@@ -250,19 +250,19 @@ InjectedParticleDistributionInjection
         this->template getModelProperty<scalarList>("volumeFlowRate")
     ),
     U_(this->template getModelProperty<List<vectorList>>("U")),
-    binWidth_(readScalar(this->coeffDict().lookup("binWidth"))),
+    binWidth_(this->coeffDict().getScalar("binWidth")),
     sizeDistribution_(),
     parcelsPerInjector_
     (
-        ceil(readScalar(this->coeffDict().lookup("parcelsPerInjector")))
+        ceil(this->coeffDict().getScalar("parcelsPerInjector"))
     ),
     resampleSize_
     (
-        this->coeffDict().template lookupOrDefault<label>("resampleSize", 100)
+        this->coeffDict().lookupOrDefault("resampleSize", label(100))
     ),
     applyDistributionMassTotal_
     (
-        readBool(dict.lookup("applyDistributionMassTotal"))
+        this->coeffDict().getBool("applyDistributionMassTotal")
     ),
     ignoreOutOfBounds_
     (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 2d0d2ec92f..00ebd9280e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -307,8 +307,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
     timeStep0_(this->template getModelProperty<scalar>("timeStep0")),
     minParticlesPerParcel_
     (
-        this->coeffDict().template
-            lookupOrDefault<scalar>("minParticlesPerParcel", 1)
+        this->coeffDict().lookupOrDefault("minParticlesPerParcel", scalar(1))
     ),
     delayedVolume_(0.0),
     injectorID_(this->coeffDict().lookupOrDefault("injectorID", -1))
@@ -354,12 +353,11 @@ Foam::InjectionModel<CloudType>::InjectionModel
     else if (parcelBasisType == "fixed")
     {
         parcelBasis_ = pbFixed;
+        this->coeffDict().readEntry("nParticle", nParticleFixed_);
 
         Info<< "    Choosing nParticle to be a fixed value, massTotal "
             << "variable now does not determine anything."
             << endl;
-
-        nParticleFixed_ = readScalar(this->coeffDict().lookup("nParticle"));
     }
     else
     {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
index 739599c153..53a0969d6d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -38,12 +38,9 @@ Foam::KinematicLookupTableInjection<CloudType>::KinematicLookupTableInjection
 :
     InjectionModel<CloudType>(dict, owner, modelName, typeName),
     inputFileName_(this->coeffDict().lookup("inputFile")),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
-    parcelsPerSecond_
-    (
-        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
-    ),
-    randomise_(readBool(this->coeffDict().lookup("randomise"))),
+    duration_(this->coeffDict().getScalar("duration")),
+    parcelsPerSecond_(this->coeffDict().getScalar("parcelsPerSecond")),
+    randomise_(this->coeffDict().getBool("randomise")),
     injectors_
     (
         IOobject
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
index a831d77283..b44c679bae 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
@@ -51,9 +51,9 @@ Foam::kinematicParcelInjectionData::kinematicParcelInjectionData
 :
     x_(dict.lookup("x")),
     U_(dict.lookup("U")),
-    d_(readScalar(dict.lookup("d"))),
-    rho_(readScalar(dict.lookup("rho"))),
-    mDot_(readScalar(dict.lookup("mDot")))
+    d_(dict.get<scalar>("d")),
+    rho_(dict.get<scalar>("rho")),
+    mDot_(dict.get<scalar>("mDot"))
 {}
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index a9527d0190..e6d35f9894 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -43,7 +43,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
     patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
     phiName_(this->coeffDict().template lookupOrDefault<word>("phi", "phi")),
     rhoName_(this->coeffDict().template lookupOrDefault<word>("rho", "rho")),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    duration_(this->coeffDict().getScalar("duration")),
     concentration_
     (
         TimeFunction1<scalar>
@@ -55,7 +55,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
     ),
     parcelConcentration_
     (
-        readScalar(this->coeffDict().lookup("parcelConcentration"))
+        this->coeffDict().getScalar("parcelConcentration")
     ),
     sizeDistribution_
     (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 1c9524078e..3c5563532c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -39,10 +39,10 @@ Foam::PatchInjection<CloudType>::PatchInjection
 :
     InjectionModel<CloudType>(dict, owner, modelName, typeName),
     patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    duration_(this->coeffDict().getScalar("duration")),
     parcelsPerSecond_
     (
-        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
+        this->coeffDict().getScalar("parcelsPerSecond")
     ),
     U0_(this->coeffDict().lookup("U0")),
     flowRateProfile_
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 9bfa59b048..bc6ee8c402 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/NonSphereDrag/NonSphereDragForce.C
@@ -45,7 +45,7 @@ Foam::NonSphereDragForce<CloudType>::NonSphereDragForce
 )
 :
     ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
-    phi_(readScalar(this->coeffs().lookup("phi"))),
+    phi_(this->coeffs().getScalar("phi")),
     a_(exp(2.3288 - 6.4581*phi_ + 2.4486*sqr(phi_))),
     b_(0.0964 + 0.5565*phi_),
     c_(exp(4.9050 - 13.8944*phi_ + 18.4222*sqr(phi_) - 10.2599*pow3(phi_))),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index fb165f67bd..cbba2eb698 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -38,7 +38,7 @@ Foam::InterfaceForce<CloudType>::InterfaceForce
 :
     ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
     alphaName_(this->coeffs().lookup("alpha")),
-    C_(readScalar(this->coeffs().lookup("C"))),
+    C_(this->coeffs().getScalar("C")),
     gradInterForceInterpPtr_(nullptr)
 {}
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.C
index 5bb1d84065..a73c3bb27b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/TomiyamaLift/TomiyamaLiftForce.C
@@ -71,7 +71,7 @@ Foam::TomiyamaLiftForce<CloudType>::TomiyamaLiftForce
 )
 :
     LiftForce<CloudType>(owner, mesh, dict, forceType),
-    sigma_(readScalar(this->coeffs().lookup("sigma")))
+    sigma_(this->coeffs().getScalar("sigma"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
index b0fc66c7dc..584d798f61 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Paramagnetic/ParamagneticForce.C
@@ -45,7 +45,7 @@ Foam::ParamagneticForce<CloudType>::ParamagneticForce
     HdotGradHInterpPtr_(nullptr),
     magneticSusceptibility_
     (
-        readScalar(this->coeffs().lookup("magneticSusceptibility"))
+        this->coeffs().getScalar("magneticSusceptibility")
     )
 {}
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C
index 54408f9b24..8de467791f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C
@@ -37,7 +37,7 @@ Foam::VirtualMassForce<CloudType>::VirtualMassForce
 )
 :
     PressureGradientForce<CloudType>(owner, mesh, dict, forceType),
-    Cvm_(readScalar(this->coeffs().lookup("Cvm")))
+    Cvm_(this->coeffs().getScalar("Cvm"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C
index 735b3b5ba8..56c75babdb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C
@@ -64,8 +64,7 @@ bool Foam::MultiInteraction<CloudType>::read(const dictionary& dict)
         }
     }
 
-    oneInteractionOnly_ = dict.get<bool>("oneInteractionOnly");
-
+    dict.readEntry("oneInteractionOnly", oneInteractionOnly_);
     if (oneInteractionOnly_)
     {
         Info<< "Stopping upon first model that interacts with particle."
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
index 0b68d08f07..440d743505 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
@@ -35,7 +35,7 @@ Foam::Rebound<CloudType>::Rebound
 )
 :
     PatchInteractionModel<CloudType>(dict, cloud, typeName),
-    UFactor_(readScalar(this->coeffDict().lookup("UFactor")))
+    UFactor_(this->coeffDict().getScalar("UFactor"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.C b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.C
index 890e74f720..3c6d9fcd8c 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/absolute/absolute.C
@@ -46,7 +46,7 @@ namespace CorrectionLimitingMethods
 Foam::CorrectionLimitingMethods::absolute::absolute(const dictionary& dict)
 :
     CorrectionLimitingMethod(dict),
-    e_(readScalar(dict.lookup("e")))
+    e_(dict.get<scalar>("e"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.C b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.C
index a863ae5655..ae664ccf63 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/CorrectionLimitingMethods/relative/relative.C
@@ -46,7 +46,7 @@ namespace CorrectionLimitingMethods
 Foam::CorrectionLimitingMethods::relative::relative(const dictionary& dict)
 :
     CorrectionLimitingMethod(dict),
-    e_(readScalar(dict.lookup("e")))
+    e_(dict.get<scalar>("e"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
index 7adb7b5806..ea1d72d15b 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
@@ -60,8 +60,8 @@ Foam::PackingModels::Implicit<CloudType>::Implicit
     uCorrect_(nullptr),
     applyLimiting_(this->coeffDict().lookup("applyLimiting")),
     applyGravity_(this->coeffDict().lookup("applyGravity")),
-    alphaMin_(readScalar(this->coeffDict().lookup("alphaMin"))),
-    rhoMin_(readScalar(this->coeffDict().lookup("rhoMin")))
+    alphaMin_(this->coeffDict().getScalar("alphaMin")),
+    rhoMin_(this->coeffDict().getScalar("rhoMin"))
 {
     alpha_ = this->owner().theta();
     alpha_.oldTime();
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C
index 55f32cd610..2303026b05 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/HarrisCrighton/HarrisCrighton.C
@@ -52,9 +52,9 @@ Foam::ParticleStressModels::HarrisCrighton::HarrisCrighton
 )
 :
     ParticleStressModel(dict),
-    pSolid_(readScalar(dict.lookup("pSolid"))),
-    beta_(readScalar(dict.lookup("beta"))),
-    eps_(readScalar(dict.lookup("eps")))
+    pSolid_(dict.get<scalar>("pSolid")),
+    beta_(dict.get<scalar>("beta")),
+    eps_(dict.get<scalar>("eps"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
index e4aba79ab9..841dedef30 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/Lun/Lun.C
@@ -52,8 +52,8 @@ Foam::ParticleStressModels::Lun::Lun
 )
 :
     ParticleStressModel(dict),
-    e_(readScalar(dict.lookup("e"))),
-    eps_(readScalar(dict.lookup("eps")))
+    e_(dict.get<scalar>("e")),
+    eps_(dict.get<scalar>("eps"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
index 8fca6accbc..8a3077760f 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/ParticleStressModel/ParticleStressModel.C
@@ -41,9 +41,8 @@ Foam::ParticleStressModel::ParticleStressModel
     const dictionary& dict
 )
 :
-    alphaPacked_(readScalar(dict.lookup("alphaPacked")))
-{
-}
+    alphaPacked_(dict.get<scalar>("alphaPacked"))
+{}
 
 
 Foam::ParticleStressModel::ParticleStressModel
@@ -52,8 +51,7 @@ Foam::ParticleStressModel::ParticleStressModel
 )
 :
     alphaPacked_(cm.alphaPacked_)
-{
-}
+{}
 
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.C b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.C
index a589fc16ba..5858f79f33 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/ParticleStressModels/exponential/exponential.C
@@ -52,9 +52,9 @@ Foam::ParticleStressModels::exponential::exponential
 )
 :
     ParticleStressModel(dict),
-    preExp_(readScalar(dict.lookup("preExp"))),
-    expMax_(readScalar(dict.lookup("expMax"))),
-    g0_(readScalar(dict.lookup("g0")))
+    preExp_(dict.get<scalar>("preExp")),
+    expMax_(dict.get<scalar>("expMax")),
+    g0_(dict.get<scalar>("g0"))
 {}
 
 
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
index 8499550278..79c1746f29 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/TimeScaleModels/TimeScaleModel/TimeScaleModel.C
@@ -41,8 +41,8 @@ Foam::TimeScaleModel::TimeScaleModel
     const dictionary& dict
 )
 :
-    alphaPacked_(readScalar(dict.lookup("alphaPacked"))),
-    e_(readScalar(dict.lookup("e")))
+    alphaPacked_(dict.get<scalar>("alphaPacked")),
+    e_(dict.get<scalar>("e"))
 {
 }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index 7b0982e6a6..e5e5e0765c 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -37,12 +37,9 @@ Foam::ReactingLookupTableInjection<CloudType>::ReactingLookupTableInjection
 :
     InjectionModel<CloudType>(dict, owner, modelName, typeName),
     inputFileName_(this->coeffDict().lookup("inputFile")),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
-    parcelsPerSecond_
-    (
-        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
-    ),
-    randomise_(readBool(this->coeffDict().lookup("randomise"))),
+    duration_(this->coeffDict().getScalar("duration")),
+    parcelsPerSecond_(this->coeffDict().getScalar("parcelsPerSecond")),
+    randomise_(this->coeffDict().getBool("randomise")),
     injectors_
     (
         IOobject
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index 9aeee431d0..838a5cdbcf 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -38,7 +38,7 @@ Foam::ConstantRateDevolatilisation<CloudType>::ConstantRateDevolatilisation
     volatileData_(this->coeffDict().lookup("volatileData")),
     YVolatile0_(volatileData_.size()),
     volatileToGasMap_(volatileData_.size()),
-    residualCoeff_(readScalar(this->coeffDict().lookup("residualCoeff")))
+    residualCoeff_(this->coeffDict().getScalar("residualCoeff"))
 {
     if (volatileData_.empty())
     {
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index a4a5b1c184..84b1325c0d 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -39,7 +39,7 @@ SingleKineticRateDevolatilisation
     volatileData_(this->coeffDict().lookup("volatileData")),
     YVolatile0_(volatileData_.size()),
     volatileToGasMap_(volatileData_.size()),
-    residualCoeff_(readScalar(this->coeffDict().lookup("residualCoeff")))
+    residualCoeff_(this->coeffDict().getScalar("residualCoeff"))
 {
     if (volatileData_.empty())
     {
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index 79423e612e..dc5c33c88e 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -38,12 +38,9 @@ ReactingMultiphaseLookupTableInjection
 :
     InjectionModel<CloudType>(dict, owner, modelName, typeName),
     inputFileName_(this->coeffDict().lookup("inputFile")),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
-    parcelsPerSecond_
-    (
-        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
-    ),
-    randomise_(readBool(this->coeffDict().lookup("randomise"))),
+    duration_(this->coeffDict().getScalar("duration")),
+    parcelsPerSecond_(this->coeffDict().getScalar("parcelsPerSecond")),
+    randomise_(this->coeffDict().getBool("randomise")),
     injectors_
     (
         IOobject
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index b746e3fd3f..adc397264b 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -38,12 +38,9 @@ Foam::ThermoLookupTableInjection<CloudType>::ThermoLookupTableInjection
 :
     InjectionModel<CloudType>(dict, owner, modelName, typeName),
     inputFileName_(this->coeffDict().lookup("inputFile")),
-    duration_(readScalar(this->coeffDict().lookup("duration"))),
-    parcelsPerSecond_
-    (
-        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
-    ),
-    randomise_(readBool(this->coeffDict().lookup("randomise"))),
+    duration_(this->coeffDict().getScalar("duration")),
+    parcelsPerSecond_(this->coeffDict().getScalar("parcelsPerSecond")),
+    randomise_(this->coeffDict().getBool("randomise")),
     injectors_
     (
         IOobject
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C
index 34d1a9568d..baff1bcc07 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C
@@ -48,8 +48,8 @@ Foam::thermoParcelInjectionData::thermoParcelInjectionData
 )
 :
     kinematicParcelInjectionData(dict),
-    T_(readScalar(dict.lookup("T"))),
-    Cp_(readScalar(dict.lookup("Cp")))
+    T_(dict.get<scalar>("T")),
+    Cp_(dict.get<scalar>("Cp"))
 {}
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
index a89c35333d..e616619ddd 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
@@ -80,19 +80,16 @@ template<class Type>
 Foam::correlationFunction<Type>::correlationFunction
 (
     const polyMesh& mesh,
-    const dictionary& cfDict,
+    const dictionary& dict,
     const label tZeroBufferSize
 )
 :
     bufferedAccumulator<scalar>(),
-    mesh_(mesh)
+    mesh_(mesh),
+    duration_(dict.get<scalar>("duration")),
+    sampleInterval_(dict.get<scalar>("sampleInterval")),
+    averagingInterval_(dict.get<scalar>("averagingInterval"))
 {
-    duration_ = readScalar(cfDict.lookup("duration"));
-
-    sampleInterval_ = readScalar(cfDict.lookup("sampleInterval"));
-
-    averagingInterval_ = readScalar(cfDict.lookup("averagingInterval"));
-
     setTimesAndSizes(tZeroBufferSize);
 }
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 0b41ed96f8..58b668fef6 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -505,10 +505,13 @@ void Foam::moleculeCloud::initialiseMolecules
 
                 const scalar temperature
                 (
-                    readScalar(zoneDict.lookup("temperature"))
+                    zoneDict.get<scalar>("temperature")
                 );
 
-                const vector bulkVelocity(zoneDict.lookup("bulkVelocity"));
+                const vector bulkVelocity
+                (
+                    zoneDict.get<vector>("bulkVelocity")
+                );
 
                 List<word> latticeIds
                 (
@@ -537,9 +540,9 @@ void Foam::moleculeCloud::initialiseMolecules
 
                 if (zoneDict.found("numberDensity"))
                 {
-                    scalar numberDensity = readScalar
+                    const scalar numberDensity
                     (
-                        zoneDict.lookup("numberDensity")
+                        zoneDict.get<scalar>("numberDensity")
                     );
 
                     if (numberDensity < VSMALL)
@@ -570,9 +573,9 @@ void Foam::moleculeCloud::initialiseMolecules
                         unitCellMass += cP.mass();
                     }
 
-                    scalar massDensity = readScalar
+                    const scalar massDensity
                     (
-                        zoneDict.lookup("massDensity")
+                        zoneDict.get<scalar>("massDensity")
                     );
 
                     if (massDensity < VSMALL)
@@ -600,7 +603,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
                 latticeCellShape *= latticeCellScale;
 
-                vector anchor(zoneDict.lookup("anchor"));
+                vector anchor(zoneDict.get<vector>("anchor"));
 
                 bool tethered = false;
 
@@ -614,7 +617,7 @@ void Foam::moleculeCloud::initialiseMolecules
 
                 const vector orientationAngles
                 (
-                    zoneDict.lookup("orientationAngles")
+                    zoneDict.get<vector>("orientationAngles")
                 );
 
                 scalar phi(orientationAngles.x()*pi/180.0);
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
index 2f424424bb..e296b0bcf3 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.C
@@ -127,9 +127,9 @@ void Foam::reducedUnits::setRefValues
     const IOdictionary& reducedUnitsDict
 )
 {
-    refLength_ = readScalar(reducedUnitsDict.lookup("refLength"));
-    refTime_ = readScalar(reducedUnitsDict.lookup("refTime"));
-    refMass_ = readScalar(reducedUnitsDict.lookup("refMass"));
+    reducedUnitsDict.readEntry("refLength", refLength_);
+    reducedUnitsDict.readEntry("refTime", refTime_);
+    reducedUnitsDict.readEntry("refMass", refMass_);
 
     calcRefValues();
 }
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
index bfefd67c51..d1a3e1b0cc 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
@@ -71,10 +71,10 @@ doubleSigmoid::doubleSigmoid
     (
         energyScalingFunctionProperties.subDict(typeName + "Coeffs")
     ),
-    shift1_(readScalar(doubleSigmoidCoeffs_.lookup("shift1"))),
-    scale1_(readScalar(doubleSigmoidCoeffs_.lookup("scale1"))),
-    shift2_(readScalar(doubleSigmoidCoeffs_.lookup("shift2"))),
-    scale2_(readScalar(doubleSigmoidCoeffs_.lookup("scale2")))
+    shift1_(doubleSigmoidCoeffs_.get<scalar>("shift1")),
+    scale1_(doubleSigmoidCoeffs_.get<scalar>("scale1")),
+    shift2_(doubleSigmoidCoeffs_.get<scalar>("shift2")),
+    scale2_(doubleSigmoidCoeffs_.get<scalar>("scale2"))
 {}
 
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
index 5784f3f10b..8a49dffd47 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
@@ -72,8 +72,8 @@ sigmoid::sigmoid
     (
         energyScalingFunctionProperties.subDict(typeName + "Coeffs")
     ),
-    shift_(readScalar(sigmoidCoeffs_.lookup("shift"))),
-    scale_(readScalar(sigmoidCoeffs_.lookup("scale")))
+    shift_(sigmoidCoeffs_.get<scalar>("shift")),
+    scale_(sigmoidCoeffs_.get<scalar>("scale"))
 {}
 
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
index 988ef418fc..044497e440 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
@@ -61,10 +61,10 @@ Foam::pairPotential::pairPotential
 :
     name_(name),
     pairPotentialProperties_(pairPotentialProperties),
-    rCut_(readScalar(pairPotentialProperties_.lookup("rCut"))),
+    rCut_(pairPotentialProperties_.get<scalar>("rCut")),
     rCutSqr_(rCut_*rCut_),
-    rMin_(readScalar(pairPotentialProperties_.lookup("rMin"))),
-    dr_(readScalar(pairPotentialProperties_.lookup("dr"))),
+    rMin_(pairPotentialProperties_.get<scalar>("rMin")),
+    dr_(pairPotentialProperties_.get<scalar>("dr")),
     forceLookup_(0),
     energyLookup_(0),
     esfPtr_(nullptr),
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
index 7f318d4e87..7f8799d9ae 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
@@ -55,15 +55,15 @@ azizChen::azizChen
 :
     pairPotential(name, azizChen),
     azizChenCoeffs_(azizChen.subDict(typeName + "Coeffs")),
-    epsilon_(readScalar(azizChenCoeffs_.lookup("epsilon"))),
-    rm_(readScalar(azizChenCoeffs_.lookup("rm"))),
-    A_(readScalar(azizChenCoeffs_.lookup("A"))),
-    alpha_(readScalar(azizChenCoeffs_.lookup("alpha"))),
-    C6_(readScalar(azizChenCoeffs_.lookup("C6"))),
-    C8_(readScalar(azizChenCoeffs_.lookup("C8"))),
-    C10_(readScalar(azizChenCoeffs_.lookup("C10"))),
-    D_(readScalar(azizChenCoeffs_.lookup("D"))),
-    gamma_(readScalar(azizChenCoeffs_.lookup("gamma")))
+    epsilon_(azizChenCoeffs_.get<scalar>("epsilon")),
+    rm_(azizChenCoeffs_.get<scalar>("rm")),
+    A_(azizChenCoeffs_.get<scalar>("A")),
+    alpha_(azizChenCoeffs_.get<scalar>("alpha")),
+    C6_(azizChenCoeffs_.get<scalar>("C6")),
+    C8_(azizChenCoeffs_.get<scalar>("C8")),
+    C10_(azizChenCoeffs_.get<scalar>("C10")),
+    D_(azizChenCoeffs_.get<scalar>("D")),
+    gamma_(azizChenCoeffs_.get<scalar>("gamma"))
 {
     setLookupTables();
 }
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C
index d492c7669f..34f30f2ec8 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C
@@ -62,7 +62,7 @@ dampedCoulomb::dampedCoulomb
     (
         pairPotentialProperties.subDict(typeName + "Coeffs")
     ),
-    alpha_(readScalar(dampedCoulombCoeffs_.lookup("alpha")))
+    alpha_(dampedCoulombCoeffs_.get<scalar>("alpha"))
 {
     setLookupTables();
 }
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C
index 4b5473d859..bf14908cfa 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C
@@ -58,8 +58,8 @@ exponentialRepulsion::exponentialRepulsion
     (
         exponentialRepulsion.subDict(typeName + "Coeffs")
     ),
-    rm_(readScalar(exponentialRepulsionCoeffs_.lookup("rm"))),
-    epsilon_(readScalar(exponentialRepulsionCoeffs_.lookup("epsilon")))
+    rm_(exponentialRepulsionCoeffs_.get<scalar>("rm")),
+    epsilon_(exponentialRepulsionCoeffs_.get<scalar>("epsilon"))
 {
     setLookupTables();
 }
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
index 1a33f97e58..e4544ad526 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
@@ -55,8 +55,8 @@ lennardJones::lennardJones
 :
     pairPotential(name, pairPotentialProperties),
     lennardJonesCoeffs_(pairPotentialProperties.subDict(typeName + "Coeffs")),
-    sigma_(readScalar(lennardJonesCoeffs_.lookup("sigma"))),
-    epsilon_(readScalar(lennardJonesCoeffs_.lookup("epsilon")))
+    sigma_(lennardJonesCoeffs_.get<scalar>("sigma")),
+    epsilon_(lennardJonesCoeffs_.get<scalar>("epsilon"))
 {
     setLookupTables();
 }
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
index 07e5cd7042..dc1cbebef8 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
@@ -55,10 +55,10 @@ maitlandSmith::maitlandSmith
 :
     pairPotential(name, maitlandSmith),
     maitlandSmithCoeffs_(maitlandSmith.subDict(typeName + "Coeffs")),
-    m_(readScalar(maitlandSmithCoeffs_.lookup("m"))),
-    gamma_(readScalar(maitlandSmithCoeffs_.lookup("gamma"))),
-    rm_(readScalar(maitlandSmithCoeffs_.lookup("rm"))),
-    epsilon_(readScalar(maitlandSmithCoeffs_.lookup("epsilon")))
+    m_(maitlandSmithCoeffs_.get<scalar>("m")),
+    gamma_(maitlandSmithCoeffs_.get<scalar>("gamma")),
+    rm_(maitlandSmithCoeffs_.get<scalar>("rm")),
+    epsilon_(maitlandSmithCoeffs_.get<scalar>("epsilon"))
 {
     setLookupTables();
 }
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
index e01f75dfcf..64265c4c91 100644
--- a/src/lagrangian/molecularDynamics/potential/potential/potential.C
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -152,10 +152,7 @@ void Foam::potential::potential::readPotentialDict()
         )
     );
 
-    potentialEnergyLimit_ = readScalar
-    (
-        potentialDict.lookup("potentialEnergyLimit")
-    );
+    potentialDict.readEntry("potentialEnergyLimit", potentialEnergyLimit_);
 
     if (potentialDict.found("removalOrder"))
     {
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
index 61c74200ea..85fb65478e 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
@@ -58,7 +58,7 @@ harmonicSpring::harmonicSpring
     (
         tetherPotentialProperties.subDict(typeName + "Coeffs")
     ),
-    springConstant_(readScalar(harmonicSpringCoeffs_.lookup("springConstant")))
+    springConstant_(harmonicSpringCoeffs_.get<scalar>("springConstant"))
 {}
 
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
index 6aac89c4a8..b9d63bc978 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
@@ -58,9 +58,9 @@ pitchForkRing::pitchForkRing
     (
         tetherPotentialProperties.subDict(typeName + "Coeffs")
     ),
-    mu_(readScalar(pitchForkRingCoeffs_.lookup("mu"))),
-    alpha_(readScalar(pitchForkRingCoeffs_.lookup("alpha"))),
-    rOrbit_(readScalar(pitchForkRingCoeffs_.lookup("rOrbit")))
+    mu_(pitchForkRingCoeffs_.get<scalar>("mu")),
+    alpha_(pitchForkRingCoeffs_.get<scalar>("alpha")),
+    rOrbit_(pitchForkRingCoeffs_.get<scalar>("rOrbit"))
 {}
 
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
index b2f31b16d4..b4598f0961 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
@@ -60,11 +60,11 @@ restrainedHarmonicSpring::restrainedHarmonicSpring
     ),
     springConstant_
     (
-        readScalar(restrainedHarmonicSpringCoeffs_.lookup("springConstant"))
+        restrainedHarmonicSpringCoeffs_.get<scalar>("springConstant")
     ),
     rR_
     (
-        readScalar(restrainedHarmonicSpringCoeffs_.lookup("rR"))
+        restrainedHarmonicSpringCoeffs_.get<scalar>("rR")
     )
 {}
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
index 63670b0845..e8da55dce7 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
@@ -35,8 +35,8 @@ Foam::BlobsSheetAtomization<CloudType>::BlobsSheetAtomization
 )
 :
     AtomizationModel<CloudType>(dict, owner, typeName),
-    B_(readScalar(this->coeffDict().lookup("B"))),
-    angle_(readScalar(this->coeffDict().lookup("angle")))
+    B_(this->coeffDict().getScalar("B")),
+    angle_(this->coeffDict().getScalar("angle"))
 {}
 
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
index 3a0be87711..b2cd63a032 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
@@ -35,12 +35,15 @@ Foam::LISAAtomization<CloudType>::LISAAtomization
 )
 :
     AtomizationModel<CloudType>(dict, owner, typeName),
-    Cl_(readScalar(this->coeffDict().lookup("Cl"))),
-    cTau_(readScalar(this->coeffDict().lookup("cTau"))),
-    Q_(readScalar(this->coeffDict().lookup("Q"))),
-    lisaExp_(readScalar(this->coeffDict().lookup("lisaExp"))),
-    injectorDirection_(this->coeffDict().lookup("injectorDirection")),
-    SMDCalcMethod_(this->coeffDict().lookup("SMDCalculationMethod"))
+    Cl_(this->coeffDict().getScalar("Cl")),
+    cTau_(this->coeffDict().getScalar("cTau")),
+    Q_(this->coeffDict().getScalar("Q")),
+    lisaExp_(this->coeffDict().getScalar("lisaExp")),
+    injectorDirection_
+    (
+        this->coeffDict().template get<vector>("injectorDirection")
+    ),
+    SMDCalcMethod_(this->coeffDict().getWord("SMDCalculationMethod"))
 {
     // Note: Would be good if this could be picked up from the injector
     injectorDirection_.normalise();
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
index e8c8627443..35a34085c6 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
@@ -81,7 +81,8 @@ Foam::BreakupModel<CloudType>::BreakupModel
         const dictionary coeffs(dict.subDict("TABCoeffs"));
         coeffs.readEntry("Comega", TABComega_);
         coeffs.readEntry("Cmu", TABCmu_);
-        scalar WeCrit(readScalar(coeffs.lookup("WeCrit")));
+
+        const scalar WeCrit(coeffs.get<scalar>("WeCrit"));
         TABtwoWeCrit_ = 2*WeCrit;
     }
 }
diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
index 642df18a86..0821ec7368 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
@@ -35,35 +35,35 @@ Foam::SHF<CloudType>::SHF
 )
 :
     BreakupModel<CloudType>(dict, owner, typeName),
-    weCorrCoeff_(readScalar(this->coeffDict().lookup("weCorrCoeff"))),
-    weBuCrit_(readScalar(this->coeffDict().lookup("weBuCrit"))),
-    weBuBag_(readScalar(this->coeffDict().lookup("weBuBag"))),
-    weBuMM_(readScalar(this->coeffDict().lookup("weBuMM"))),
-    ohnCoeffCrit_(readScalar(this->coeffDict().lookup("ohnCoeffCrit"))),
-    ohnCoeffBag_(readScalar(this->coeffDict().lookup("ohnCoeffBag"))),
-    ohnCoeffMM_(readScalar(this->coeffDict().lookup("ohnCoeffMM"))),
-    ohnExpCrit_(readScalar(this->coeffDict().lookup("ohnExpCrit"))),
-    ohnExpBag_(readScalar(this->coeffDict().lookup("ohnExpBag"))),
-    ohnExpMM_(readScalar(this->coeffDict().lookup("ohnExpMM"))),
-    cInit_(readScalar(this->coeffDict().lookup("Cinit"))),
-    c1_(readScalar(this->coeffDict().lookup("C1"))),
-    c2_(readScalar(this->coeffDict().lookup("C2"))),
-    c3_(readScalar(this->coeffDict().lookup("C3"))),
-    cExp1_(readScalar(this->coeffDict().lookup("Cexp1"))),
-    cExp2_(readScalar(this->coeffDict().lookup("Cexp2"))),
-    cExp3_(readScalar(this->coeffDict().lookup("Cexp3"))),
-    weConst_(readScalar(this->coeffDict().lookup("Weconst"))),
-    weCrit1_(readScalar(this->coeffDict().lookup("Wecrit1"))),
-    weCrit2_(readScalar(this->coeffDict().lookup("Wecrit2"))),
-    coeffD_(readScalar(this->coeffDict().lookup("CoeffD"))),
-    onExpD_(readScalar(this->coeffDict().lookup("OnExpD"))),
-    weExpD_(readScalar(this->coeffDict().lookup("WeExpD"))),
-    mu_(readScalar(this->coeffDict().lookup("mu"))),
-    sigma_(readScalar(this->coeffDict().lookup("sigma"))),
-    d32Coeff_(readScalar(this->coeffDict().lookup("d32Coeff"))),
-    cDmaxBM_(readScalar(this->coeffDict().lookup("cDmaxBM"))),
-    cDmaxS_(readScalar(this->coeffDict().lookup("cDmaxS"))),
-    corePerc_(readScalar(this->coeffDict().lookup("corePerc")))
+    weCorrCoeff_(this->coeffDict().getScalar("weCorrCoeff")),
+    weBuCrit_(this->coeffDict().getScalar("weBuCrit")),
+    weBuBag_(this->coeffDict().getScalar("weBuBag")),
+    weBuMM_(this->coeffDict().getScalar("weBuMM")),
+    ohnCoeffCrit_(this->coeffDict().getScalar("ohnCoeffCrit")),
+    ohnCoeffBag_(this->coeffDict().getScalar("ohnCoeffBag")),
+    ohnCoeffMM_(this->coeffDict().getScalar("ohnCoeffMM")),
+    ohnExpCrit_(this->coeffDict().getScalar("ohnExpCrit")),
+    ohnExpBag_(this->coeffDict().getScalar("ohnExpBag")),
+    ohnExpMM_(this->coeffDict().getScalar("ohnExpMM")),
+    cInit_(this->coeffDict().getScalar("Cinit")),
+    c1_(this->coeffDict().getScalar("C1")),
+    c2_(this->coeffDict().getScalar("C2")),
+    c3_(this->coeffDict().getScalar("C3")),
+    cExp1_(this->coeffDict().getScalar("Cexp1")),
+    cExp2_(this->coeffDict().getScalar("Cexp2")),
+    cExp3_(this->coeffDict().getScalar("Cexp3")),
+    weConst_(this->coeffDict().getScalar("Weconst")),
+    weCrit1_(this->coeffDict().getScalar("Wecrit1")),
+    weCrit2_(this->coeffDict().getScalar("Wecrit2")),
+    coeffD_(this->coeffDict().getScalar("CoeffD")),
+    onExpD_(this->coeffDict().getScalar("OnExpD")),
+    weExpD_(this->coeffDict().getScalar("WeExpD")),
+    mu_(this->coeffDict().getScalar("mu")),
+    sigma_(this->coeffDict().getScalar("sigma")),
+    d32Coeff_(this->coeffDict().getScalar("d32Coeff")),
+    cDmaxBM_(this->coeffDict().getScalar("cDmaxBM")),
+    cDmaxS_(this->coeffDict().getScalar("cDmaxS")),
+    corePerc_(this->coeffDict().getScalar("corePerc"))
 {}
 
 
diff --git a/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C b/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C
index dc5d7b6d13..311ecf75d0 100644
--- a/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C
+++ b/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C
@@ -139,8 +139,8 @@ Foam::TrajectoryCollision<CloudType>::TrajectoryCollision
 )
 :
     ORourkeCollision<CloudType>(dict, owner, typeName),
-    cSpace_(readScalar(this->coeffDict().lookup("cSpace"))),
-    cTime_(readScalar(this->coeffDict().lookup("cTime")))
+    cSpace_(this->coeffDict().getScalar("cSpace")),
+    cTime_(this->coeffDict().getScalar("cTime"))
 {}
 
 
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index ac4eb95f7f..c2f42a8c10 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -92,8 +92,8 @@ Foam::BrownianMotionForce<CloudType>::BrownianMotionForce
 :
     ParticleForce<CloudType>(owner, mesh, dict, typeName, true),
     rndGen_(owner.rndGen()),
-    lambda_(readScalar(this->coeffs().lookup("lambda"))),
-    turbulence_(readBool(this->coeffs().lookup("turbulence"))),
+    lambda_(this->coeffs().getScalar("lambda")),
+    turbulence_(this->coeffs().getBool("turbulence")),
     kPtr_(nullptr),
     ownK_(false)
 {}
diff --git a/src/mesh/extrudeModel/linearNormal/linearNormal.C b/src/mesh/extrudeModel/linearNormal/linearNormal.C
index d3a25216ae..d8084a4715 100644
--- a/src/mesh/extrudeModel/linearNormal/linearNormal.C
+++ b/src/mesh/extrudeModel/linearNormal/linearNormal.C
@@ -45,7 +45,7 @@ addToRunTimeSelectionTable(extrudeModel, linearNormal, dictionary);
 linearNormal::linearNormal(const dictionary& dict)
 :
     extrudeModel(typeName, dict),
-    thickness_(readScalar(coeffDict_.lookup("thickness"))),
+    thickness_(coeffDict_.get<scalar>("thickness")),
     firstCellThickness_(0),
     layerPoints_(nLayers_)
 {
diff --git a/src/mesh/extrudeModel/linearRadial/linearRadial.C b/src/mesh/extrudeModel/linearRadial/linearRadial.C
index 6477ed4a6d..f468cecd60 100644
--- a/src/mesh/extrudeModel/linearRadial/linearRadial.C
+++ b/src/mesh/extrudeModel/linearRadial/linearRadial.C
@@ -43,7 +43,7 @@ addToRunTimeSelectionTable(extrudeModel, linearRadial, dictionary);
 linearRadial::linearRadial(const dictionary& dict)
 :
     extrudeModel(typeName, dict),
-    R_(readScalar(coeffDict_.lookup("R"))),
+    R_(coeffDict_.get<scalar>("R")),
     Rsurface_(coeffDict_.lookupOrDefault<scalar>("Rsurface", -1))
 {}
 
diff --git a/src/mesh/extrudeModel/sector/sector.C b/src/mesh/extrudeModel/sector/sector.C
index 58808e5bd8..d03c31b5ac 100644
--- a/src/mesh/extrudeModel/sector/sector.C
+++ b/src/mesh/extrudeModel/sector/sector.C
@@ -50,7 +50,7 @@ sector::sector(const dictionary& dict)
     axis_(coeffDict_.lookup("axis")),
     angle_
     (
-        degToRad(readScalar(coeffDict_.lookup("angle")))
+        degToRad(coeffDict_.get<scalar>("angle"))
     )
 {}
 
diff --git a/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
index c97caf8250..c0cde22834 100644
--- a/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
+++ b/src/mesh/extrudeModel/sigmaRadial/sigmaRadial.C
@@ -45,9 +45,9 @@ addToRunTimeSelectionTable(extrudeModel, sigmaRadial, dictionary);
 sigmaRadial::sigmaRadial(const dictionary& dict)
 :
     extrudeModel(typeName, dict),
-    RTbyg_(readScalar(coeffDict_.lookup("RTbyg"))),
-    pRef_(readScalar(coeffDict_.lookup("pRef"))),
-    pStrat_(readScalar(coeffDict_.lookup("pStrat")))
+    RTbyg_(coeffDict_.get<scalar>("RTbyg")),
+    pRef_(coeffDict_.get<scalar>("pRef")),
+    pStrat_(coeffDict_.get<scalar>("pStrat"))
 {
     if (mag(expansionRatio() - 1.0) > SMALL)
     {
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
index 6f3b0bc83a..4b2e868af6 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
@@ -51,7 +51,7 @@ bool Foam::displacementMotionSolverMeshMover::moveMesh
     labelList& checkFaces
 )
 {
-    const label nRelaxIter = readLabel(moveDict.lookup("nRelaxIter"));
+    const label nRelaxIter = moveDict.get<label>("nRelaxIter");
 
     meshMover_.setDisplacementPatchFields();
 
@@ -205,18 +205,18 @@ bool Foam::displacementMotionSolverMeshMover::move
     // Note that this has to update the pointDisplacement boundary conditions
     // as well, not just the internal field.
     {
-        const label nSmoothPatchThickness = readLabel
+        const label nSmoothPatchThickness
         (
-            moveDict.lookup("nSmoothThickness")
+            moveDict.get<label>("nSmoothThickness")
         );
 
-        const word minThicknessName = word(moveDict.lookup("minThicknessName"));
+        const word minThicknessName(moveDict.get<word>("minThicknessName"));
 
         scalarField zeroMinThickness;
 
         if (minThicknessName == "none")
         {
-            zeroMinThickness = scalarField(adaptPatchPtr_().nPoints(), 0.0);
+            zeroMinThickness = scalarField(adaptPatchPtr_().nPoints(), Zero);
         }
 
         const scalarField& minThickness =
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index 6bb99d604d..598ba950c5 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -136,9 +136,9 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
     // ~~~~~~~~~~~~~~~~~~~~~
 
     //- Smooth surface normals
-    const label nSmoothSurfaceNormals = readLabel
+    const label nSmoothSurfaceNormals
     (
-        coeffDict.lookup("nSmoothSurfaceNormals")
+        coeffDict.get<label>("nSmoothSurfaceNormals")
     );
 
     // Note: parameter name changed
@@ -156,20 +156,20 @@ void Foam::medialAxisMeshMover::update(const dictionary& coeffDict)
     );
 
     //- Feature angle when to stop adding layers
-    const scalar featureAngle = readScalar(coeffDict.lookup("featureAngle"));
+    const scalar featureAngle = coeffDict.get<scalar>("featureAngle");
 
     //- When to slip along wall
     const scalar slipFeatureAngle =
-    (
-        coeffDict.found("slipFeatureAngle")
-      ? readScalar(coeffDict.lookup("slipFeatureAngle"))
-      : 0.5*featureAngle
-    );
+        coeffDict.lookupOrDefault<scalar>
+        (
+            "slipFeatureAngle",
+            0.5*featureAngle
+        );
 
     //- Smooth internal normals
-    const label nSmoothNormals = readLabel
+    const label nSmoothNormals
     (
-        coeffDict.lookup("nSmoothNormals")
+        coeffDict.get<label>("nSmoothNormals")
     );
 
     //- Number of edges walking out
@@ -1348,13 +1348,16 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     );
 
     //- Layer thickness too big
-    const scalar maxThicknessToMedialRatio  = readScalar
+    const scalar maxThicknessToMedialRatio
     (
-        coeffDict.lookup("maxThicknessToMedialRatio")
+        coeffDict.get<scalar>("maxThicknessToMedialRatio")
     );
 
     //- Feature angle when to stop adding layers
-    const scalar featureAngle = readScalar(coeffDict.lookup("featureAngle"));
+    const scalar featureAngle
+    (
+        coeffDict.get<scalar>("featureAngle")
+    );
 
     //- Stop layer growth where mesh wraps around sharp edge
     scalar layerTerminationAngle = coeffDict.lookupOrDefault<scalar>
@@ -1365,9 +1368,9 @@ void Foam::medialAxisMeshMover::calculateDisplacement
     scalar minCosLayerTermination = Foam::cos(degToRad(layerTerminationAngle));
 
     //- Smoothing wanted patch thickness
-    const label nSmoothPatchThickness = readLabel
+    const label nSmoothPatchThickness
     (
-        coeffDict.lookup("nSmoothThickness")
+        coeffDict.get<label>("nSmoothThickness")
     );
 
     //- Number of edges walking out
@@ -1688,7 +1691,7 @@ bool Foam::medialAxisMeshMover::shrinkMesh
 )
 {
     //- Number of attempts shrinking the mesh
-    const label nSnap  = readLabel(meshQualityDict.lookup("nRelaxIter"));
+    const label nSnap = meshQualityDict.get<label>("nRelaxIter");
 
 
     // Make sure displacement boundary conditions is uptodate with
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index 1bd63cc13c..d7a02c0f42 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -633,8 +633,8 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
 
     if (checkCollapse)
     {
-        minArea = readScalar(motionDict.lookup("minArea"));
-        maxNonOrtho = readScalar(motionDict.lookup("maxNonOrtho"));
+        motionDict.readEntry("minArea", minArea);
+        motionDict.readEntry("maxNonOrtho", maxNonOrtho);
 
         Info<< "markFacesOnProblemCells :"
             << " Deleting all-anchor surface cells only if"
@@ -1205,7 +1205,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
             const labelList allFaces(identity(mesh_.nFaces()));
             label nWrongFaces = 0;
 
-            //const scalar minV(readScalar(motionDict.lookup("minVol", true)));
+            //const scalar minV(motionDict.get<scalar>("minVol", true));
             //if (minV > -GREAT)
             //{
             //    polyMeshGeometry::checkFacePyramids
@@ -1234,7 +1234,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
             //    nWrongFaces = nNewWrongFaces;
             //}
 
-            scalar minArea(readScalar(motionDict.lookup("minArea")));
+            scalar minArea(motionDict.get<scalar>("minArea"));
             if (minArea > -SMALL)
             {
                 polyMeshGeometry::checkFaceArea
@@ -1261,7 +1261,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
                 nWrongFaces = nNewWrongFaces;
             }
 
-            scalar minDet(readScalar(motionDict.lookup("minDeterminant")));
+            scalar minDet(motionDict.get<scalar>("minDeterminant"));
             if (minDet > -1)
             {
                 polyMeshGeometry::checkCellDeterminant
diff --git a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
index 6a3c996c9a..f0c1ea312f 100644
--- a/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/snappyHexMesh/refinementFeatures/refinementFeatures.C
@@ -235,8 +235,8 @@ void Foam::refinementFeatures::read
         else
         {
             // Look up 'level' for single level
-            levels_[featI] = labelList(1, readLabel(dict.lookup("level")));
-            distances_[featI] = scalarField(1, 0.0);
+            levels_[featI] = labelList(1, dict.get<label>("level"));
+            distances_[featI] = scalarField(1, Zero);
         }
 
         Info<< "Refinement level according to distance to "
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index 0726bd0a3a..71a63b20f5 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -351,10 +351,7 @@ Foam::refinementSurfaces::refinementSurfaces
                             regionAngle[surfI].insert
                             (
                                 regionI,
-                                readScalar
-                                (
-                                    regionDict.lookup("perpendicularAngle")
-                                )
+                                regionDict.get<scalar>("perpendicularAngle")
                             );
                         }
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
index 64500d2b85..f86bd8fa8e 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
@@ -110,9 +110,9 @@ Foam::layerParameters::layerParameters
     minThickness_
     (
         boundaryMesh.size(),
-        readScalar(dict.lookup("minThickness"))
+        dict.get<scalar>("minThickness")
     ),
-    featureAngle_(readScalar(dict.lookup("featureAngle"))),
+    featureAngle_(dict.get<scalar>("featureAngle")),
     mergePatchFacesAngle_
     (
         dict.lookupOrDefault<scalar>
@@ -125,16 +125,16 @@ Foam::layerParameters::layerParameters
     (
         dict.lookupOrDefault("concaveAngle", defaultConcaveAngle)
     ),
-    nGrow_(readLabel(dict.lookup("nGrow"))),
+    nGrow_(dict.get<label>("nGrow")),
     maxFaceThicknessRatio_
     (
-        readScalar(dict.lookup("maxFaceThicknessRatio"))
+        dict.get<scalar>("maxFaceThicknessRatio")
     ),
     nBufferCellsNoExtrude_
     (
-        readLabel(dict.lookup("nBufferCellsNoExtrude"))
+        dict.get<label>("nBufferCellsNoExtrude")
     ),
-    nLayerIter_(readLabel(dict.lookup("nLayerIter"))),
+    nLayerIter_(dict.get<label>("nLayerIter")),
     nRelaxedIter_(labelMax),
     additionalReporting_(dict.lookupOrDefault("additionalReporting", false)),
     meshShrinker_
@@ -156,7 +156,7 @@ Foam::layerParameters::layerParameters
         firstLayerThickness_ = scalarField
         (
             boundaryMesh.size(),
-            readScalar(dict.lookup("firstLayerThickness"))
+            dict.get<scalar>("firstLayerThickness")
         );
         nSpec++;
     }
@@ -166,7 +166,7 @@ Foam::layerParameters::layerParameters
         finalLayerThickness_ = scalarField
         (
             boundaryMesh.size(),
-            readScalar(dict.lookup("finalLayerThickness"))
+            dict.get<scalar>("finalLayerThickness")
         );
         nSpec++;
     }
@@ -176,7 +176,7 @@ Foam::layerParameters::layerParameters
         thickness_ = scalarField
         (
             boundaryMesh.size(),
-            readScalar(dict.lookup("thickness"))
+            dict.get<scalar>("thickness")
         );
         nSpec++;
     }
@@ -186,7 +186,7 @@ Foam::layerParameters::layerParameters
         expansionRatio_ = scalarField
         (
             boundaryMesh.size(),
-            readScalar(dict.lookup("expansionRatio"))
+            dict.get<scalar>("expansionRatio")
         );
         nSpec++;
     }
@@ -283,7 +283,7 @@ Foam::layerParameters::layerParameters
                 for (const label patchi : patchIDs)
                 {
                     numLayers_[patchi] =
-                        readLabel(layerDict.lookup("nSurfaceLayers"));
+                        layerDict.get<label>("nSurfaceLayers");
 
                     switch (layerSpec_)
                     {
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
index df86ee5276..c63345f993 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
@@ -34,18 +34,18 @@ License
 
 Foam::refinementParameters::refinementParameters(const dictionary& dict)
 :
-    maxGlobalCells_(readLabel(dict.lookup("maxGlobalCells"))),
-    maxLocalCells_(readLabel(dict.lookup("maxLocalCells"))),
-    minRefineCells_(readLabel(dict.lookup("minRefinementCells"))),
+    maxGlobalCells_(dict.get<label>("maxGlobalCells")),
+    maxLocalCells_(dict.get<label>("maxLocalCells")),
+    minRefineCells_(dict.get<label>("minRefinementCells")),
     planarAngle_
     (
         dict.lookupOrDefault
         (
             "planarAngle",
-            readScalar(dict.lookup("resolveFeatureAngle"))
+            dict.get<scalar>("resolveFeatureAngle")
         )
     ),
-    nBufferLayers_(readLabel(dict.lookup("nCellsBetweenLevels"))),
+    nBufferLayers_(dict.get<label>("nCellsBetweenLevels")),
     locationsOutsideMesh_
     (
         dict.lookupOrDefault
@@ -104,7 +104,7 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
     }
 
 
-    scalar featAngle(readScalar(dict.lookup("resolveFeatureAngle")));
+    const scalar featAngle(dict.get<scalar>("resolveFeatureAngle"));
 
     if (featAngle < 0 || featAngle > 180)
     {
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
index 501f5dc7a1..3f19065202 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
@@ -30,11 +30,11 @@ License
 // Construct from dictionary
 Foam::snapParameters::snapParameters(const dictionary& dict)
 :
-    nSmoothPatch_(readLabel(dict.lookup("nSmoothPatch"))),
+    nSmoothPatch_(dict.get<label>("nSmoothPatch")),
     nSmoothInternal_(dict.lookupOrDefault("nSmoothInternal", 0)),
-    snapTol_(readScalar(dict.lookup("tolerance"))),
-    nSmoothDispl_(readLabel(dict.lookup("nSolveIter"))),
-    nSnap_(readLabel(dict.lookup("nRelaxIter"))),
+    snapTol_(dict.get<scalar>("tolerance")),
+    nSmoothDispl_(dict.get<label>("nSolveIter")),
+    nSnap_(dict.get<label>("nRelaxIter")),
     nFeatureSnap_(dict.lookupOrDefault("nFeatureSnapIter", -1)),
     explicitFeatureSnap_(dict.lookupOrDefault("explicitFeatureSnap", true)),
     implicitFeatureSnap_(dict.lookupOrDefault("implicitFeatureSnap", false)),
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 2b1cc2ee71..89c26ca88f 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -707,8 +707,8 @@ Foam::surfaceFeatures::surfaceFeatures
     surf_(surf),
     featurePoints_(featInfoDict.lookup("featurePoints")),
     featureEdges_(featInfoDict.lookup("featureEdges")),
-    externalStart_(readLabel(featInfoDict.lookup("externalStart"))),
-    internalStart_(readLabel(featInfoDict.lookup("internalStart")))
+    externalStart_(featInfoDict.get<label>("externalStart")),
+    internalStart_(featInfoDict.get<label>("internalStart"))
 {}
 
 
@@ -730,8 +730,8 @@ Foam::surfaceFeatures::surfaceFeatures
 
     featureEdges_ = labelList(featInfoDict.lookup("featureEdges"));
     featurePoints_ = labelList(featInfoDict.lookup("featurePoints"));
-    externalStart_ = readLabel(featInfoDict.lookup("externalStart"));
-    internalStart_ = readLabel(featInfoDict.lookup("internalStart"));
+    externalStart_ = featInfoDict.get<label>("externalStart");
+    internalStart_ = featInfoDict.get<label>("internalStart");
 }
 
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index 73bb15f9a1..d2cec72e0b 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -57,7 +57,7 @@ namespace Foam
 
 Foam::label Foam::decompositionMethod::nDomains(const dictionary& decompDict)
 {
-    return readLabel(decompDict.lookup("numberOfSubdomains"));
+    return decompDict.get<label>("numberOfSubdomains");
 }
 
 
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 64766a1df7..25686ebb72 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -82,7 +82,7 @@ bool Foam::distributedTriSurfaceMesh::read()
     distType_ = distributionTypeNames_.lookup("distributionType", dict_);
 
     // Merge distance
-    mergeDist_ = readScalar(dict_.lookup("mergeDistance"));
+    dict_.readEntry("mergeDistance", mergeDist_);
 
     return true;
 }
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
index ebd0bedcdd..54fe25c512 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisRadiativeCoupledMixed/filmPyrolysisRadiativeCoupledMixedFvPatchScalarField.C
@@ -163,8 +163,8 @@ filmPyrolysisRadiativeCoupledMixedFvPatchScalarField
     TnbrName_(dict.lookup("Tnbr")),
     qrName_(dict.lookup("qr")),
     convectiveScaling_(dict.lookupOrDefault<scalar>("convectiveScaling", 1.0)),
-    filmDeltaDry_(readScalar(dict.lookup("filmDeltaDry"))),
-    filmDeltaWet_(readScalar(dict.lookup("filmDeltaWet")))
+    filmDeltaDry_(dict.get<scalar>("filmDeltaDry")),
+    filmDeltaWet_(dict.get<scalar>("filmDeltaWet"))
 {
     if (!isA<mappedPatchBase>(this->patch().patch()))
     {
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 1ccbd5ca8c..03635edb6e 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -462,10 +462,10 @@ kinematicSingleLayer::kinematicSingleLayer
 
     momentumPredictor_(solution().subDict("PISO").lookup("momentumPredictor")),
     nOuterCorr_(solution().subDict("PISO").lookupOrDefault("nOuterCorr", 1)),
-    nCorr_(readLabel(solution().subDict("PISO").lookup("nCorr"))),
+    nCorr_(solution().subDict("PISO").get<label>("nCorr")),
     nNonOrthCorr_
     (
-        readLabel(solution().subDict("PISO").lookup("nNonOrthCorr"))
+        solution().subDict("PISO").get<label>("nNonOrthCorr")
     ),
 
     cumulativeContErr_(0.0),
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index 8160f7a2ba..b857ed3fae 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -111,7 +111,7 @@ liquidFilmThermo::liquidFilmThermo
     name_("unknown_liquid"),
     liquidPtr_(nullptr),
     ownLiquid_(false),
-    useReferenceValues_(readBool(coeffDict_.lookup("useReferenceValues"))),
+    useReferenceValues_(coeffDict_.get<bool>("useReferenceValues")),
     pRef_(0.0),
     TRef_(0.0)
 {
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
index d70b50c710..d9c30608de 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@@ -56,7 +56,7 @@ laminar::laminar
 )
 :
     filmTurbulenceModel(type(), film, dict),
-    Cf_(readScalar(coeffDict_.lookup("Cf")))
+    Cf_(coeffDict_.get<scalar>("Cf"))
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
index 53419d5b34..fa6f229326 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
@@ -54,7 +54,7 @@ void contactAngleForce::initialise()
     if (zeroForcePatches.size())
     {
         const polyBoundaryMesh& pbm = filmModel_.regionMesh().boundaryMesh();
-        scalar dLim = readScalar(coeffDict_.lookup("zeroForceDistance"));
+        const scalar dLim = coeffDict_.get<scalar>("zeroForceDistance");
 
         Info<< "        Assigning zero contact force within " << dLim
             << " of patches:" << endl;
@@ -99,7 +99,7 @@ contactAngleForce::contactAngleForce
 )
 :
     force(typeName, film, dict),
-    Ccf_(readScalar(coeffDict_.lookup("Ccf"))),
+    Ccf_(coeffDict_.get<scalar>("Ccf")),
     mask_
     (
         IOobject
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
index 1c2e5ebb15..30b4ce185c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
@@ -55,8 +55,8 @@ drippingInjection::drippingInjection
 )
 :
     injectionModel(type(), film, dict),
-    deltaStable_(readScalar(coeffDict_.lookup("deltaStable"))),
-    particlesPerParcel_(readScalar(coeffDict_.lookup("particlesPerParcel"))),
+    deltaStable_(coeffDict_.get<scalar>("deltaStable")),
+    particlesPerParcel_(coeffDict_.get<scalar>("particlesPerParcel")),
     rndGen_(),
     parcelDistribution_
     (
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
index 1dee50801d..6e1d755bad 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
@@ -81,9 +81,9 @@ constantRadiation::constantRadiation
         film.regionMesh(),
         dimensionedScalar("one", dimless, 1.0)
     ),
-    absorptivity_(readScalar(coeffDict_.lookup("absorptivity"))),
-    timeStart_(readScalar(coeffDict_.lookup("timeStart"))),
-    duration_(readScalar(coeffDict_.lookup("duration")))
+    absorptivity_(coeffDict_.get<scalar>("absorptivity")),
+    timeStart_(coeffDict_.get<scalar>("timeStart")),
+    duration_(coeffDict_.get<scalar>("duration"))
 {
     mask_ = pos0(mask_);
 }
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
index eff356e63a..bd4af69630 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
@@ -85,8 +85,8 @@ standardRadiation::standardRadiation
         dimensionedScalar(dimMass/pow3(dimTime), Zero),
         zeroGradientFvPatchScalarField::typeName
     ),
-    beta_(readScalar(coeffDict_.lookup("beta"))),
-    kappaBar_(readScalar(coeffDict_.lookup("kappaBar")))
+    beta_(coeffDict_.get<scalar>("beta")),
+    kappaBar_(coeffDict_.get<scalar>("kappaBar"))
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
index d7e06c9f7a..cc23942fe0 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
@@ -56,7 +56,7 @@ constantHeatTransfer::constantHeatTransfer
 )
 :
     heatTransferModel(typeName, film, dict),
-    c0_(readScalar(coeffDict_.lookup("c0")))
+    c0_(coeffDict_.get<scalar>("c0"))
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
index 46e9f4b77d..60b18c7ca6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C
@@ -56,7 +56,7 @@ solidification::solidification
 )
 :
     phaseChangeModel(typeName, film, dict),
-    T0_(readScalar(coeffDict_.lookup("T0"))),
+    T0_(coeffDict_.get<scalar>("T0")),
     maxSolidificationFrac_
     (
         coeffDict_.lookupOrDefault("maxSolidificationFrac", 0.2)
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
index 28dccfae56..149c5821aa 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
@@ -76,8 +76,8 @@ standardPhaseChange::standardPhaseChange
 )
 :
     phaseChangeModel(typeName, film, dict),
-    deltaMin_(readScalar(coeffDict_.lookup("deltaMin"))),
-    L_(readScalar(coeffDict_.lookup("L"))),
+    deltaMin_(coeffDict_.get<scalar>("deltaMin")),
+    L_(coeffDict_.get<scalar>("L")),
     TbFactor_(coeffDict_.lookupOrDefault<scalar>("TbFactor", 1.1)),
     YInfZero_(coeffDict_.lookupOrDefault<Switch>("YInfZero", false))
 {}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
index a810a952a9..2a55a6134d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
@@ -89,7 +89,7 @@ waxSolventEvaporation::waxSolventEvaporation
             film.regionMesh().time().constant(),
             film.regionMesh()
         ),
-        readScalar(coeffDict_.lookup("Wwax"))
+        coeffDict_.get<scalar>("Wwax")
     ),
     Wsolvent_
     (
@@ -99,7 +99,7 @@ waxSolventEvaporation::waxSolventEvaporation
             film.regionMesh().time().constant(),
             film.regionMesh()
         ),
-        readScalar(coeffDict_.lookup("Wsolvent"))
+        coeffDict_.get<scalar>("Wsolvent")
     ),
     Ysolvent0_
     (
@@ -124,8 +124,8 @@ waxSolventEvaporation::waxSolventEvaporation
         ),
         film.regionMesh()
     ),
-    deltaMin_(readScalar(coeffDict_.lookup("deltaMin"))),
-    L_(readScalar(coeffDict_.lookup("L"))),
+    deltaMin_(coeffDict_.get<scalar>("deltaMin")),
+    L_(coeffDict_.get<scalar>("L")),
     TbFactor_(coeffDict_.lookupOrDefault<scalar>("TbFactor", 1.1)),
     YInfZero_(coeffDict_.lookupOrDefault("YInfZero", false)),
     activityCoeff_
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 4876ae4bc4..d878a648ef 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -429,8 +429,8 @@ thermoSingleLayer::thermoSingleLayer
         zeroGradientFvPatchScalarField::typeName
     ),
 
-    deltaWet_(readScalar(coeffs_.lookup("deltaWet"))),
-    hydrophilic_(readBool(coeffs_.lookup("hydrophilic"))),
+    deltaWet_(coeffs_.get<scalar>("deltaWet")),
+    hydrophilic_(coeffs_.get<bool>("hydrophilic")),
     hydrophilicDryScale_(0.0),
     hydrophilicWetScale_(0.0),
 
diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
index 23620a8942..7d96eb8e8d 100644
--- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C
@@ -170,7 +170,7 @@ void thermalBaffleFvPatchScalarField::createPatchMesh()
     patchTypes[bottomPatchID] = mappedWallPolyPatch::typeName;
     patchTypes[topPatchID] = mappedWallPolyPatch::typeName;
 
-    if (readBool(dict_.lookup("columnCells")))
+    if (dict_.get<bool>("columnCells"))
     {
         patchTypes[sidePatchID] = emptyPolyPatch::typeName;
     }
@@ -264,31 +264,22 @@ void thermalBaffleFvPatchScalarField::write(Ostream& os) const
 
     if (owner_ && (thisMesh.name() == polyMesh::defaultRegion))
     {
-        os.writeKeyword("extrudeModel");
-        os << word(dict_.lookup("extrudeModel"))
-           << token::END_STATEMENT << nl;
+        os.writeEntry("extrudeModel", dict_.get<word>("extrudeModel"));
 
-        os.writeKeyword("nLayers");
-        os << readLabel(dict_.lookup("nLayers"))
-           << token::END_STATEMENT << nl;
+        os.writeEntry("nLayers", dict_.get<label>("nLayers"));
 
-        os.writeKeyword("expansionRatio");
-        os << readScalar(dict_.lookup("expansionRatio"))
-           << token::END_STATEMENT << nl;
+        os.writeEntry("expansionRatio", dict_.get<scalar>("expansionRatio"));
 
-        os.writeKeyword("columnCells");
-        os << readBool(dict_.lookup("columnCells"))
-           << token::END_STATEMENT << nl;
+        os.writeEntry("columnCells", dict_.get<Switch>("columnCells"));
+
+        const word extrudeModel(dict_.get<word>("extrudeModel") + "Coeffs");
 
-        word extrudeModel(word(dict_.lookup("extrudeModel")) + "Coeffs");
         os.writeKeyword(extrudeModel);
         os << dict_.subDict(extrudeModel) << nl;
 
-        word regionName = dict_.lookup("region");
-        os.writeEntry("region", regionName);
+        os.writeEntry("region", dict_.get<word>("region"));
 
-        bool active = readBool(dict_.lookup("active"));
-        os.writeEntry("active", active);
+        os.writeEntry("active", dict_.get<Switch>("active"));
 
         os.writeKeyword("thermoType");
         os << dict_.subDict("thermoType") << nl;
diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
index 75ec4d1086..d2b30e2305 100644
--- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
+++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
@@ -164,7 +164,7 @@ thermalBaffle::thermalBaffle
 )
 :
     thermalBaffleModel(modelType, mesh, dict),
-    nNonOrthCorr_(readLabel(solution().lookup("nNonOrthCorr"))),
+    nNonOrthCorr_(solution().get<label>("nNonOrthCorr")),
     thermo_(solidThermo::New(regionMesh(), dict)),
     h_(thermo_->he()),
     qs_
@@ -214,7 +214,7 @@ thermalBaffle::thermalBaffle
 )
 :
     thermalBaffleModel(modelType, mesh),
-    nNonOrthCorr_(readLabel(solution().lookup("nNonOrthCorr"))),
+    nNonOrthCorr_(solution().get<label>("nNonOrthCorr")),
     thermo_(solidThermo::New(regionMesh())),
     h_(thermo_->he()),
     qs_
diff --git a/src/renumber/renumberMethods/springRenumber/springRenumber.C b/src/renumber/renumberMethods/springRenumber/springRenumber.C
index eb31b53b0a..1a64c64809 100644
--- a/src/renumber/renumberMethods/springRenumber/springRenumber.C
+++ b/src/renumber/renumberMethods/springRenumber/springRenumber.C
@@ -48,9 +48,9 @@ Foam::springRenumber::springRenumber(const dictionary& renumberDict)
 :
     renumberMethod(renumberDict),
     dict_(renumberDict.optionalSubDict(typeName+"Coeffs")),
-    maxCo_(readScalar(dict_.lookup("maxCo"))),
-    maxIter_(readLabel(dict_.lookup("maxIter"))),
-    freezeFraction_(readScalar(dict_.lookup("freezeFraction")))
+    maxCo_(dict_.get<scalar>("maxCo")),
+    maxIter_(dict_.get<label>("maxIter")),
+    freezeFraction_(dict_.get<scalar>("freezeFraction"))
 {}
 
 
diff --git a/src/rigidBodyDynamics/bodies/cuboid/cuboidI.H b/src/rigidBodyDynamics/bodies/cuboid/cuboidI.H
index e18a835bc0..825a9e5bf1 100644
--- a/src/rigidBodyDynamics/bodies/cuboid/cuboidI.H
+++ b/src/rigidBodyDynamics/bodies/cuboid/cuboidI.H
@@ -67,10 +67,10 @@ inline Foam::RBD::cuboid::cuboid
 )
 :
     rigidBody(name, rigidBodyInertia()),
-    L_(dict.lookup("L"))
+    L_(dict.get<vector>("L"))
 {
-    const scalar m(readScalar(dict.lookup("mass")));
-    const vector c(dict.lookup("centreOfMass"));
+    const scalar m(dict.get<scalar>("mass"));
+    const vector c(dict.get<vector>("centreOfMass"));
     rigidBodyInertia::operator=(rigidBodyInertia(m, c, I(m, L_)));
 }
 
diff --git a/src/rigidBodyDynamics/bodies/sphere/sphereI.H b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
index 49d9fc0e0b..ad10355607 100644
--- a/src/rigidBodyDynamics/bodies/sphere/sphereI.H
+++ b/src/rigidBodyDynamics/bodies/sphere/sphereI.H
@@ -57,10 +57,10 @@ inline Foam::RBD::sphere::sphere
 )
 :
     rigidBody(name, rigidBodyInertia()),
-    r_(readScalar(dict.lookup("radius")))
+    r_(dict.get<scalar>("radius"))
 {
-    const scalar m(readScalar(dict.lookup("mass")));
-    const vector c(dict.lookup("centreOfMass"));
+    const scalar m(dict.get<scalar>("mass"));
+    const vector c(dict.get<vector>("centreOfMass"));
     rigidBodyInertia::operator=(rigidBodyInertia(m, c, I(m, r_)));
 }
 
diff --git a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
index 78d74db215..69a422c794 100644
--- a/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
+++ b/src/rigidBodyDynamics/rigidBodyInertia/rigidBodyInertiaI.H
@@ -64,7 +64,7 @@ inline Foam::RBD::rigidBodyInertia::rigidBodyInertia
 
 inline Foam::RBD::rigidBodyInertia::rigidBodyInertia(const dictionary& dict)
 :
-    m_(readScalar(dict.lookup("mass"))),
+    m_(dict.get<scalar>("mass")),
     c_(dict.lookup("centreOfMass")),
     Ic_(dict.lookup("inertia"))
 {}
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index e46c901565..1b180de70d 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -62,8 +62,8 @@ Foam::rigidBodyMeshMotion::bodyMesh::bodyMesh
     bodyID_(bodyID),
     patches_(dict.lookup("patches")),
     patchSet_(mesh.boundaryMesh().patchSet(patches_)),
-    di_(readScalar(dict.lookup("innerDistance"))),
-    do_(readScalar(dict.lookup("outerDistance"))),
+    di_(dict.get<scalar>("innerDistance")),
+    do_(dict.get<scalar>("outerDistance")),
     weight_
     (
         IOobject
@@ -248,7 +248,7 @@ void Foam::rigidBodyMeshMotion::solve()
 
     if (test_)
     {
-        label nIter(readLabel(coeffDict().lookup("nIter")));
+        const label nIter(coeffDict().get<label>("nIter"));
 
         for (label i=0; i<nIter; i++)
         {
@@ -263,7 +263,7 @@ void Foam::rigidBodyMeshMotion::solve()
     }
     else
     {
-        label nIter(coeffDict().lookupOrDefault("nIter", 1));
+        const label nIter(coeffDict().lookupOrDefault("nIter", 1));
 
         for (label i=0; i<nIter; i++)
         {
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
index abf0312812..fffe4747a5 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
@@ -122,7 +122,7 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver
 {
     if (rhoName_ == "rhoInf")
     {
-        rhoInf_ = readScalar(coeffDict().lookup("rhoInf"));
+        coeffDict().readEntry("rhoInf", rhoInf_);
     }
 
     const dictionary& bodiesDict = coeffDict().subDict("bodies");
@@ -196,7 +196,7 @@ void Foam::rigidBodyMeshMotionSolver::solve()
 
     if (test_)
     {
-        label nIter(readLabel(coeffDict().lookup("nIter")));
+        const label nIter(coeffDict().get<label>("nIter"));
 
         for (label i=0; i<nIter; i++)
         {
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index e1508439b6..22a934c62e 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -75,7 +75,7 @@ sixDoFRigidBodyDisplacementPointPatchVectorField
 {
     if (rhoName_ == "rhoInf")
     {
-        rhoInf_ = readScalar(dict.lookup("rhoInf"));
+        dict.readEntry("rhoInf", rhoInf_);
     }
 
     if (dict.readIfPresent("g", g_))
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index 8e51d68c7d..181fff875f 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -119,7 +119,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
             dict.lookupOrDefault("orientation", tensor::I)
         )
     ),
-    mass_(readScalar(dict.lookup("mass"))),
+    mass_(dict.get<scalar>("mass")),
     momentOfInertia_(dict.lookup("momentOfInertia")),
     aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
     aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)),
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
index ef88a6c222..cf5c3f38a5 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
@@ -83,8 +83,8 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
     ),
     patches_(wordRes(coeffDict().lookup("patches"))),
     patchSet_(mesh.boundaryMesh().patchSet(patches_)),
-    di_(readScalar(coeffDict().lookup("innerDistance"))),
-    do_(readScalar(coeffDict().lookup("outerDistance"))),
+    di_(coeffDict().get<scalar>("innerDistance")),
+    do_(coeffDict().get<scalar>("outerDistance")),
     test_(coeffDict().lookupOrDefault("test", false)),
     rhoInf_(1.0),
     rhoName_(coeffDict().lookupOrDefault<word>("rho", "rho")),
@@ -106,7 +106,7 @@ Foam::sixDoFRigidBodyMotionSolver::sixDoFRigidBodyMotionSolver
 {
     if (rhoName_ == "rhoInf")
     {
-        rhoInf_ = readScalar(coeffDict().lookup("rhoInf"));
+        coeffDict().readEntry("rhoInf", rhoInf_);
     }
 
     // Calculate scaling factor everywhere
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
index fd5cec5245..fa70b7ac03 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/DAC/DAC.C
@@ -203,7 +203,7 @@ Foam::chemistryReductionMethods::DAC<CompType, ThermoType>::DAC
 
         forAll(fuelSpecies_, i)
         {
-            fuelSpeciesProp_[i] = readScalar(fuelDict.lookup(fuelSpecies_[i]));
+            fuelSpeciesProp_[i] = fuelDict.get<scalar>(fuelSpecies_[i]);
             for (label j=0; j<this->nSpecie_; j++)
             {
                 if (this->chemistry_.Y()[j].member() == fuelSpecies_[i])
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.C
index f6c590b8d7..e5130042c4 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/ISAT.C
@@ -80,8 +80,8 @@ Foam::chemistryTabulationMethods::ISAT<CompType, ThermoType>::ISAT
     if (this->active_)
     {
         dictionary scaleDict(this->coeffsDict_.subDict("scaleFactor"));
-        label Ysize = this->chemistry_.Y().size();
-        scalar otherScaleFactor = readScalar(scaleDict.lookup("otherSpecies"));
+        const label Ysize = this->chemistry_.Y().size();
+        const scalar otherScaleFactor = scaleDict.get<scalar>("otherSpecies");
         for (label i=0; i<Ysize; ++i)
         {
             if (!scaleDict.found(this->chemistry_.Y()[i].member()))
@@ -91,17 +91,16 @@ Foam::chemistryTabulationMethods::ISAT<CompType, ThermoType>::ISAT
             else
             {
                 scaleFactor_[i] =
-                    readScalar
-                    (
-                        scaleDict.lookup(this->chemistry_.Y()[i].member())
-                    );
+                    scaleDict.get<scalar>(this->chemistry_.Y()[i].member());
             }
         }
-        scaleFactor_[Ysize] = readScalar(scaleDict.lookup("Temperature"));
-        scaleFactor_[Ysize + 1] = readScalar(scaleDict.lookup("Pressure"));
+
+        scaleDict.readEntry("Temperature", scaleFactor_[Ysize]);
+        scaleDict.readEntry("Pressure", scaleFactor_[Ysize + 1]);
+
         if (this->variableTimeStep())
         {
-            scaleFactor_[Ysize + 2] = readScalar(scaleDict.lookup("deltaT"));
+            scaleDict.readEntry("deltaT", scaleFactor_[Ysize + 2]);
         }
     }
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryTree/binaryTree.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryTree/binaryTree.C
index f0dd938245..284302ef26 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryTree/binaryTree.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/ISAT/binaryTree/binaryTree.C
@@ -358,7 +358,7 @@ Foam::binaryTree<CompType, ThermoType>::binaryTree
 :
     chemistry_(chemistry),
     root_(nullptr),
-    maxNLeafs_(readLabel(coeffsDict.lookup("maxNLeafs"))),
+    maxNLeafs_(coeffsDict.get<label>("maxNLeafs")),
     size_(0),
     n2ndSearch_(0),
     max2ndSearch_(coeffsDict.lookupOrDefault("max2ndSearch",0)),
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
index 4f870cc437..53f5239f7f 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModel.C
@@ -57,7 +57,7 @@ Foam::basicChemistryModel::basicChemistryModel(basicThermo& thermo)
     ),
     mesh_(thermo.p().mesh()),
     chemistry_(lookup("chemistry")),
-    deltaTChemIni_(readScalar(lookup("initialChemicalTimeStep"))),
+    deltaTChemIni_(get<scalar>("initialChemicalTimeStep")),
     deltaTChemMax_(lookupOrDefault("maxChemicalTimeStep", GREAT)),
     deltaTChem_
     (
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
index da15b7b087..d51d31436d 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
@@ -38,7 +38,7 @@ Foam::EulerImplicit<ChemistryModel>::EulerImplicit
 :
     chemistrySolver<ChemistryModel>(thermo),
     coeffsDict_(this->subDict("EulerImplicitCoeffs")),
-    cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))),
+    cTauChem_(coeffsDict_.get<scalar>("cTauChem")),
     eqRateLimiter_(coeffsDict_.lookup("equilibriumRateLimiter")),
     cTp_(this->nEqns())
 {}
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
index 4decd9cf27..c1dbfacc4d 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
@@ -55,12 +55,12 @@ Foam::laminarFlameSpeedModels::Gulders::Gulders
     laminarFlameSpeed(dict, ct),
 
     coeffsDict_(dict.optionalSubDict(typeName + "Coeffs").subDict(fuel_)),
-    W_(readScalar(coeffsDict_.lookup("W"))),
-    eta_(readScalar(coeffsDict_.lookup("eta"))),
-    xi_(readScalar(coeffsDict_.lookup("xi"))),
-    f_(readScalar(coeffsDict_.lookup("f"))),
-    alpha_(readScalar(coeffsDict_.lookup("alpha"))),
-    beta_(readScalar(coeffsDict_.lookup("beta")))
+    W_(coeffsDict_.get<scalar>("W")),
+    eta_(coeffsDict_.get<scalar>("eta")),
+    xi_(coeffsDict_.get<scalar>("xi")),
+    f_(coeffsDict_.get<scalar>("f")),
+    alpha_(coeffsDict_.get<scalar>("alpha")),
+    beta_(coeffsDict_.get<scalar>("beta"))
 {}
 
 
diff --git a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
index 48f9ff392d..97c10ebb27 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
@@ -54,12 +54,12 @@ Foam::laminarFlameSpeedModels::GuldersEGR::GuldersEGR
     laminarFlameSpeed(dict, ct),
 
     coeffsDict_(dict.optionalSubDict(typeName + "Coeffs").subDict(fuel_)),
-    W_(readScalar(coeffsDict_.lookup("W"))),
-    eta_(readScalar(coeffsDict_.lookup("eta"))),
-    xi_(readScalar(coeffsDict_.lookup("xi"))),
-    f_(readScalar(coeffsDict_.lookup("f"))),
-    alpha_(readScalar(coeffsDict_.lookup("alpha"))),
-    beta_(readScalar(coeffsDict_.lookup("beta")))
+    W_(coeffsDict_.get<scalar>("W")),
+    eta_(coeffsDict_.get<scalar>("eta")),
+    xi_(coeffsDict_.get<scalar>("xi")),
+    f_(coeffsDict_.get<scalar>("f")),
+    alpha_(coeffsDict_.get<scalar>("alpha")),
+    beta_(coeffsDict_.get<scalar>("beta"))
 {}
 
 
diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
index ecd107189c..ed707d79ee 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
@@ -58,7 +58,7 @@ Foam::laminarFlameSpeedModels::RaviPetersen::RaviPetersen
     EqRPoints_(coeffsDict_.lookup("EqRPoints")),
     alpha_(coeffsDict_.lookup("alpha")),
     beta_(coeffsDict_.lookup("beta")),
-    TRef_(readScalar(coeffsDict_.lookup("TRef")))
+    TRef_(coeffsDict_.get<scalar>("TRef"))
 {
     checkPointsMonotonicity("equivalenceRatio", EqRPoints_);
     checkPointsMonotonicity("pressure", pPoints_);
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index e587e3f94f..cffafb7baf 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -279,8 +279,8 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
         mesh_,
         dimensionedScalar(dimless/dimLength, Zero)
     ),
-    nTheta_(readLabel(coeffs_.lookup("nTheta"))),
-    nPhi_(readLabel(coeffs_.lookup("nPhi"))),
+    nTheta_(coeffs_.get<label>("nTheta")),
+    nPhi_(coeffs_.get<label>("nPhi")),
     nRay_(0),
     nLambda_(absorptionEmission_->nBands()),
     aLambda_(nLambda_),
@@ -375,8 +375,8 @@ Foam::radiation::fvDOM::fvDOM
         mesh_,
         dimensionedScalar(dimless/dimLength, Zero)
     ),
-    nTheta_(readLabel(coeffs_.lookup("nTheta"))),
-    nPhi_(readLabel(coeffs_.lookup("nPhi"))),
+    nTheta_(coeffs_.get<label>("nTheta")),
+    nPhi_(coeffs_.get<label>("nPhi")),
     nRay_(0),
     nLambda_(absorptionEmission_->nBands()),
     aLambda_(nLambda_),
diff --git a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
index d9da6157ff..d4f7607958 100644
--- a/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
+++ b/src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
@@ -155,8 +155,7 @@ void Foam::radiation::viewFactor::initialise()
         }
 
 
-        bool smoothing = readBool(coeffs_.lookup("smoothing"));
-        if (smoothing)
+        if (coeffs_.get<bool>("smoothing"))
         {
             if (debug)
             {
@@ -180,7 +179,7 @@ void Foam::radiation::viewFactor::initialise()
             }
         }
 
-        constEmissivity_ = readBool(coeffs_.lookup("constantEmissivity"));
+        coeffs_.readEntry("constantEmissivity", constEmissivity_);
         if (constEmissivity_)
         {
             CLU_.reset
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 221fbfa4f2..c5a782b23c 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -61,7 +61,7 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
     specieIndex_(label(0)),
     lookUpTablePtr_(),
     thermo_(mesh.lookupObject<fluidThermo>(basicThermo::dictName)),
-    EhrrCoeff_(readScalar(coeffsDict_.lookup("EhrrCoeff"))),
+    EhrrCoeff_(coeffsDict_.get<scalar>("EhrrCoeff")),
     Yj_(nSpecies_)
 {
     if (!isA<basicSpecieMixture>(thermo_))
diff --git a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
index 6d9ef2a18d..5d68a5c9c9 100644
--- a/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
+++ b/src/thermophysicalModels/radiation/submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C
@@ -173,41 +173,30 @@ Foam::radiation::boundaryRadiationPropertiesPatch::emissivity
 
             mpp.distribute(emissivity);
 
-            const tmp<scalarField> te(new scalarField(emissivity));
-
-            return te;
-
+            return tmp<scalarField>::New(std::move(emissivity));
         }
         break;
 
         case LOOKUP:
         {
-            tmp<scalarField> e
+            return tmp<scalarField>::New
             (
-                new scalarField
-                (
-                    patch_.size(),
-                    readScalar(dict_.lookup("emissivity"))
-                )
+                patch_.size(),
+                dict_.get<scalar>("emissivity")
             );
-
-            return e;
         }
+        break;
 
         case MODEL:
         {
             const label index = patch_.index();
 
-            tmp<scalarField> e
+            return tmp<scalarField>::New
             (
-                 new scalarField
-                 (
-                     absorptionEmission_->e(bandI)().boundaryField()[index]
-                 )
+                absorptionEmission_->e(bandI)().boundaryField()[index]
             );
-
-            return e;
         }
+        break;
 
         default:
         {
@@ -254,9 +243,7 @@ Foam::radiation::boundaryRadiationPropertiesPatch::absorptivity
 
             mpp.distribute(absorp);
 
-            const tmp<scalarField> ta(new scalarField(absorp));
-
-            return ta;
+            return tmp<scalarField>::New(std::move(absorp));
 
         }
         break;
@@ -264,29 +251,23 @@ Foam::radiation::boundaryRadiationPropertiesPatch::absorptivity
         case MODEL:
         {
             const label index = patch_.index();
-            tmp<scalarField> a
+
+            return tmp<scalarField>::New
             (
-                 new scalarField
-                 (
-                     absorptionEmission_->a(bandI)().boundaryField()[index]
-                 )
+                absorptionEmission_->a(bandI)().boundaryField()[index]
             );
-            return a;
         }
+        break;
 
         case LOOKUP:
         {
-            tmp<scalarField> a
+            return tmp<scalarField>::New
             (
-                new scalarField
-                (
-                    patch_.size(),
-                    readScalar(dict_.lookup("absorptivity"))
-                )
+                patch_.size(),
+                dict_.get<scalar>("absorptivity")
             );
-
-            return a;
         }
+        break;
 
         default:
         {
@@ -334,9 +315,7 @@ Foam::radiation::boundaryRadiationPropertiesPatch::transmissivity
 
             mpp.distribute(trans);
 
-            const tmp<scalarField> tt(new scalarField(trans));
-
-            return tt;
+            return tmp<scalarField>::New(std::move(trans));
 
         }
         break;
@@ -344,28 +323,20 @@ Foam::radiation::boundaryRadiationPropertiesPatch::transmissivity
         case MODEL:
         {
             const label index = patch_.index();
-            tmp<scalarField> tau
+
+            return tmp<scalarField>::New
             (
-                 new scalarField
-                 (
-                     transmissivity_->tauEff(bandI)().boundaryField()[index]
-                 )
+                transmissivity_->tauEff(bandI)().boundaryField()[index]
             );
-            return tau;
         }
 
         case LOOKUP:
         {
-            tmp<scalarField> tau
+            return tmp<scalarField>::New
             (
-                new scalarField
-                (
-                    patch_.size(),
-                    readScalar(dict_.lookup("transmissivity"))
-                )
+                patch_.size(),
+                dict_.get<scalar>("transmissivity")
             );
-
-            return tau;
         }
 
         default:
@@ -407,7 +378,7 @@ void Foam::radiation::boundaryRadiationPropertiesPatch::write
     {
         case MODEL:
         {
-            word modelType(dict_.lookup("absorptionEmissionModel"));
+            word modelType(dict_.get<word>("absorptionEmissionModel"));
 
             os.writeEntry("absorptionEmissionModel", modelType);
 
@@ -416,7 +387,7 @@ void Foam::radiation::boundaryRadiationPropertiesPatch::write
 
             dict_.subDict(modelCoeffs).write(os);
 
-            modelType = word(dict_.lookup("transmissivityModel"));
+            modelType = dict_.get<word>("transmissivityModel");
 
             os.writeEntry("transmissivityModel", modelType);
 
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index 5a30633948..70a8df2ad8 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -82,16 +82,17 @@ void Foam::solarCalculator::calculateBetaTetha()
         }
     }
 
-    scalar LSM = 15.0*(readScalar(dict_.lookup("localStandardMeridian")));
+    scalar LSM = 15.0*(dict_.get<scalar>("localStandardMeridian"));
 
-    scalar D = readScalar(dict_.lookup("startDay")) + runTime/86400.0;
+    scalar D = dict_.get<scalar>("startDay") + runTime/86400.0;
     scalar M = 6.24004 + 0.0172*D;
     scalar EOT = -7.659*sin(M) + 9.863*sin(2*M + 3.5932);
 
-    startTime_ = readScalar(dict_.lookup("startTime"));
+    dict_.readEntry("startTime", startTime_);
+
     scalar LST =  startTime_ + runTime/3600.0;
 
-    scalar LON = readScalar(dict_.lookup("longitude"));
+    scalar LON = dict_.get<scalar>("longitude");
 
     scalar AST = LST + EOT/60.0 + (LON - LSM)/15;
 
@@ -99,7 +100,7 @@ void Foam::solarCalculator::calculateBetaTetha()
 
     scalar H = degToRad(15*(AST - 12));
 
-    scalar L = degToRad(readScalar(dict_.lookup("latitude")));
+    scalar L = degToRad(dict_.get<scalar>("latitude"));
 
     scalar deltaRad = degToRad(delta);
     beta_ = max(asin(cos(L)*cos(deltaRad)*cos(H) + sin(L)*sin(deltaRad)), 1e-3);
@@ -208,10 +209,10 @@ void Foam::solarCalculator::init()
                 skyCloudCoverFraction_
             );
 
-            A_ = dict_.get<scalar>("A");
-            B_ = dict_.get<scalar>("B");
+            dict_.readEntry("A", A_);
+            dict_.readEntry("B", B_);
 
-            if (!dict_.readIfPresent("beta",beta_))
+            if (!dict_.readIfPresent("beta", beta_))
             {
                 calculateBetaTetha();
             }
@@ -257,7 +258,7 @@ Foam::solarCalculator::solarCalculator
     skyCloudCoverFraction_(0.0),
     Setrn_(0.0),
     SunPrime_(0.0),
-    C_(readScalar(dict.lookup("C"))),
+    C_(dict.get<scalar>("C")),
     sunDirectionModel_
     (
         sunDirectionModelTypeNames_.lookup("sunDirectionModel", dict)
diff --git a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
index aa12edffee..306d407167 100644
--- a/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
+++ b/src/thermophysicalModels/radiation/submodels/sootModel/mixtureFractionSoot/mixtureFractionSoot.C
@@ -83,8 +83,8 @@ Foam::radiation::mixtureFractionSoot<ThermoType>::mixtureFractionSoot
         mesh_
     ),
     coeffsDict_(dict.subOrEmptyDict(modelType + "Coeffs")),
-    nuSoot_(readScalar(coeffsDict_.lookup("nuSoot"))),
-    Wsoot_(readScalar(coeffsDict_.lookup("Wsoot"))),
+    nuSoot_(coeffsDict_.get<scalar>("nuSoot")),
+    Wsoot_(coeffsDict_.get<scalar>("Wsoot")),
     sootMax_(-1),
     mappingFieldName_
     (
diff --git a/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.C b/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.C
index 7f056a1154..af505ec7dd 100644
--- a/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.C
+++ b/src/thermophysicalModels/radiation/submodels/transmissivityModel/constantTransmissivity/constantTransmissivity.C
@@ -54,7 +54,7 @@ Foam::radiation::constantTransmissivity::constantTransmissivity
 :
     transmissivityModel(dict, mesh),
     coeffsDict_(dict.subDict(typeName + "Coeffs")),
-    tau_(readScalar(coeffsDict_.lookup("transmissivity")))
+    tau_(coeffsDict_.get<scalar>("transmissivity"))
 {}
 
 
diff --git a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
index b9e8689047..afa131e0df 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/solidSpecie/reaction/reactionRate/solidArrheniusReactionRate/solidArrheniusReactionRateI.H
@@ -45,9 +45,9 @@ inline Foam::solidArrheniusReactionRate::solidArrheniusReactionRate
     const dictionary& dict
 )
 :
-    A_(readScalar(dict.lookup("A"))),
-    Ta_(readScalar(dict.lookup("Ta"))),
-    Tcrit_(readScalar(dict.lookup("Tcrit")))
+    A_(dict.get<scalar>("A")),
+    Ta_(dict.get<scalar>("Ta")),
+    Tcrit_(dict.get<scalar>("Tcrit"))
 {}
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C
index 5a99f4caaa..b4be7bb153 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C
@@ -35,7 +35,7 @@ Foam::constAnIsoSolidTransport<Thermo>::constAnIsoSolidTransport
 )
 :
     Thermo(dict),
-    kappa_(dict.subDict("transport").lookup("kappa"))
+    kappa_(dict.subDict("transport").get<vector>("kappa"))
 {}
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C
index 2d9135e811..3531060f98 100644
--- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C
+++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C
@@ -35,7 +35,7 @@ Foam::constIsoSolidTransport<Thermo>::constIsoSolidTransport
 )
 :
     Thermo(dict),
-    kappa_(readScalar(dict.subDict("transport").lookup("kappa")))
+    kappa_(dict.subDict("transport").get<scalar>("kappa"))
 {}
 
 
diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C
index 02d6635d3f..b3a361e559 100644
--- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C
+++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C
@@ -40,9 +40,9 @@ Foam::exponentialSolidTransport<Thermo>::exponentialSolidTransport
     Tref_(0.0)
 {
     const dictionary& subDict = dict.subDict("transport");
-    kappa0_ = readScalar(subDict.lookup("kappa0"));
-    n0_ = readScalar(subDict.lookup("n0"));
-    Tref_ = readScalar(subDict.lookup("Tref"));
+    subDict.readEntry("kappa0", kappa0_);
+    subDict.readEntry("n0", n0_);
+    subDict.readEntry("Tref", Tref_);
 }
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
index 66ae9a7cf7..0675f3ff86 100644
--- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
+++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C
@@ -35,9 +35,9 @@ Foam::Boussinesq<Specie>::Boussinesq
 )
 :
     Specie(dict),
-    rho0_(readScalar(dict.subDict("equationOfState").lookup("rho0"))),
-    T0_(readScalar(dict.subDict("equationOfState").lookup("T0"))),
-    beta_(readScalar(dict.subDict("equationOfState").lookup("beta")))
+    rho0_(dict.subDict("equationOfState").get<scalar>("rho0")),
+    T0_(dict.subDict("equationOfState").get<scalar>("T0")),
+    beta_(dict.subDict("equationOfState").get<scalar>("beta"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
index e61f40d5f2..5e119d1fde 100644
--- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.C
@@ -35,11 +35,11 @@ Foam::PengRobinsonGas<Specie>::PengRobinsonGas
 )
 :
     Specie(dict),
-    Tc_(readScalar(dict.subDict("equationOfState").lookup("Tc"))),
-    Vc_(readScalar(dict.subDict("equationOfState").lookup("Vc"))),
+    Tc_(dict.subDict("equationOfState").get<scalar>("Tc")),
+    Vc_(dict.subDict("equationOfState").get<scalar>("Vc")),
     Zc_(1.0),
-    Pc_(readScalar(dict.subDict("equationOfState").lookup("Pc"))),
-    omega_(readScalar(dict.subDict("equationOfState").lookup("omega")))
+    Pc_(dict.subDict("equationOfState").get<scalar>("Pc")),
+    omega_(dict.subDict("equationOfState").get<scalar>("omega"))
 {
     Zc_ = Pc_*Vc_/(RR*Tc_);
 }
diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
index 2c415b8748..0c2cce5081 100644
--- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
+++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C
@@ -35,10 +35,10 @@ Foam::adiabaticPerfectFluid<Specie>::adiabaticPerfectFluid
 )
 :
     Specie(dict),
-    p0_(readScalar(dict.subDict("equationOfState").lookup("p0"))),
-    rho0_(readScalar(dict.subDict("equationOfState").lookup("rho0"))),
-    gamma_(readScalar(dict.subDict("equationOfState").lookup("gamma"))),
-    B_(readScalar(dict.subDict("equationOfState").lookup("B")))
+    p0_(dict.subDict("equationOfState").get<scalar>("p0")),
+    rho0_(dict.subDict("equationOfState").get<scalar>("rho0")),
+    gamma_(dict.subDict("equationOfState").get<scalar>("gamma")),
+    B_(dict.subDict("equationOfState").get<scalar>("B"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
index c2aa3c0a8f..ffd1234235 100644
--- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
+++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C
@@ -35,7 +35,7 @@ Foam::incompressiblePerfectGas<Specie>::incompressiblePerfectGas
 )
 :
     Specie(dict),
-    pRef_(readScalar(dict.subDict("equationOfState").lookup("pRef")))
+    pRef_(dict.subDict("equationOfState").get<scalar>("pRef"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.C b/src/thermophysicalModels/specie/equationOfState/linear/linear.C
index 723eef4639..6f4e2c00f2 100644
--- a/src/thermophysicalModels/specie/equationOfState/linear/linear.C
+++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.C
@@ -32,8 +32,8 @@ template<class Specie>
 Foam::linear<Specie>::linear(const dictionary& dict)
 :
     Specie(dict),
-    psi_(readScalar(dict.subDict("equationOfState").lookup("psi"))),
-    rho0_(readScalar(dict.subDict("equationOfState").lookup("rho0")))
+    psi_(dict.subDict("equationOfState").get<scalar>("psi")),
+    rho0_(dict.subDict("equationOfState").get<scalar>("rho0"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
index cf64fb75a8..5e161a28a2 100644
--- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
+++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C
@@ -32,8 +32,8 @@ template<class Specie>
 Foam::perfectFluid<Specie>::perfectFluid(const dictionary& dict)
 :
     Specie(dict),
-    R_(readScalar(dict.subDict("equationOfState").lookup("R"))),
-    rho0_(readScalar(dict.subDict("equationOfState").lookup("rho0")))
+    R_(dict.subDict("equationOfState").get<scalar>("R")),
+    rho0_(dict.subDict("equationOfState").get<scalar>("rho0"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C
index f7ccfdb5a5..9907eb46f1 100644
--- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C
+++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C
@@ -32,7 +32,7 @@ template<class Specie>
 Foam::rhoConst<Specie>::rhoConst(const dictionary& dict)
 :
     Specie(dict),
-    rho_(readScalar(dict.subDict("equationOfState").lookup("rho")))
+    rho_(dict.subDict("equationOfState").get<scalar>("rho"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
index 75bed82ef2..b6f73b357a 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
@@ -44,9 +44,9 @@ inline Foam::ArrheniusReactionRate::ArrheniusReactionRate
     const dictionary& dict
 )
 :
-    A_(readScalar(dict.lookup("A"))),
-    beta_(readScalar(dict.lookup("beta"))),
-    Ta_(readScalar(dict.lookup("Ta")))
+    A_(dict.get<scalar>("A")),
+    beta_(dict.get<scalar>("beta")),
+    Ta_(dict.get<scalar>("Ta"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
index cc76c2c2c5..c9d10e755d 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
@@ -46,9 +46,9 @@ inline Foam::JanevReactionRate::JanevReactionRate
     const dictionary& dict
 )
 :
-    A_(readScalar(dict.lookup("A"))),
-    beta_(readScalar(dict.lookup("beta"))),
-    Ta_(readScalar(dict.lookup("Ta"))),
+    A_(dict.get<scalar>("A")),
+    beta_(dict.get<scalar>("beta")),
+    Ta_(dict.get<scalar>("Ta")),
     b_(dict.lookup("b"))
 {}
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
index 992b3d9ea4..19640ec90e 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
@@ -48,11 +48,11 @@ inline Foam::LandauTellerReactionRate::LandauTellerReactionRate
     const dictionary& dict
 )
 :
-    A_(readScalar(dict.lookup("A"))),
-    beta_(readScalar(dict.lookup("beta"))),
-    Ta_(readScalar(dict.lookup("Ta"))),
-    B_(readScalar(dict.lookup("B"))),
-    C_(readScalar(dict.lookup("C")))
+    A_(dict.get<scalar>("A")),
+    beta_(dict.get<scalar>("beta")),
+    Ta_(dict.get<scalar>("Ta")),
+    B_(dict.get<scalar>("B")),
+    C_(dict.get<scalar>("C"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
index 58975727b4..15a86d0cfb 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
@@ -44,11 +44,11 @@ inline Foam::SRIFallOffFunction::SRIFallOffFunction
 
 inline Foam::SRIFallOffFunction::SRIFallOffFunction(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d"))),
-    e_(readScalar(dict.lookup("e")))
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d")),
+    e_(dict.get<scalar>("e"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
index ab654e2103..c27cd6a523 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
@@ -42,10 +42,10 @@ inline Foam::TroeFallOffFunction::TroeFallOffFunction
 
 inline Foam::TroeFallOffFunction::TroeFallOffFunction(const dictionary& dict)
 :
-    alpha_(readScalar(dict.lookup("alpha"))),
-    Tsss_(readScalar(dict.lookup("Tsss"))),
-    Ts_(readScalar(dict.lookup("Ts"))),
-    Tss_(readScalar(dict.lookup("Tss")))
+    alpha_(dict.get<scalar>("alpha")),
+    Tsss_(dict.get<scalar>("Tsss")),
+    Ts_(dict.get<scalar>("Ts")),
+    Tss_(dict.get<scalar>("Tss"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
index 40dd268003..051322b720 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
@@ -46,9 +46,9 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate
     const dictionary& dict
 )
 :
-    A_(readScalar(dict.lookup("A"))),
-    beta_(readScalar(dict.lookup("beta"))),
-    Ta_(readScalar(dict.lookup("Ta"))),
+    A_(dict.get<scalar>("A")),
+    beta_(dict.get<scalar>("beta")),
+    Ta_(dict.get<scalar>("Ta")),
     coeffs_(dict.lookup("coeffs"))
 {}
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index f2f87bccae..85eed6fa1b 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -73,7 +73,7 @@ inline Foam::thirdBodyEfficiencies::thirdBodyEfficiencies
     }
     else
     {
-        scalar defaultEff = dict.get<scalar>("defaultEfficiency");
+        const scalar defaultEff = dict.get<scalar>("defaultEfficiency");
         scalarList::operator=(defaultEff);
     }
 }
diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C
index a0e81f0a0b..58c7a52db1 100644
--- a/src/thermophysicalModels/specie/specie/specie.C
+++ b/src/thermophysicalModels/specie/specie/specie.C
@@ -40,7 +40,7 @@ Foam::specie::specie(const dictionary& dict)
 :
     name_(dict.dictName()),
     Y_(dict.subDict("specie").lookupOrDefault("massFraction", 1.0)),
-    molWeight_(readScalar(dict.subDict("specie").lookup("molWeight")))
+    molWeight_(dict.subDict("specie").get<scalar>("molWeight"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
index fa283c7116..d2768bfd78 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C
@@ -32,8 +32,8 @@ template<class EquationOfState>
 Foam::eConstThermo<EquationOfState>::eConstThermo(const dictionary& dict)
 :
     EquationOfState(dict),
-    Cv_(readScalar(dict.subDict("thermodynamics").lookup("Cv"))),
-    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
+    Cv_(dict.subDict("thermodynamics").get<scalar>("Cv")),
+    Hf_(dict.subDict("thermodynamics").get<scalar>("Hf"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
index 1bfc380457..37f027ce83 100644
--- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C
@@ -32,8 +32,8 @@ template<class EquationOfState>
 Foam::hConstThermo<EquationOfState>::hConstThermo(const dictionary& dict)
 :
     EquationOfState(dict),
-    Cp_(readScalar(dict.subDict("thermodynamics").lookup("Cp"))),
-    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
+    Cp_(dict.subDict("thermodynamics").get<scalar>("Cp")),
+    Hf_(dict.subDict("thermodynamics").get<scalar>("Hf"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
index 2f7817e0b8..c0d34b9075 100644
--- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
@@ -35,8 +35,8 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
 )
 :
     EquationOfState(dict),
-    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf"))),
-    Sf_(readScalar(dict.subDict("thermodynamics").lookup("Sf"))),
+    Hf_(dict.subDict("thermodynamics").get<scalar>("Hf")),
+    Sf_(dict.subDict("thermodynamics").get<scalar>("Sf")),
     CpCoeffs_
     (
         dict.subDict("thermodynamics").lookup
diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
index 5e742e2388..1f52754415 100644
--- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermo.C
@@ -35,10 +35,10 @@ Foam::hPowerThermo<EquationOfState>::hPowerThermo
 )
 :
     EquationOfState(dict),
-    c0_(readScalar(dict.subDict("thermodynamics").lookup("C0"))),
-    n0_(readScalar(dict.subDict("thermodynamics").lookup("n0"))),
-    Tref_(readScalar(dict.subDict("thermodynamics").lookup("Tref"))),
-    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
+    c0_(dict.subDict("thermodynamics").get<scalar>("C0")),
+    n0_(dict.subDict("thermodynamics").get<scalar>("n0")),
+    Tref_(dict.subDict("thermodynamics").get<scalar>("Tref")),
+    Hf_(dict.subDict("thermodynamics").get<scalar>("Hf"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
index c7a8cb4221..3dd8a7f063 100644
--- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
+++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C
@@ -32,10 +32,10 @@ template<class EquationOfState>
 Foam::hRefConstThermo<EquationOfState>::hRefConstThermo(const dictionary& dict)
 :
     EquationOfState(dict),
-    Cp_(readScalar(dict.subDict("thermodynamics").lookup("Cp"))),
-    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf"))),
-    Tref_(readScalar(dict.subDict("thermodynamics").lookup("Tref"))),
-    Href_(readScalar(dict.subDict("thermodynamics").lookup("Href")))
+    Cp_(dict.subDict("thermodynamics").get<scalar>("Cp")),
+    Hf_(dict.subDict("thermodynamics").get<scalar>("Hf")),
+    Tref_(dict.subDict("thermodynamics").get<scalar>("Tref")),
+    Href_(dict.subDict("thermodynamics").get<scalar>("Href"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
index 6a4d0d4dc0..306ad79efa 100644
--- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
+++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C
@@ -60,9 +60,9 @@ template<class EquationOfState>
 Foam::janafThermo<EquationOfState>::janafThermo(const dictionary& dict)
 :
     EquationOfState(dict),
-    Tlow_(readScalar(dict.subDict("thermodynamics").lookup("Tlow"))),
-    Thigh_(readScalar(dict.subDict("thermodynamics").lookup("Thigh"))),
-    Tcommon_(readScalar(dict.subDict("thermodynamics").lookup("Tcommon"))),
+    Tlow_(dict.subDict("thermodynamics").get<scalar>("Tlow")),
+    Thigh_(dict.subDict("thermodynamics").get<scalar>("Thigh")),
+    Tcommon_(dict.subDict("thermodynamics").get<scalar>("Tcommon")),
     highCpCoeffs_(dict.subDict("thermodynamics").lookup("highCpCoeffs")),
     lowCpCoeffs_(dict.subDict("thermodynamics").lookup("lowCpCoeffs"))
 {
diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C
index 2408dfb9cc..74a6bc3b22 100644
--- a/src/thermophysicalModels/specie/transport/const/constTransport.C
+++ b/src/thermophysicalModels/specie/transport/const/constTransport.C
@@ -32,8 +32,8 @@ template<class Thermo>
 Foam::constTransport<Thermo>::constTransport(const dictionary& dict)
 :
     Thermo(dict),
-    mu_(readScalar(dict.subDict("transport").lookup("mu"))),
-    rPr_(1.0/readScalar(dict.subDict("transport").lookup("Pr")))
+    mu_(dict.subDict("transport").get<scalar>("mu")),
+    rPr_(1.0/dict.subDict("transport").get<scalar>("Pr"))
 {}
 
 
diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
index d3576c52ee..67a4665e73 100644
--- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
+++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C
@@ -35,7 +35,7 @@ Foam::scalar Foam::sutherlandTransport<Thermo>::readCoeff
     const dictionary& dict
 )
 {
-    return readScalar(dict.subDict("transport").lookup(coeffName));
+    return dict.subDict("transport").get<scalar>(coeffName);
 }
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
index ef91f7c3c9..568ce48c92 100644
--- a/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/liquidProperties/liquidProperties/liquidProperties.C
@@ -69,16 +69,16 @@ Foam::liquidProperties::liquidProperties
 Foam::liquidProperties::liquidProperties(const dictionary& dict)
 :
     thermophysicalProperties(dict),
-    Tc_(readScalar(dict.lookup("Tc"))),
-    Pc_(readScalar(dict.lookup("Pc"))),
-    Vc_(readScalar(dict.lookup("Vc"))),
-    Zc_(readScalar(dict.lookup("Zc"))),
-    Tt_(readScalar(dict.lookup("Tt"))),
-    Pt_(readScalar(dict.lookup("Pt"))),
-    Tb_(readScalar(dict.lookup("Tb"))),
-    dipm_(readScalar(dict.lookup("dipm"))),
-    omega_(readScalar(dict.lookup("omega"))),
-    delta_(readScalar(dict.lookup("delta")))
+    Tc_(dict.get<label>("Tc")),
+    Pc_(dict.get<label>("Pc")),
+    Vc_(dict.get<label>("Vc")),
+    Zc_(dict.get<label>("Zc")),
+    Tt_(dict.get<label>("Tt")),
+    Pt_(dict.get<label>("Pt")),
+    Tb_(dict.get<label>("Tb")),
+    dipm_(dict.get<label>("dipm")),
+    omega_(dict.get<label>("omega")),
+    delta_(dict.get<label>("delta"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C
index 1d9eb8fe65..439f913ada 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.C
@@ -55,16 +55,11 @@ Foam::solidProperties::solidProperties
 
 Foam::solidProperties::solidProperties(const dictionary& dict)
 :
-    rho_(readScalar(dict.lookup("rho"))),
-    Cp_(readScalar(dict.lookup("Cp"))),
-    kappa_
-    (
-        dict.found("K")
-      ? readScalar(dict.lookup("K"))
-      : readScalar(dict.lookup("kappa"))
-    ),
-    Hf_(readScalar(dict.lookup("Hf"))),
-    emissivity_(readScalar(dict.lookup("emissivity")))
+    rho_(dict.get<scalar>("rho")),
+    Cp_(dict.get<scalar>("Cp")),
+    kappa_(dict.getCompat<scalar>("kappa", {{"K", 1612}})),
+    Hf_(dict.get<scalar>("Hf")),
+    emissivity_(dict.get<scalar>("emissivity"))
 {}
 
 
@@ -74,8 +69,7 @@ void Foam::solidProperties::readIfPresent(const dictionary& dict)
 {
     dict.readIfPresent("rho", rho_);
     dict.readIfPresent("Cp", Cp_);
-    dict.readIfPresent("K", kappa_);
-    dict.readIfPresent("kappa", kappa_);
+    dict.readIfPresentCompat("kappa", {{"K", 1612}}, kappa_);
     dict.readIfPresent("Hf_", Hf_);
     dict.readIfPresent("emissivity", emissivity_);
 }
diff --git a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
index 7f9b957764..f48c65dd3e 100644
--- a/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
+++ b/src/thermophysicalModels/thermophysicalProperties/solidProperties/solidProperties/solidProperties.H
@@ -128,8 +128,7 @@ public:
 
 
     //- Destructor
-    virtual ~solidProperties()
-    {}
+    virtual ~solidProperties() = default;
 
 
     // Member Functions
@@ -157,7 +156,7 @@ public:
 
     // I-O
 
-        //- Read and set the properties present it the given dictionary
+        //- Read and set the properties if present in the given dictionary
         void readIfPresent(const dictionary& dict);
 
         //- Write the solidProperties properties
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
index ff23b18402..11f7bd0262 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/APIfunctions/APIdiffCoefFunc/APIdiffCoefFunc.C
@@ -60,10 +60,10 @@ Foam::APIdiffCoefFunc::APIdiffCoefFunc
 
 Foam::APIdiffCoefFunc::APIdiffCoefFunc(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    wf_(readScalar(dict.lookup("wf"))),
-    wa_(readScalar(dict.lookup("wa"))),
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    wf_(dict.get<scalar>("wf")),
+    wa_(dict.get<scalar>("wa")),
     alpha_(sqrt(1/wf_ + 1/wa_)),
     beta_(sqr((cbrt(a_) + cbrt(b_))))
 {}
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
index 0fccd567f5..96c66b43eb 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc0/NSRDSfunc0.C
@@ -57,12 +57,12 @@ Foam::NSRDSfunc0::NSRDSfunc0
 
 Foam::NSRDSfunc0::NSRDSfunc0(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d"))),
-    e_(readScalar(dict.lookup("e"))),
-    f_(readScalar(dict.lookup("f")))
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d")),
+    e_(dict.get<scalar>("e")),
+    f_(dict.get<scalar>("f"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
index 60b61614b1..cd896eacb7 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc1/NSRDSfunc1.C
@@ -55,11 +55,11 @@ Foam::NSRDSfunc1::NSRDSfunc1
 
 Foam::NSRDSfunc1::NSRDSfunc1(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d"))),
-    e_(readScalar(dict.lookup("e")))
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d")),
+    e_(dict.get<scalar>("e"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
index b5aa066933..34c7ea2e12 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc14/NSRDSfunc14.C
@@ -60,11 +60,11 @@ Foam::NSRDSfunc14::NSRDSfunc14
 
 Foam::NSRDSfunc14::NSRDSfunc14(const dictionary& dict)
 :
-    Tc_(readScalar(dict.lookup("Tc"))),
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d")))
+    Tc_(dict.get<scalar>("Tc")),
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
index 3365d08c5c..aeb67d6493 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc2/NSRDSfunc2.C
@@ -53,10 +53,10 @@ Foam::NSRDSfunc2::NSRDSfunc2
 
 Foam::NSRDSfunc2::NSRDSfunc2(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d")))
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
index 2c25a0ae6e..d35a8f2915 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc3/NSRDSfunc3.C
@@ -53,10 +53,10 @@ Foam::NSRDSfunc3::NSRDSfunc3
 
 Foam::NSRDSfunc3::NSRDSfunc3(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d")))
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
index 809af7aa4a..084dcf6326 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc4/NSRDSfunc4.C
@@ -55,11 +55,11 @@ Foam::NSRDSfunc4::NSRDSfunc4
 
 Foam::NSRDSfunc4::NSRDSfunc4(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d"))),
-    e_(readScalar(dict.lookup("e")))
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d")),
+    e_(dict.get<scalar>("e"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
index 0c6100beb5..b5aa1cad8c 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc5/NSRDSfunc5.C
@@ -53,10 +53,10 @@ Foam::NSRDSfunc5::NSRDSfunc5
 
 Foam::NSRDSfunc5::NSRDSfunc5(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d")))
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
index 766d9e8839..c3294377fe 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc6/NSRDSfunc6.C
@@ -57,12 +57,12 @@ Foam::NSRDSfunc6::NSRDSfunc6
 
 Foam::NSRDSfunc6::NSRDSfunc6(const dictionary& dict)
 :
-    Tc_(readScalar(dict.lookup("Tc"))),
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d"))),
-    e_(readScalar(dict.lookup("e")))
+    Tc_(dict.get<scalar>("Tc")),
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d")),
+    e_(dict.get<scalar>("e"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
index a508c91d95..4fd472d351 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/NSRDSfunctions/NSRDSfunc7/NSRDSfunc7.C
@@ -55,11 +55,11 @@ Foam::NSRDSfunc7::NSRDSfunc7
 
 Foam::NSRDSfunc7::NSRDSfunc7(const dictionary& dict)
 :
-    a_(readScalar(dict.lookup("a"))),
-    b_(readScalar(dict.lookup("b"))),
-    c_(readScalar(dict.lookup("c"))),
-    d_(readScalar(dict.lookup("d"))),
-    e_(readScalar(dict.lookup("e")))
+    a_(dict.get<scalar>("a")),
+    b_(dict.get<scalar>("b")),
+    c_(dict.get<scalar>("c")),
+    d_(dict.get<scalar>("d")),
+    e_(dict.get<scalar>("e"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
index 52570ede10..33bfb076ac 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalProperties/thermophysicalProperties.C
@@ -44,7 +44,7 @@ Foam::thermophysicalProperties::thermophysicalProperties(scalar W)
 
 Foam::thermophysicalProperties::thermophysicalProperties(const dictionary& dict)
 :
-    W_(readScalar(dict.lookup("W")))
+    W_(dict.get<scalar>("W"))
 {}
 
 
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index cab53b7688..a0e5e284a6 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -267,9 +267,9 @@ humidityTemperatureCoupledMixedFvPatchScalarField
             case mtEvaporation:
             case mtCondensationAndEvaporation:
             {
-                Mcomp_ = readScalar(dict.lookup("carrierMolWeight"));
-                L_ = readScalar(dict.lookup("L"));
-                Tvap_ = readScalar(dict.lookup("Tvap"));
+                dict.readEntry("carrierMolWeight", Mcomp_);
+                dict.readEntry("L", L_);
+                dict.readEntry("Tvap", Tvap_);
                 liquidDict_ = dict.subDict("liquid");
                 liquid_ =
                     liquidProperties::New(liquidDict_.subDict(specieName_));
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 607485d9c3..7c733c2343 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -159,14 +159,8 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers()
             1,
             topoChanger_,
             "valveLayerZone",
-            readScalar
-            (
-                motionDict_.subDict("layer").lookup("minThickness")
-            ),
-            readScalar
-            (
-                motionDict_.subDict("layer").lookup("maxThickness")
-            )
+            motionDict_.subDict("layer").get<scalar>("minThickness"),
+            motionDict_.subDict("layer").get<scalar>("maxThickness")
         );
 
 
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index e19c60194b..fef108d67a 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -209,14 +209,8 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
             nMods,
             topoChanger_,
             "rightExtrusionFaces",
-            readScalar
-            (
-                motionDict_.subDict("right").lookup("minThickness")
-            ),
-            readScalar
-            (
-                motionDict_.subDict("right").lookup("maxThickness")
-            )
+            motionDict_.subDict("right").get<scalar>("minThickness"),
+            motionDict_.subDict("right").get<scalar>("maxThickness")
         );
     ++nMods;
 
@@ -226,14 +220,8 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers()
         nMods,
         topoChanger_,
         "leftExtrusionFaces",
-        readScalar
-        (
-            motionDict_.subDict("left").lookup("minThickness")
-        ),
-        readScalar
-        (
-            motionDict_.subDict("left").lookup("maxThickness")
-        )
+        motionDict_.subDict("left").get<scalar>("minThickness"),
+        motionDict_.subDict("left").get<scalar>("maxThickness")
     );
     ++nMods;
     tm.setSize(nMods);
@@ -266,14 +254,14 @@ Foam::movingConeTopoFvMesh::movingConeTopoFvMesh(const IOobject& io)
         ).optionalSubDict(typeName + "Coeffs")
     ),
     motionVelAmplitude_(motionDict_.lookup("motionVelAmplitude")),
-    motionVelPeriod_(readScalar(motionDict_.lookup("motionVelPeriod"))),
+    motionVelPeriod_(motionDict_.get<scalar>("motionVelPeriod")),
     curMotionVel_
     (
         motionVelAmplitude_*sin(time().value()*pi/motionVelPeriod_)
     ),
-    leftEdge_(readScalar(motionDict_.lookup("leftEdge"))),
-    curLeft_(readScalar(motionDict_.lookup("leftObstacleEdge"))),
-    curRight_(readScalar(motionDict_.lookup("rightObstacleEdge")))
+    leftEdge_(motionDict_.get<scalar>("leftEdge")),
+    curLeft_(motionDict_.get<scalar>("leftObstacleEdge")),
+    curRight_(motionDict_.get<scalar>("rightObstacleEdge"))
 {
     Pout<< "Initial time:" << time().value()
         << " Initial curMotionVel_:" << curMotionVel_
diff --git a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
index dc8af033a5..eba24da0e8 100644
--- a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
+++ b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C
@@ -76,7 +76,7 @@ bool Foam::waveModels::irregularWaveModel::readDict
 {
     if (waveGenerationModel::readDict(overrideDict))
     {
-        rampTime_ = get<scalar>("rampTime");
+        readEntry("rampTime", rampTime_);
 
         return true;
     }
diff --git a/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
index 921736f080..e99b101be4 100644
--- a/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
+++ b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
@@ -95,7 +95,8 @@ bool Foam::waveModels::regularWaveModel::readDict
         waveHeight_ = readWaveHeight();
         waveAngle_ = readWaveAngle();
 
-        wavePeriod_ = get<scalar>("wavePeriod");
+        readEntry("wavePeriod", wavePeriod_);
+
         if (wavePeriod_ < 0)
         {
             FatalIOErrorInFunction(*this)
diff --git a/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
index a239903aea..40d492f8c5 100644
--- a/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
+++ b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
@@ -88,7 +88,7 @@ bool Foam::waveModels::waveGenerationModel::readDict
 {
     if (waveModel::readDict(overrideDict))
     {
-        activeAbsorption_ = get<bool>("activeAbsorption");
+        readEntry("activeAbsorption", activeAbsorption_);
 
         return true;
     }
diff --git a/src/waveModels/waveModel/waveModel.C b/src/waveModels/waveModel/waveModel.C
index 4a9f7d7135..9d340922b7 100644
--- a/src/waveModels/waveModel/waveModel.C
+++ b/src/waveModels/waveModel/waveModel.C
@@ -302,7 +302,7 @@ bool Foam::waveModel::readDict(const dictionary& overrideDict)
     readIfPresent("U", UName_);
     readIfPresent("alpha", alphaName_);
 
-    nPaddle_ = get<label>("nPaddle");
+    readEntry("nPaddle", nPaddle_);
     if (nPaddle_ < 1)
     {
         FatalIOErrorInFunction(*this)

From e5c3e7de75e612283a1274be36bca540d34817f8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 Oct 2018 18:58:28 +0200
Subject: [PATCH 21/43] ENH: COMP: handle compiler ambiguities for tmp vs
 movable references

- seen with gcc-4.9.4, but not with gcc-7

- provide additional constructors from tmp for DimensionedField, FieldField
---
 .../DimensionedField/DimensionedField.C       | 90 ++++++++++++-------
 .../DimensionedField/DimensionedField.H       | 75 ++++++++++------
 .../DimensionedField/DimensionedFieldIO.C     |  5 +-
 .../FieldFields/FieldField/FieldField.C       | 79 +++++++++++-----
 .../FieldFields/FieldField/FieldField.H       | 40 ++++++---
 .../GeometricField/GeometricBoundaryField.C   | 49 +++-------
 .../GeometricField/GeometricField.C           | 46 ++++++++++
 .../GeometricField/GeometricField.H           | 30 +++++--
 8 files changed, 273 insertions(+), 141 deletions(-)

diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 09e89bc28a..94d80dea5c 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -120,6 +120,26 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 }
 
 
+template<class Type, class GeoMesh>
+Foam::DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const dimensionSet& dims,
+    const tmp<Field<Type>>& tfield
+)
+:
+    regIOobject(io),
+    Field<Type>(tfield.constCast(), tfield.movable()),
+    mesh_(mesh),
+    dimensions_(dims),
+    oriented_()
+{
+    tfield.clear();
+    checkFieldSize();
+}
+
+
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
@@ -181,26 +201,22 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
-    DimensionedField<Type, GeoMesh>& df,
-    bool reuse
+    DimensionedField<Type, GeoMesh>&& df
 )
 :
-    regIOobject(df, reuse),
-    Field<Type>(df, reuse),
-    mesh_(df.mesh_),
-    dimensions_(df.dimensions_),
-    oriented_(df.oriented_)
+    DimensionedField<Type, GeoMesh>(df, true)
 {}
 
 
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
-    DimensionedField<Type, GeoMesh>&& df
+    DimensionedField<Type, GeoMesh>& df,
+    bool reuse
 )
 :
-    regIOobject(df, true),
-    Field<Type>(std::move(df)),
+    regIOobject(df, reuse),
+    Field<Type>(df, reuse),
     mesh_(df.mesh_),
     dimensions_(df.dimensions_),
     oriented_(df.oriented_)
@@ -214,11 +230,7 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
     const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 :
-    regIOobject(tdf.constCast(), tdf.movable()),
-    Field<Type>(tdf.constCast(), tdf.movable()),
-    mesh_(tdf().mesh_),
-    dimensions_(tdf().dimensions_),
-    oriented_(tdf().oriented_)
+    DimensionedField<Type, GeoMesh>(tdf.constCast(), tdf.movable())
 {
     tdf.clear();
 }
@@ -240,6 +252,17 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 {}
 
 
+template<class Type, class GeoMesh>
+Foam::DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const IOobject& io,
+    DimensionedField<Type, GeoMesh>&& df
+)
+:
+    DimensionedField<Type, GeoMesh>(io, df, true)
+{}
+
+
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
@@ -256,6 +279,21 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 {}
 
 
+#ifndef NoConstructFromTmp
+template<class Type, class GeoMesh>
+Foam::DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const IOobject& io,
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
+)
+:
+    DimensionedField<Type, GeoMesh>(io, tdf.constCast(), tdf.movable())
+{
+    tdf.clear();
+}
+#endif
+
+
 template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
@@ -275,15 +313,10 @@ template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const word& newName,
-    DimensionedField<Type, GeoMesh>& df,
-    bool reuse
+    DimensionedField<Type, GeoMesh>&& df
 )
 :
-    regIOobject(newName, df, true),
-    Field<Type>(df, reuse),
-    mesh_(df.mesh_),
-    dimensions_(df.dimensions_),
-    oriented_(df.oriented_)
+    DimensionedField<Type, GeoMesh>(newName, df, true)
 {}
 
 
@@ -291,11 +324,12 @@ template<class Type, class GeoMesh>
 Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 (
     const word& newName,
-    DimensionedField<Type, GeoMesh>&& df
+    DimensionedField<Type, GeoMesh>& df,
+    bool reuse
 )
 :
     regIOobject(newName, df, true),
-    Field<Type>(std::move(df)),
+    Field<Type>(df, reuse),
     mesh_(df.mesh_),
     dimensions_(df.dimensions_),
     oriented_(df.oriented_)
@@ -310,11 +344,7 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
     const tmp<DimensionedField<Type, GeoMesh>>& tdf
 )
 :
-    regIOobject(newName, tdf(), true),
-    Field<Type>(tdf.constCast(), tdf.movable()),
-    mesh_(tdf().mesh_),
-    dimensions_(tdf().dimensions_),
-    oriented_(tdf().oriented_)
+    DimensionedField<Type, GeoMesh>(newName, tdf.constCast(), tdf.movable())
 {
     tdf.clear();
 }
@@ -356,7 +386,7 @@ Foam::DimensionedField<Type, GeoMesh>::component
         dimensions_
     );
 
-    Foam::component(tresult(), *this, d);
+    Foam::component(tresult.ref(), *this, d);
 
     return tresult;
 }
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index 23d721f203..6bebd04c8b 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -48,17 +48,18 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
-
+// Forward declarations
 template<class Type, class GeoMesh> class DimensionedField;
 
-template<class Type, class GeoMesh> Ostream& operator<<
+template<class Type, class GeoMesh>
+Ostream& operator<<
 (
     Ostream& os,
     const DimensionedField<Type, GeoMesh>& df
 );
 
-template<class Type, class GeoMesh> Ostream& operator<<
+template<class Type, class GeoMesh>
+Ostream& operator<<
 (
     Ostream& os,
     const tmp<DimensionedField<Type, GeoMesh>>& tdf
@@ -152,6 +153,15 @@ public:
             List<Type>&& field
         );
 
+        //- Construct from components, copy or transfer tmp content
+        DimensionedField
+        (
+            const IOobject& io,
+            const Mesh& mesh,
+            const dimensionSet& dims,
+            const tmp<Field<Type>>& tfield
+        );
+
         //- Construct from components, setting the initial size and assigning
         //- the dimensions, but not initialising any field values.
         //  Used for temporary fields which are initialised after construction
@@ -192,25 +202,15 @@ public:
         );
 
         //- Copy construct
-        DimensionedField
-        (
-            const DimensionedField<Type, GeoMesh>& df
-        );
-
-        //- Copy construct or reuse (move) as specified.
-        DimensionedField
-        (
-            DimensionedField<Type, GeoMesh>& df,
-            bool reuse
-        );
+        DimensionedField(const DimensionedField<Type, GeoMesh>& df);
 
         //- Move construct
-        explicit DimensionedField
-        (
-            DimensionedField<Type, GeoMesh>&& df
-        );
+        DimensionedField(DimensionedField<Type, GeoMesh>&& df);
 
-        //- Construct as copy of tmp<DimensionedField> deleting argument
+        //- Copy construct or reuse (move) as specified.
+        DimensionedField(DimensionedField<Type, GeoMesh>& df, bool reuse);
+
+        //- Construct from tmp\<DimensionedField\> deleting argument
         #ifndef NoConstructFromTmp
         DimensionedField
         (
@@ -225,6 +225,13 @@ public:
             const DimensionedField<Type, GeoMesh>& df
         );
 
+        //- Move construct, resetting IO parameters
+        DimensionedField
+        (
+            const IOobject& io,
+            DimensionedField<Type, GeoMesh>&& df
+        );
+
         //- Copy or move construct, resetting IO parameters.
         DimensionedField
         (
@@ -233,13 +240,30 @@ public:
             bool reuse
         );
 
-        //- Copy construct, resetting name
+        //- Construct from tmp\<DimensionedField\> deleting argument,
+        //- resetting IO parameters.
+        #ifndef NoConstructFromTmp
+        DimensionedField
+        (
+            const IOobject& io,
+            const tmp<DimensionedField<Type, GeoMesh>>& tdf
+        );
+        #endif
+
+        //- Copy construct with a new name
         DimensionedField
         (
             const word& newName,
             const DimensionedField<Type, GeoMesh>& df
         );
 
+        //- Move construct with a new name
+        DimensionedField
+        (
+            const word& newName,
+            DimensionedField<Type, GeoMesh>&& df
+        );
+
         //- Copy or move construct, resetting name.
         DimensionedField
         (
@@ -248,14 +272,7 @@ public:
             bool reuse
         );
 
-        //- Move construct with a new name
-        DimensionedField
-        (
-            const word& newName,
-            DimensionedField<Type, GeoMesh>&& df
-        );
-
-        //- Construct as copy resetting name
+        //- Construct with a new name from tmp\<DimensionedField\>
         #ifndef NoConstructFromTmp
         DimensionedField
         (
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
index 612785cdfc..cb1895f525 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldIO.C
@@ -26,7 +26,6 @@ License
 #include "DimensionedField.H"
 #include "IOstreams.H"
 
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type, class GeoMesh>
@@ -81,7 +80,7 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 )
 :
     regIOobject(io),
-    Field<Type>(0),
+    Field<Type>(),
     mesh_(mesh),
     dimensions_(dimless),
     oriented_()
@@ -100,7 +99,7 @@ Foam::DimensionedField<Type, GeoMesh>::DimensionedField
 )
 :
     regIOobject(io),
-    Field<Type>(0),
+    Field<Type>(),
     mesh_(mesh),
     dimensions_(dimless),
     oriented_()
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
index ad98f6a02f..f729227600 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
@@ -132,24 +132,37 @@ FieldField<Field, Type>::FieldField
 
 
 template<template<class> class Field, class Type>
-FieldField<Field, Type>::FieldField(const FieldField<Field, Type>& f)
+FieldField<Field, Type>::FieldField(const FieldField<Field, Type>& ff)
 :
-    refCount(),
-    PtrList<Field<Type>>(f)
+    PtrList<Field<Type>>(ff)
 {}
 
 
 template<template<class> class Field, class Type>
-FieldField<Field, Type>::FieldField(FieldField<Field, Type>& f, bool reuse)
+FieldField<Field, Type>::FieldField(FieldField<Field, Type>&& ff)
 :
-    PtrList<Field<Type>>(f, reuse)
+    PtrList<Field<Type>>(std::move(ff))
 {}
 
 
 template<template<class> class Field, class Type>
-FieldField<Field, Type>::FieldField(const PtrList<Field<Type>>& tl)
+FieldField<Field, Type>::FieldField(FieldField<Field, Type>& ff, bool reuse)
 :
-    PtrList<Field<Type>>(tl)
+    PtrList<Field<Type>>(ff, reuse)
+{}
+
+
+template<template<class> class Field, class Type>
+FieldField<Field, Type>::FieldField(const PtrList<Field<Type>>& list)
+:
+    PtrList<Field<Type>>(list)
+{}
+
+
+template<template<class> class Field, class Type>
+FieldField<Field, Type>::FieldField(PtrList<Field<Type>>&& list)
+:
+    PtrList<Field<Type>>(std::move(list))
 {}
 
 
@@ -185,17 +198,17 @@ tmp<FieldField<Field, Type>> FieldField<Field, Type>::NewCalculatedType
     const FieldField<Field, Type2>& ff
 )
 {
-    FieldField<Field, Type>* nffPtr
-    (
-        new FieldField<Field, Type>(ff.size())
-    );
+    const label len = ff.size();
 
-    forAll(*nffPtr, i)
+    auto tresult = tmp<FieldField<Field, Type>>::New(len);
+    auto& result = tresult.ref();
+
+    for (label i=0; i<len; ++i)
     {
-        nffPtr->set(i, Field<Type>::NewCalculatedType(ff[i]).ptr());
+        result.set(i, Field<Type>::NewCalculatedType(ff[i]).ptr());
     }
 
-    return tmp<FieldField<Field, Type>>(nffPtr);
+    return tresult;
 }
 
 
@@ -261,13 +274,13 @@ 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>> transpose
+    auto tresult
     (
         FieldField<Field, Type>::NewCalculatedType(*this)
     );
 
-    ::Foam::T(transpose.ref(), *this);
-    return transpose;
+    ::Foam::T(tresult.ref(), *this);
+    return tresult;
 }
 
 
@@ -282,6 +295,7 @@ void FieldField<Field, Type>::operator=(const FieldField<Field, Type>& f)
             << "attempted assignment to self"
             << abort(FatalError);
     }
+    // No size checking done
 
     forAll(*this, i)
     {
@@ -291,19 +305,38 @@ void FieldField<Field, Type>::operator=(const FieldField<Field, Type>& f)
 
 
 template<template<class> class Field, class Type>
-void FieldField<Field, Type>::operator=(const tmp<FieldField>& tf)
+void FieldField<Field, Type>::operator=(FieldField<Field, Type>&& ff)
 {
-    if (this == &(tf()))
+    if (this == &ff)
     {
         FatalErrorInFunction
             << "attempted assignment to self"
             << abort(FatalError);
     }
 
-    // This is dodgy stuff, don't try this at home.
-    FieldField* fieldPtr = tf.ptr();
-    PtrList<Field<Type>>::transfer(*fieldPtr);
-    delete fieldPtr;
+    PtrList<Field<Type>>::transfer(ff);
+}
+
+
+template<template<class> class Field, class Type>
+void FieldField<Field, Type>::operator=(const tmp<FieldField>& tf)
+{
+    // The cref() method also checks that tmp is not nullptr.
+    if (this == &(tf.cref()))
+    {
+        FatalErrorInFunction
+            << "attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    PtrList<Field<Type>>::clear();
+
+    // Release the tmp pointer, or clone const reference for a new pointer.
+    // Error potential when tmp is non-unique.
+
+    auto* tptr = tf.ptr();
+    PtrList<Field<Type>>::transfer(*tptr);
+    delete tptr;
 }
 
 
diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
index bae0375b68..690e1df64b 100644
--- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
+++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H
@@ -25,7 +25,7 @@ Class
     Foam::FieldField
 
 Description
-    Generic field type.
+    A field of fields is a PtrList of fields with reference counting.
 
 SourceFiles
     FieldField.C
@@ -91,29 +91,33 @@ public:
 
         //- Construct given size
         //  Used for temporary fields which are initialised after construction
-        explicit FieldField(const label);
+        explicit FieldField(const label size);
 
-        //- Construct using the Field sizes from the given FieldField
-        //  and the given Field type.
-        //  Used for temporary fields which are initialised after construction
-        FieldField(const word&, const FieldField<Field, Type>&);
+        //- Clone construct with new type
+        FieldField(const word& type, const FieldField<Field, Type>& ff);
 
-        //- Construct as copy
-        FieldField(const FieldField<Field, Type>&);
+        //- Copy construct, cloning each element
+        FieldField(const FieldField<Field, Type>& ff);
+
+        //- Move construct
+        FieldField(FieldField<Field, Type>&& ff);
 
         //- Construct as copy or re-use as specified.
-        FieldField(FieldField<Field, Type>&, bool reuse);
+        FieldField(FieldField<Field, Type>& ff, bool reuse);
 
-        //- Construct as copy of a PtrList<Field, Type>
-        FieldField(const PtrList<Field<Type>>&);
+        //- Copy construct from PtrList
+        FieldField(const PtrList<Field<Type>>& list);
 
-        //- Construct as copy of tmp<FieldField>
+        //- Move construct from PtrList
+        FieldField(PtrList<Field<Type>>&& list);
+
+        //- Move/copy construct from tmp<FieldField>
         #ifndef NoConstructFromTmp
-        FieldField(const tmp<FieldField<Field, Type>>&);
+        FieldField(const tmp<FieldField<Field, Type>>& tf);
         #endif
 
         //- Construct from Istream
-        FieldField(Istream&);
+        FieldField(Istream& is);
 
         //- Clone
         tmp<FieldField<Field, Type>> clone() const;
@@ -147,8 +151,16 @@ public:
 
     // Member operators
 
+        //- Copy assignment
         void operator=(const FieldField<Field, Type>&);
+
+        //- Move assignment
+        void operator=(FieldField<Field, Type>&&);
+
+        //- Move or clone assignment
         void operator=(const tmp<FieldField<Field, Type>>&);
+
+        //- Assign uniform value
         void operator=(const Type&);
 
         void operator+=(const FieldField<Field, Type>&);
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
index ee127be278..2ebf52925c 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
@@ -36,17 +36,13 @@ readField
     const dictionary& dict
 )
 {
+    DebugInFunction << nl;
+
     // Clear the boundary field if already initialised
     this->clear();
 
     this->setSize(bmesh_.size());
 
-    if (debug)
-    {
-        InfoInFunction << endl;
-    }
-
-
     label nUnset = this->size();
 
     // 1. Handle explicit patch names. Note that there can be only one explicit
@@ -217,10 +213,7 @@ Boundary
     FieldField<PatchField, Type>(bmesh.size()),
     bmesh_(bmesh)
 {
-    if (debug)
-    {
-        InfoInFunction << endl;
-    }
+    DebugInFunction << nl;
 
     forAll(bmesh_, patchi)
     {
@@ -251,10 +244,7 @@ Boundary
     FieldField<PatchField, Type>(bmesh.size()),
     bmesh_(bmesh)
 {
-    if (debug)
-    {
-        InfoInFunction << endl;
-    }
+    DebugInFunction << nl;
 
     if
     (
@@ -318,10 +308,7 @@ Boundary
     FieldField<PatchField, Type>(bmesh.size()),
     bmesh_(bmesh)
 {
-    if (debug)
-    {
-        InfoInFunction << endl;
-    }
+    DebugInFunction << nl;
 
     forAll(bmesh_, patchi)
     {
@@ -342,10 +329,7 @@ Boundary
     FieldField<PatchField, Type>(btf.size()),
     bmesh_(btf.bmesh_)
 {
-    if (debug)
-    {
-        InfoInFunction << endl;
-    }
+    DebugInFunction << nl;
 
     forAll(bmesh_, patchi)
     {
@@ -365,10 +349,7 @@ Boundary
     FieldField<PatchField, Type>(btf),
     bmesh_(btf.bmesh_)
 {
-    if (debug)
-    {
-        InfoInFunction << endl;
-    }
+    DebugInFunction << nl;
 }
 
 
@@ -394,10 +375,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
 updateCoeffs()
 {
-    if (debug)
-    {
-        InfoInFunction << endl;
-    }
+    DebugInFunction << nl;
 
     forAll(*this, patchi)
     {
@@ -410,10 +388,7 @@ template<class Type, template<class> class PatchField, class GeoMesh>
 void Foam::GeometricField<Type, PatchField, GeoMesh>::Boundary::
 evaluate()
 {
-    if (debug)
-    {
-        InfoInFunction << endl;
-    }
+    DebugInFunction << nl;
 
     if
     (
@@ -479,14 +454,14 @@ types() const
 {
     const FieldField<PatchField, Type>& pff = *this;
 
-    wordList Types(pff.size());
+    wordList list(pff.size());
 
     forAll(pff, patchi)
     {
-        Types[patchi] = pff[patchi].type();
+        list[patchi] = pff[patchi].type();
     }
 
-    return Types;
+    return list;
 }
 
 
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
index e7a088c522..df75d2ac64 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
@@ -304,6 +304,52 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 }
 
 
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const dimensionSet& ds,
+    const Field<Type>& iField,
+    const word& patchFieldType
+)
+:
+    Internal(io, mesh, ds, iField),
+    timeIndex_(this->time().timeIndex()),
+    field0Ptr_(nullptr),
+    fieldPrevIterPtr_(nullptr),
+    boundaryField_(mesh.boundary(), *this, patchFieldType)
+{
+    DebugInFunction
+        << "Copy construct from internal field" << nl << this->info() << endl;
+
+    readIfPresent();
+}
+
+
+template<class Type, template<class> class PatchField, class GeoMesh>
+Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const dimensionSet& ds,
+    Field<Type>&& iField,
+    const word& patchFieldType
+)
+:
+    Internal(io, mesh, ds, std::move(iField)),
+    timeIndex_(this->time().timeIndex()),
+    field0Ptr_(nullptr),
+    fieldPrevIterPtr_(nullptr),
+    boundaryField_(mesh.boundary(), *this, patchFieldType)
+{
+    DebugInFunction
+        << "Move construct from internal field" << nl << this->info() << endl;
+
+    readIfPresent();
+}
+
+
 template<class Type, template<class> class PatchField, class GeoMesh>
 Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
 (
diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
index a7941db125..d9ac7efa0e 100644
--- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
@@ -180,11 +180,11 @@ public:
             (
                 const BoundaryMesh& bmesh,
                 const Internal& field,
-                const dictionary&
+                const dictionary& dict
             );
 
 
-        // Member functions
+        // Member Functions
 
             //- Read the boundary field
             void readField
@@ -344,6 +344,26 @@ public:
             const PtrList<PatchField<Type>>& ptfl
         );
 
+        //- Copy construct from internal field, with specified patch type
+        GeometricField
+        (
+            const IOobject& io,
+            const Mesh& mesh,
+            const dimensionSet& ds,
+            const Field<Type>& iField,
+            const word& patchFieldType = PatchField<Type>::calculatedType()
+        );
+
+        //- Move construct from internal field, with specified patch type
+        GeometricField
+        (
+            const IOobject& io,
+            const Mesh& mesh,
+            const dimensionSet& ds,
+            Field<Type>&& iField,
+            const word& patchFieldType = PatchField<Type>::calculatedType()
+        );
+
         //- Copy construct from components
         GeometricField
         (
@@ -376,7 +396,7 @@ public:
             const GeometricField<Type, PatchField, GeoMesh>& gf
         );
 
-        //- Construct as copy of tmp<GeometricField> deleting argument
+        //- Construct from tmp\<GeometricField\> deleting argument
         #ifndef NoConstructFromTmp
         GeometricField
         (
@@ -400,14 +420,14 @@ public:
         );
         #endif
 
-        //- Construct as copy resetting name
+        //- Copy construct with a new name
         GeometricField
         (
             const word& newName,
             const GeometricField<Type, PatchField, GeoMesh>& gf
         );
 
-        //- Construct as copy resetting name
+        //- Construct with a new name from tmp\<GeometricField\>
         #ifndef NoConstructFromTmp
         GeometricField
         (

From 22101341291ab549aa8ace3937be61a54fb2bda6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 Oct 2018 22:51:48 +0200
Subject: [PATCH 22/43] COMP: incorrect const (accidental change with
 8eddcc072a3d705fa)

---
 .../conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C     | 2 +-
 .../conformalVoronoiMesh/conformalVoronoiMeshIO.C               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index c7e2544634..00bad93cd8 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -751,7 +751,7 @@ Foam::conformalVoronoiMesh::createPolyMeshFromPoints
 
     forAll(patches, p)
     {
-        const label totalPatchSize = patchDicts[p].get<label>("nFaces");
+        label totalPatchSize = patchDicts[p].get<label>("nFaces");
 
         if
         (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index bf4944deea..5268583281 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -816,7 +816,7 @@ void Foam::conformalVoronoiMesh::writeMesh
 
     forAll(patches, p)
     {
-        const label totalPatchSize = patchDicts[p].get<label>("nFaces");
+        label totalPatchSize = patchDicts[p].get<label>("nFaces");
 
         if
         (

From 19d600472ab24415f07d2a2bec733f65b9e24bc8 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 12 Oct 2018 23:29:16 +0200
Subject: [PATCH 23/43] ENH: auto-detect git in tutorials Alltest

---
 bin/tools/LogFunctions |   1 +
 tutorials/Allcollect   |   8 +++
 tutorials/Alltest      | 109 +++++++++++++++++++++++++++--------------
 3 files changed, 80 insertions(+), 38 deletions(-)
 create mode 100755 tutorials/Allcollect

diff --git a/bin/tools/LogFunctions b/bin/tools/LogFunctions
index 820ab4a27f..4dffd5e7cd 100644
--- a/bin/tools/LogFunctions
+++ b/bin/tools/LogFunctions
@@ -100,6 +100,7 @@ collectLogs()
         done
         echo
     done > testLoopReport
+    echo "===="
 }
 
 
diff --git a/tutorials/Allcollect b/tutorials/Allcollect
new file mode 100755
index 0000000000..37f0bc2986
--- /dev/null
+++ b/tutorials/Allcollect
@@ -0,0 +1,8 @@
+#!/bin/sh
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/LogFunctions    # Tutorial log-file functions
+
+# Collect log files as 'testLoopReport'
+collectLogs
+
+#------------------------------------------------------------------------------
diff --git a/tutorials/Alltest b/tutorials/Alltest
index 88123f35f6..f4d6b9dfa5 100755
--- a/tutorials/Alltest
+++ b/tutorials/Alltest
@@ -4,7 +4,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+#    \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM, licensed under GNU General Public License
@@ -28,12 +28,15 @@ usage()
 usage: ${0##*/} [OPTION]
 
 options:
-  -git              use git to retrieve the tutorials
-  -root dir         specify root directory to run tests from
-  -default          sets up a default scheme on all schemes
-  -help             print the usage
+  -git          Use git to retrieve the tutorials
+  -no-git       Do not use git to retrieve the tutorials
+  -root dir     Specify root directory to run tests from
+  -default      Sets up a default scheme on all schemes
+  -help         Print the usage
 
-* quickly tests the tutorials and writes out the scheme/solver information
+Quickly tests the tutorials and writes out the scheme/solver information.
+The default is to detect and use 'git' if possible to obtain a fresh set
+of tutorial files. This can be overridden with -git or -no-git options.
 
 USAGE
     exit 1
@@ -56,9 +59,9 @@ die()
 
 ROOT="./"
 unset DEFAULT_SCHEMES
-unset useGit
+useGit=auto
 
-# parse options
+# Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
@@ -66,24 +69,27 @@ do
         usage
         ;;
     -r | -root)
-        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
         ROOT="$2"
         shift
         ;;
     -git)
         useGit=true
         ;;
+    -no-git)
+        unset useGit
+        ;;
     -d | -default)
         DEFAULT_SCHEMES=true
         ;;
     *)
-        usage "unknown option/argument: '$1'"
+        die "Unknown option/argument: '$1'"
         ;;
     esac
     shift
 done
 
-# Set tutorial locations (as required)
+# Set FOAM_TUTORIALS directory location, as required.
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 
@@ -120,6 +126,7 @@ snGradSchemes { default corrected; }
 EOF
 }
 
+
 #
 # Location of the main controlDict
 #
@@ -138,7 +145,7 @@ do
     fi
 done
 
-[ -f "$MAIN_CONTROL_DICT" ] || usage "main controlDict not found"
+[ -f "$MAIN_CONTROL_DICT" ] || usage "Main controlDict not found"
 
 
 TUTORIALS_DIR=$ROOT
@@ -168,59 +175,85 @@ then
 fi
 
 # Remove old build/ directory
-buildDir="$WM_PROJECT_DIR/build/${WM_OPTIONS}/${TEST_RUN_DIR##*/}"
+buildDir="$WM_PROJECT_DIR/build/$WM_OPTIONS/${TEST_RUN_DIR##*/}"
 if [ -d "$buildDir" ]
 then
     echo "Removing old build directory: $buildDir" 1>&2
     rm -rf $buildDir
 fi
 
-echo "Modifying ${MAIN_CONTROL_DICT}" 1>&2
 if [ -e ${MAIN_CONTROL_DICT}.orig ]
 then
     die "File ${MAIN_CONTROL_DICT}.orig already exists" \
         "Did Alltest fail in some way and then run again?"
 fi
 
+
+unset gitbase
+
+if [ -n "$useGit" ]
+then
+    if git rev-parse --is-inside-work-tree > /dev/null 2>&1
+    then
+        gitbase="$(git rev-parse --show-toplevel 2>/dev/null)"
+    fi
+
+    case "$useGit" in
+    auto)
+        if [ -n "$gitbase" ]
+        then
+            echo "Detected git repository" 1>&2
+        else
+            echo "No git repository detected" 1>&2
+        fi
+        ;;
+
+    true)
+        [ -n "$gitbase" ] || die "Not in a git repository"
+        ;;
+    esac
+fi
+
+
+if [ -n "$gitbase" ]
+then
+    echo "Copying the tutorials from current git branch" 1>&2
+    mkdir -p ${TEST_RUN_DIR}
+    ( cd "$gitbase/tutorials" && git archive --format=tar HEAD . ) | \
+    ( cd "$TEST_RUN_DIR" && tar -xf - )
+else
+    echo "Copying the tutorials directory" 1>&2
+    cp -a "$TUTORIALS_DIR" "$TEST_RUN_DIR"
+fi
+
+echo 1>&2
+
+
 # Clean up on termination and on Ctrl-C
 trap 'mv ${MAIN_CONTROL_DICT}.orig ${MAIN_CONTROL_DICT} 2>/dev/null; exit 0' \
     EXIT TERM INT
-cp ${MAIN_CONTROL_DICT} ${MAIN_CONTROL_DICT}.orig
+cp -f "${MAIN_CONTROL_DICT}" "${MAIN_CONTROL_DICT}.orig"
+
+echo "Modifying ${MAIN_CONTROL_DICT}" 1>&2
 
 sed \
     -e s/"\(fvSchemes[ \t]*\)\([0-9]\);"/"\1 1;"/g \
     -e s/"\(solution[ \t]*\)\([0-9]\);"/"\1 1;"/g  \
-    ${MAIN_CONTROL_DICT}.orig > ${MAIN_CONTROL_DICT}
+    "${MAIN_CONTROL_DICT}.orig" > "${MAIN_CONTROL_DICT}"
 
-if [ -n "$useGit" ]
-then
-    echo "Copying the tutorials from current git branch" 1>&2
-    if  git rev-parse --is-inside-work-tree > /dev/null 2>&1 && \
-        base="$(git rev-parse --show-toplevel 2>/dev/null)"
-    then
-        mkdir -p ${TEST_RUN_DIR}
-        ( cd $base/tutorials && git archive --format=tar HEAD . ) | \
-        ( cd $TEST_RUN_DIR && tar -xf - )
-    else
-        die "Not in a git-repo"
-    fi
-else
-    echo "Copying the tutorials" 1>&2
-    cp -a ${TUTORIALS_DIR} ${TEST_RUN_DIR}
-fi
+cd "${TEST_RUN_DIR}" || exit 1
 
 echo "Modifying the controlDicts to run only one time step" 1>&2
-cd ${TEST_RUN_DIR} || exit 1
 
 for CD in $(find . -name "controlDict*" -type f)
 do
-    mv ${CD} ${CD}.orig
+    cp -f "${CD}" "${CD}.orig"
     sed \
         -e s/"\(startFrom[ \t]*\)\([a-zA-Z]*\);"/"\1 latestTime;"/g \
         -e s/"\(stopAt[ \t]*\)\([a-zA-Z]*\);"/"\1 nextWrite;"/g \
         -e s/"\(writeControl[ \t]*\)\([a-zA-Z]*\);"/"\1 timeStep;"/g \
         -e s/"\(writeInterval[ \t]*\)\([0-9a-zA-Z.-]*\);"/"\1 1;"/g \
-        ${CD}.orig > ${CD}
+        "${CD}.orig" > "${CD}"
 done
 
 if [ "$DEFAULT_SCHEMES" = true ]
@@ -230,10 +263,10 @@ then
     do
         for S in $FV_SCHEMES
         do
-            mv ${FV_SC} ${FV_SC}.orig
-            sed -e /"${S}"/,/$p/d ${FV_SC}.orig > ${FV_SC}
+            cp -f "${FV_SC}" "${FV_SC}.orig"
+            sed -e /"${S}"/,/$p/d "${FV_SC}.orig" > "${FV_SC}"
         done
-        setDefaultFvSchemes >> ${FV_SC}
+        setDefaultFvSchemes >> "${FV_SC}"
     done
 fi
 

From 4f9e45fbabeb5b5c440ff7b2fae5bad997fff222 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 15 Oct 2018 19:20:18 +0100
Subject: [PATCH 24/43] COMP: corrected read* changes from commit 8eddcc072a

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

diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
index be1b0c8e43..97463fdfa2 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
@@ -158,19 +158,19 @@ void Foam::interpolationLookUpTable<Type>::dimensionTable()
 
     forAll(entries_,i)
     {
-        dim_[i] = entries_[i].get<label>("N");
-        max_[i] = entries_[i].get<scalar>("max");
-        min_[i] = entries_[i].get<scalar>("min");
+        dim_[i] = entries_[i].template get<label>("N");
+        max_[i] = entries_[i].template get<scalar>("max");
+        min_[i] = entries_[i].template get<scalar>("min");
         delta_[i] = (max_[i] - min_[i])/dim_[i];
         tableDim *= dim_[i] + 1;
-        fieldIndices_.insert(entries_[i].get<word>("name"), index);
+        fieldIndices_.insert(entries_[i].template get<word>("name"), index);
         entryIndices_[i] = index;
         index++;
     }
 
     forAll(output_,i)
     {
-        fieldIndices_.insert(output_[i].get<word>("name"), index);
+        fieldIndices_.insert(output_[i].template get<word>("name"), index);
         outputIndices_[i] = index;
         index++;
     }
@@ -284,7 +284,7 @@ Foam::interpolationLookUpTable<Type>::interpolationLookUpTable
 )
 :
     List<scalarField>(),
-    fileName_(dict.get<fileName>("file").expand()),
+    fileName_(dict.template get<fileName>("file").expand()),
     dim_(0),
     min_(0.0),
     delta_(0.0),

From c6520033c9c404d28000acd66d236f6a49ca9c83 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 15 Oct 2018 16:16:12 +0200
Subject: [PATCH 25/43] ENH: rationalize dictionary access methods

- use keyType::option enum to consolidate searching options.
  These enumeration names should be more intuitive to use
  and improve code readability.

    Eg,   lookupEntry(key, keyType::REGEX);
    vs    lookupEntry(key, false, true);

  or

    Eg,   lookupEntry(key, keyType::LITERAL_RECURSIVE);
    vs    lookupEntry(key, true, false);

- new findEntry(), findDict(), findScoped() methods with consolidated
  search options for shorter naming and access names more closely
  aligned with other components. Behave simliarly to the
  methods lookupEntryPtr(), subDictPtr(), lookupScopedEntryPtr(),
  respectively. Default search parameters consistent with lookupEntry().

    Eg, const entry* e = dict.findEntry(key);
    vs  const entry* e = dict.lookupEntryPtr(key, false, true);

- added '*' and '->' dereference operators to dictionary searchers.
---
 .../test/dictionary/Test-dictionary.C         |  22 +-
 .../Test-fvSolutionCombine.C                  |  12 +-
 .../cellSizeFunction/cellSizeFunction.C       |   8 +-
 .../conformalVoronoiMeshCalcDualMesh.C        |   2 +-
 .../conformationSurfaces.C                    |   2 +-
 .../generation/snappyHexMesh/snappyHexMesh.C  |   2 +-
 .../foamDictionary/foamDictionary.C           |  28 +-
 .../profilingSummary/profilingSummary.C       |  24 +-
 .../changeDictionary/changeDictionary.C       |  40 +-
 src/OpenFOAM/db/Time/Time.C                   |   4 +-
 src/OpenFOAM/db/Time/TimeIO.C                 |  10 +-
 src/OpenFOAM/db/dictionary/dictionary.C       | 140 ++---
 src/OpenFOAM/db/dictionary/dictionary.H       | 579 +++++++++++-------
 src/OpenFOAM/db/dictionary/dictionaryCompat.C |  31 +-
 src/OpenFOAM/db/dictionary/dictionaryIO.C     |  19 +-
 src/OpenFOAM/db/dictionary/dictionarySearch.C |  97 ++-
 .../db/dictionary/dictionaryTemplates.C       |  60 +-
 src/OpenFOAM/db/dictionary/entry/entryIO.C    |  12 +-
 .../functionEntries/removeEntry/removeEntry.C |   3 +-
 .../primitiveEntry/primitiveEntry.C           |   3 +-
 .../db/dynamicLibrary/codedBase/codedBase.C   |   6 +-
 .../dynamicCode/dynamicCodeContext.C          |  30 +-
 .../functionObjectList/functionObjectList.C   |   8 +-
 src/OpenFOAM/global/debug/debug.C             |  23 +-
 .../fileOperation/fileOperation.C             |   3 +-
 .../lduMatrix/lduMatrixPreconditioner.C       |  13 +-
 .../lduMatrix/lduMatrix/lduMatrixSmoother.C   |  12 +-
 src/OpenFOAM/matrices/solution/solution.C     |  19 +-
 .../Function1/Function1/Function1New.C        |   2 +-
 .../primitives/strings/keyType/keyType.H      |  22 +-
 .../primitives/strings/keyType/keyTypeI.H     |   4 +-
 .../primitives/strings/stringOps/stringOps.C  |  16 +-
 .../primitives/strings/wordRe/wordRe.H        |  16 +-
 .../motionSmoother/motionSmootherAlgoCheck.C  |  67 +-
 .../solutionControl/loopControl/loopControl.C |   7 +-
 .../codedFunctionObject/codedFunctionObject.C |  37 +-
 .../general/codedSource/CodedSourceIO.C       |  27 +-
 src/lumpedPointMotion/lumpedPointMovement.C   |   4 +-
 .../blockDescriptor/blockDescriptor.C         |   2 +-
 .../blockMesh/blockMesh/blockMeshTopology.C   |   2 +-
 .../blockMesh/blockMeshTools/blockMeshTools.C |  13 +-
 .../blockVertices/blockVertex/blockVertex.C   |   4 +-
 .../blockVertices/namedVertex/namedVertex.C   |   4 +-
 .../blockMesh/blocks/namedBlock/namedBlock.C  |   4 +-
 .../meshRefinementProblemCells.C              |   3 +-
 .../refinementSurfaces/refinementSurfaces.C   |   3 +-
 .../shellSurfaces/shellSurfaces.C             |  23 +-
 .../coordinate/systems/coordinateSystem.C     |   2 +-
 .../coordinate/systems/coordinateSystemNew.C  |   2 +-
 .../triSurfaceMesh/triSurfaceMesh.C           |   6 +-
 .../dynamicOversetFvMesh.C                    |   4 +-
 .../oversetPolyPatch/oversetFvPatchField.C    |   4 +-
 .../decompositionMethod/decompositionMethod.C |   2 +-
 .../multiLevelDecomp/multiLevelDecomp.C       |   8 +-
 .../decompose/metisDecomp/metisDecomp.C       |   2 +-
 .../regionModel/regionModel/regionModel.C     |  20 +-
 56 files changed, 769 insertions(+), 753 deletions(-)

diff --git a/applications/test/dictionary/Test-dictionary.C b/applications/test/dictionary/Test-dictionary.C
index 393aafe482..bddadce6fe 100644
--- a/applications/test/dictionary/Test-dictionary.C
+++ b/applications/test/dictionary/Test-dictionary.C
@@ -82,8 +82,8 @@ int main(int argc, char *argv[])
             Info<< "dict1.toc(): " << dict1.name() << " " << dict1.toc()
                 << endl;
 
-            dictionary dict3(dict2.subDictPtr("boundaryField"));
-            dictionary dict4(dict2.subDictPtr("NONEXISTENT"));
+            dictionary dict3(dict2.findDict("boundaryField"));
+            dictionary dict4(dict2.findDict("NONEXISTENT"));
 
             Info<< "dictionary construct from pointer" << nl
                 << "ok = " << dict3.name() << " " << dict3.toc() << nl
@@ -105,23 +105,17 @@ int main(int argc, char *argv[])
             Info<< "Pattern find \"abc\" in top directory : "
                 << dict.lookup("abc") << endl;
             Info<< "Pattern find \"abc\" in sub directory : "
-                << dict.subDict("someDict").lookup("abc")
-                    << endl;
+                << dict.subDict("someDict").lookup("abc") << nl;
             Info<< "Recursive pattern find \"def\" in sub directory : "
-                << dict.subDict("someDict").lookup("def", true)
-                    << endl;
+                << dict.subDict("someDict").lookup("def", true) << nl;
             Info<< "Recursive pattern find \"foo\" in sub directory : "
-                << dict.subDict("someDict").lookup("foo", true)
-                    << endl;
+                << dict.subDict("someDict").lookup("foo", true) << nl;
             Info<< "Recursive pattern find \"fooz\" in sub directory : "
-                << dict.subDict("someDict").lookup("fooz", true)
-                    << endl;
+                << dict.subDict("someDict").lookup("fooz", true) << nl;
             Info<< "Recursive pattern find \"bar\" in sub directory : "
-                << dict.subDict("someDict").lookup("bar", true)
-                    << endl;
+                << dict.subDict("someDict").lookup("bar", true) << nl;
             Info<< "Recursive pattern find \"xxx\" in sub directory : "
-                << dict.subDict("someDict").lookup("xxx", true)
-                    << endl;
+                << dict.subDict("someDict").lookup("xxx", true) << nl;
         }
     }
     else
diff --git a/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
index c844c8286b..f3ed843680 100644
--- a/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
+++ b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
@@ -52,20 +52,16 @@ bool checkDictionaryContent(const dictionary& dict1, const dictionary& dict2)
 
     forAllConstIter(dictionary, dict1, iter1)
     {
-        const entry* entryPtr = dict2.lookupEntryPtr
-        (
-            iter1().keyword(),
-            false,
-            false
-        );
+        const entry* eptr =
+            dict2.findEntry(iter1().keyword(), keyType::LITERAL);
 
-        if (!entryPtr)
+        if (!eptr)
         {
             return false;
         }
 
         const entry& entry1 = iter1();
-        const entry& entry2 = *entryPtr;
+        const entry& entry2 = *eptr;
 
         bool ok = false;
         if (entry1.isDict())
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
index 740b807f40..ca4e3280e3 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
@@ -63,9 +63,13 @@ Foam::cellSizeFunction::cellSizeFunction
     defaultCellSize_(defaultCellSize),
     regionIndices_(regionIndices),
     sideMode_(),
-    priority_(cellSizeFunctionDict.get<label>("priority", true))
+    priority_
+    (
+        cellSizeFunctionDict.get<label>("priority", keyType::REGEX_RECURSIVE)
+    )
 {
-    const word mode = cellSizeFunctionDict.get<word>("mode", true);
+    const word mode =
+        cellSizeFunctionDict.get<word>("mode", keyType::REGEX_RECURSIVE);
 
     if (surface_.hasVolumeType())
     {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 00bad93cd8..d6f1256074 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -837,7 +837,7 @@ void Foam::conformalVoronoiMesh::checkCellSizing()
         = dict.subDict("meshQualityControls");
 
     const scalar maxNonOrtho =
-        meshQualityDict.get<scalar>("maxNonOrtho", true);
+        meshQualityDict.get<scalar>("maxNonOrtho", keyType::REGEX_RECURSIVE);
 
     label nWrongFaces = 0;
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index bc71e6d0f1..fba263b464 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -339,7 +339,7 @@ Foam::conformationSurfaces::conformationSurfaces
     {
         const word& geomName = allGeometry_.names()[geomI];
 
-        const entry* ePtr = surfacesDict.lookupEntryPtr(geomName, false, true);
+        const entry* ePtr = surfacesDict.findEntry(geomName, keyType::REGEX);
 
         if (ePtr)
         {
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index 5daa5766fe..5a7da19bb7 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -125,7 +125,7 @@ autoPtr<refinementSurfaces> createRefinementSurfaces
     {
         const word& geomName = allGeometry.names()[geomi];
 
-        const entry* ePtr = surfacesDict.lookupEntryPtr(geomName, false, true);
+        const entry* ePtr = surfacesDict.findEntry(geomName, keyType::REGEX);
 
         if (ePtr)
         {
diff --git a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
index dee2956e07..ce2e7ae101 100644
--- a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+++ b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
@@ -170,9 +170,10 @@ class dictAndKeyword
     word key_;
 
 public:
+
     dictAndKeyword(const word& scopedName)
     {
-        string::size_type i = scopedName.rfind('/');
+        auto i = scopedName.rfind('/');
         if (i == string::npos)
         {
             i = scopedName.rfind('.');
@@ -212,7 +213,7 @@ const dictionary& lookupScopedDict
         return dict;
     }
 
-    const entry* eptr = dict.lookupScopedEntryPtr(subDictName, false, false);
+    const entry* eptr = dict.findScoped(subDictName, keyType::LITERAL);
 
     if (!eptr || !eptr->isDict())
     {
@@ -231,7 +232,7 @@ void removeDict(dictionary& dict, const dictionary& dictToRemove)
 {
     for (const entry& refEntry : dictToRemove)
     {
-        auto finder = dict.search(refEntry.keyword(), false, false);
+        auto finder = dict.search(refEntry.keyword(), keyType::LITERAL);
 
         bool purge = false;
 
@@ -357,8 +358,7 @@ int main(int argc, char *argv[])
     bool changed = false;
 
     // Read but preserve headers
-    dictionary dict;
-    dict.read(dictFile(), true);
+    dictionary dict(dictFile(), true);
 
     if (listIncludes)
     {
@@ -455,12 +455,7 @@ int main(int argc, char *argv[])
             changed = true;
 
             // Print the changed entry
-            const auto finder = dict.csearchScoped
-            (
-                scopedName,
-                false,
-                true  // Support wildcards
-            );
+            const auto finder = dict.csearchScoped(scopedName, keyType::REGEX);
 
             if (finder.found())
             {
@@ -489,8 +484,8 @@ int main(int argc, char *argv[])
                 const dictionary& d1(lookupScopedDict(dict, dAk.dict()));
                 const dictionary& d2(lookupScopedDict(diffDict, dAk.dict()));
 
-                const entry* e1Ptr = d1.lookupEntryPtr(dAk.key(), false, true);
-                const entry* e2Ptr = d2.lookupEntryPtr(dAk.key(), false, true);
+                const entry* e1Ptr = d1.findEntry(dAk.key(), keyType::REGEX);
+                const entry* e2Ptr = d2.findEntry(dAk.key(), keyType::REGEX);
 
                 if (e1Ptr && e2Ptr)
                 {
@@ -509,12 +504,7 @@ int main(int argc, char *argv[])
                 }
             }
 
-            const auto finder = dict.csearchScoped
-            (
-                scopedName,
-                false,
-                true  // Support wildcards
-            );
+            const auto finder = dict.csearchScoped(scopedName, keyType::REGEX);
 
             if (!finder.found())
             {
diff --git a/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C b/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
index 920ba165a5..357c889d8a 100644
--- a/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
+++ b/applications/utilities/postProcessing/miscellaneous/profilingSummary/profilingSummary.C
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
 
                 // Assumed to be good if it has 'profiling' sub-dict
 
-                const dictionary* ptr = dict.subDictPtr(blockNameProfiling);
+                const dictionary* ptr = dict.findDict(blockNameProfiling);
                 if (ptr)
                 {
                     ++nDict;
@@ -295,13 +295,12 @@ int main(int argc, char *argv[])
 
                 for (const dictionary& procDict : profiles)
                 {
-                    const dictionary* inDictPtr =
-                        procDict.subDictPtr(level1Name);
+                    const dictionary* inDictPtr = procDict.findDict(level1Name);
 
                     if (inDictPtr && hasDictEntries)
                     {
-                        // descend to the next level as required
-                        inDictPtr = inDictPtr->subDictPtr(level2Name);
+                        // Descend to the next level as required
+                        inDictPtr = inDictPtr->findDict(level2Name);
                     }
 
                     if (!inDictPtr)
@@ -313,16 +312,13 @@ int main(int argc, char *argv[])
 
                     for (const word& tag : tags)
                     {
-                        const entry* eptr = inDictPtr->lookupEntryPtr
-                        (
-                            tag,
-                            false,
-                            false
-                        );
+                        scalar val;
 
-                        if (eptr)
+                        if
+                        (
+                            inDictPtr->readIfPresent(tag, val, keyType::LITERAL)
+                        )
                         {
-                            const scalar val = readScalar(eptr->stream());
                             stats(tag).append(val);
                         }
                     }
@@ -339,7 +335,7 @@ int main(int argc, char *argv[])
                 if (hasDictEntries)
                 {
                     outputDict.add(level2Name, level1Dict.subDict(level2Name));
-                    outDictPtr = outputDict.subDictPtr(level2Name);
+                    outDictPtr = outputDict.findDict(level2Name);
                 }
                 else
                 {
diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
index 8a39925f4f..4e86ce0af9 100644
--- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
+++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C
@@ -235,10 +235,9 @@ bool merge
     // Save current (non-wildcard) keys before adding items.
     wordHashSet thisKeysSet;
     {
-        List<keyType> keys = thisDict.keys(false);
-        forAll(keys, i)
+        for (const word& k : thisDict.keys(false))
         {
-            thisKeysSet.insert(keys[i]);
+            thisKeysSet.insert(k);
         }
     }
 
@@ -261,25 +260,20 @@ bool merge
         }
         else if (literalRE || !(key.isPattern() || shortcuts.found(key)))
         {
-            entry* entryPtr = thisDict.lookupEntryPtr
-            (
-                key,
-                false,              // recursive
-                false               // patternMatch
-            );
+            entry* eptr = thisDict.findEntry(key, keyType::LITERAL);
 
-            if (entryPtr)
+            if (eptr)
             {
                 // Mark thisDict entry as having been match for wildcard
                 // handling later on.
-                thisKeysSet.erase(entryPtr->keyword());
+                thisKeysSet.erase(eptr->keyword());
 
                 if
                 (
                     addEntry
                     (
                         thisDict,
-                       *entryPtr,
+                       *eptr,
                         mergeIter(),
                         literalRE,
                         shortcuts
@@ -310,7 +304,7 @@ bool merge
 
     // Pass 2. Wildcard or shortcut matches (if any) on any non-match keys.
 
-    if (!literalRE && thisKeysSet.size() > 0)
+    if (!literalRE && thisKeysSet.size())
     {
         // Pick up remaining dictionary entries
         wordList thisKeys(thisKeysSet.toc());
@@ -336,10 +330,10 @@ bool merge
                 );
 
                 // Remove all matches
-                forAll(matches, i)
+                for (const label matchi : matches)
                 {
-                    const word& thisKey = thisKeys[matches[i]];
-                    thisKeysSet.erase(thisKey);
+                    const word& k = thisKeys[matchi];
+                    thisKeysSet.erase(k);
                 }
                 changed = true;
             }
@@ -358,21 +352,18 @@ bool merge
                 );
 
                 // Add all matches
-                forAll(matches, i)
+                for (const label matchi : matches)
                 {
-                    const word& thisKey = thisKeys[matches[i]];
+                    const word& k = thisKeys[matchi];
 
-                    entry& thisEntry = const_cast<entry&>
-                    (
-                        thisDict.lookupEntry(thisKey, false, false)
-                    );
+                    entry* eptr = thisDict.findEntry(k, keyType::LITERAL);
 
                     if
                     (
                         addEntry
                         (
                             thisDict,
-                            thisEntry,
+                           *eptr,
                             mergeIter(),
                             literalRE,
                             HashTable<wordList>(0)    // no shortcuts
@@ -627,8 +618,7 @@ int main(int argc, char *argv[])
                         fieldDict.lookupEntry
                         (
                             doneKeys[i],
-                            false,
-                            true
+                            keyType::REGEX
                         ).clone()
                     );
                     fieldDict.remove(doneKeys[i]);
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index d85d0e3389..51b3819f88 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -342,11 +342,11 @@ void Foam::Time::setControls()
 
 void Foam::Time::setMonitoring(const bool forceProfiling)
 {
-    const dictionary* profilingDict = controlDict_.subDictPtr("profiling");
+    const dictionary* profilingDict = controlDict_.findDict("profiling");
     if (!profilingDict)
     {
         // ... or from etc/controlDict
-        profilingDict = debug::controlDict().subDictPtr("profiling");
+        profilingDict = debug::controlDict().findDict("profiling");
     }
 
     // initialize profiling on request
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 9fb3cc0c70..ea45f1b2f3 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -99,7 +99,7 @@ void Foam::Time::readDict()
     // DebugSwitches
     if
     (
-        (localDict = controlDict_.subDictPtr("DebugSwitches")) != nullptr
+        (localDict = controlDict_.findDict("DebugSwitches")) != nullptr
      && localDict->size()
     )
     {
@@ -146,7 +146,7 @@ void Foam::Time::readDict()
     // InfoSwitches
     if
     (
-        (localDict = controlDict_.subDictPtr("InfoSwitches")) != nullptr
+        (localDict = controlDict_.findDict("InfoSwitches")) != nullptr
      && localDict->size()
     )
     {
@@ -192,7 +192,7 @@ void Foam::Time::readDict()
     // OptimisationSwitches
     if
     (
-        (localDict = controlDict_.subDictPtr("OptimisationSwitches")) != nullptr
+        (localDict = controlDict_.findDict("OptimisationSwitches")) != nullptr
      && localDict->size()
     )
     {
@@ -273,7 +273,7 @@ void Foam::Time::readDict()
     if
     (
 
-        (localDict = controlDict_.subDictPtr("DimensionedConstants")) != nullptr
+        (localDict = controlDict_.findDict("DimensionedConstants")) != nullptr
      && localDict->size()
     )
     {
@@ -310,7 +310,7 @@ void Foam::Time::readDict()
     // DimensionSets
     if
     (
-        (localDict = controlDict_.subDictPtr("DimensionSets")) != nullptr
+        (localDict = controlDict_.findDict("DimensionSets")) != nullptr
         && localDict->size()
     )
     {
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 125c73e127..4cdc9a754c 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -134,13 +134,14 @@ void Foam::dictionary::checkITstream
 
 Foam::dictionary::dictionary()
 :
+    name_(),
     parent_(dictionary::null)
 {}
 
 
 Foam::dictionary::dictionary(const fileName& name)
 :
-    dictionaryName(name),
+    name_(name),
     parent_(dictionary::null)
 {}
 
@@ -151,8 +152,8 @@ Foam::dictionary::dictionary
     const dictionary& dict
 )
 :
-    dictionaryName(dict.name()),
     parent_type(dict, *this),
+    name_(dict.name()),
     parent_(parentDict)
 {
     forAllIter(parent_type, *this, iter)
@@ -173,8 +174,8 @@ Foam::dictionary::dictionary
     const dictionary& dict
 )
 :
-    dictionaryName(dict.name()),
     parent_type(dict, *this),
+    name_(dict.name()),
     parent_(dictionary::null)
 {
     forAllIter(parent_type, *this, iter)
@@ -190,16 +191,14 @@ Foam::dictionary::dictionary
 }
 
 
-Foam::dictionary::dictionary
-(
-    const dictionary* dictPtr
-)
+Foam::dictionary::dictionary(const dictionary* dict)
 :
+    name_(),
     parent_(dictionary::null)
 {
-    if (dictPtr)
+    if (dict)
     {
-        operator=(*dictPtr);
+        operator=(*dict);
     }
 }
 
@@ -210,6 +209,7 @@ Foam::dictionary::dictionary
     dictionary&& dict
 )
 :
+    name_(),
     parent_(parentDict)
 {
     transfer(dict);
@@ -222,6 +222,7 @@ Foam::dictionary::dictionary
     dictionary&& dict
 )
 :
+    name_(),
     parent_(dictionary::null)
 {
     transfer(dict);
@@ -310,44 +311,50 @@ Foam::tokenList Foam::dictionary::tokens() const
 bool Foam::dictionary::found
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    return csearch(keyword, recursive, patternMatch).found();
+    return csearch(keyword, matchOpt).found();
 }
 
 
-const Foam::entry* Foam::dictionary::lookupEntryPtr
+Foam::entry* Foam::dictionary::findEntry
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
-) const
-{
-    return csearch(keyword, recursive, patternMatch).ptr();
-}
-
-
-Foam::entry* Foam::dictionary::lookupEntryPtr
-(
-    const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 )
 {
-    return search(keyword, recursive, patternMatch).ptr();
+    return search(keyword, matchOpt).ptr();
+}
+
+
+const Foam::entry* Foam::dictionary::findEntry
+(
+    const word& keyword,
+    enum keyType::option matchOpt
+) const
+{
+    return csearch(keyword, matchOpt).ptr();
+}
+
+
+const Foam::entry* Foam::dictionary::findScoped
+(
+    const word& keyword,
+    enum keyType::option matchOpt
+) const
+{
+    return csearchScoped(keyword, matchOpt).ptr();
 }
 
 
 const Foam::entry& Foam::dictionary::lookupEntry
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    const const_searcher finder(csearch(keyword, recursive, patternMatch));
+    const const_searcher finder(csearch(keyword, matchOpt));
 
     if (!finder.found())
     {
@@ -364,22 +371,10 @@ const Foam::entry& Foam::dictionary::lookupEntry
 Foam::ITstream& Foam::dictionary::lookup
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    return lookupEntry(keyword, recursive, patternMatch).stream();
-}
-
-
-const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
-(
-    const word& keyword,
-    bool recursive,
-    bool patternMatch
-) const
-{
-    return csearchScoped(keyword, recursive, patternMatch).ptr();
+    return lookupEntry(keyword, matchOpt).stream();
 }
 
 
@@ -394,7 +389,7 @@ bool Foam::dictionary::substituteKeyword(const word& keyword, bool mergeEntry)
     const word varName(keyword.substr(1), false);
 
     // Lookup the variable name in the given dictionary
-    const const_searcher finder(csearch(varName, true, true));
+    const const_searcher finder(csearch(varName, keyType::REGEX_RECURSIVE));
 
     // If defined insert its entries into this dictionary
     if (finder.found())
@@ -428,7 +423,7 @@ bool Foam::dictionary::substituteScopedKeyword
     const word varName(keyword.substr(1), false);
 
     // Lookup the variable name in the given dictionary
-    const const_searcher finder(csearchScoped(varName, true, true));
+    const auto finder(csearchScoped(varName, keyType::REGEX_RECURSIVE));
 
     // If defined insert its entries into this dictionary
     if (finder.found())
@@ -449,29 +444,35 @@ bool Foam::dictionary::substituteScopedKeyword
 
 bool Foam::dictionary::isDict(const word& keyword) const
 {
-    // Find non-recursive with patterns
-    return csearch(keyword, false, true).isDict();
+    // Allow patterns, non-recursive
+    return csearch(keyword, keyType::REGEX).isDict();
 }
 
 
-const Foam::dictionary* Foam::dictionary::subDictPtr(const word& keyword) const
+Foam::dictionary* Foam::dictionary::findDict
+(
+    const word& keyword,
+    enum keyType::option matchOpt
+)
 {
-    // Find non-recursive with patterns
-    return csearch(keyword, false, true).dictPtr();
+    return search(keyword, matchOpt).dictPtr();
 }
 
 
-Foam::dictionary* Foam::dictionary::subDictPtr(const word& keyword)
+const Foam::dictionary* Foam::dictionary::findDict
+(
+    const word& keyword,
+    enum keyType::option matchOpt
+) const
 {
-    // Find non-recursive with patterns
-    return search(keyword, false, true).dictPtr();
+    return csearch(keyword, matchOpt).dictPtr();
 }
 
 
 const Foam::dictionary& Foam::dictionary::subDict(const word& keyword) const
 {
-    // Find non-recursive with patterns
-    const const_searcher finder(csearch(keyword, false, true));
+    // Allow patterns, non-recursive
+    const const_searcher finder(csearch(keyword, keyType::REGEX));
 
     if (!finder.found())
     {
@@ -487,8 +488,8 @@ const Foam::dictionary& Foam::dictionary::subDict(const word& keyword) const
 
 Foam::dictionary& Foam::dictionary::subDict(const word& keyword)
 {
-    // Find non-recursive with patterns
-    searcher finder = search(keyword, false, true);
+    // Allow patterns, non-recursive
+    searcher finder(search(keyword, keyType::REGEX));
 
     if (!finder.found())
     {
@@ -508,8 +509,8 @@ Foam::dictionary Foam::dictionary::subOrEmptyDict
     const bool mandatory
 ) const
 {
-    // Find non-recursive with patterns
-    const const_searcher finder(csearch(keyword, false, true));
+    // Allow patterns, non-recursive
+    const const_searcher finder(csearch(keyword, keyType::REGEX));
 
     if (finder.isDict())
     {
@@ -543,7 +544,8 @@ const Foam::dictionary& Foam::dictionary::optionalSubDict
     const word& keyword
 ) const
 {
-    const const_searcher finder(csearch(keyword, false, true));
+    // Allow patterns, non-recursive
+    const const_searcher finder(csearch(keyword, keyType::REGEX));
 
     if (finder.isDict())
     {
@@ -565,15 +567,15 @@ const Foam::dictionary& Foam::dictionary::optionalSubDict
 
 Foam::wordList Foam::dictionary::toc() const
 {
-    wordList keys(size());
+    wordList list(size());
 
     label n = 0;
     forAllConstIters(*this, iter)
     {
-        keys[n++] = iter().keyword();
+        list[n++] = iter().keyword();
     }
 
-    return keys;
+    return list;
 }
 
 
@@ -585,19 +587,19 @@ Foam::wordList Foam::dictionary::sortedToc() const
 
 Foam::List<Foam::keyType> Foam::dictionary::keys(bool patterns) const
 {
-    List<keyType> keys(size());
+    List<keyType> list(size());
 
     label n = 0;
     forAllConstIters(*this, iter)
     {
         if (iter().keyword().isPattern() ? patterns : !patterns)
         {
-            keys[n++] = iter().keyword();
+            list[n++] = iter().keyword();
         }
     }
-    keys.setSize(n);
+    list.resize(n);
 
-    return keys;
+    return list;
 }
 
 
@@ -746,7 +748,7 @@ Foam::entry* Foam::dictionary::set(entry* entryPtr)
     }
 
     // Find non-recursive with patterns
-    searcher finder(search(entryPtr->keyword(), false, true));
+    searcher finder(search(entryPtr->keyword(), keyType::REGEX));
 
     // Clear dictionary so merge acts like overwrite
     if (finder.isDict())
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 6364c722cb..b031835b00 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -112,70 +112,12 @@ class SHA1Digest;
 Istream& operator>>(Istream& is, dictionary& dict);
 Ostream& operator<<(Ostream& os, const dictionary& dict);
 
-/*---------------------------------------------------------------------------*\
-                        Class dictionaryName Declaration
-\*---------------------------------------------------------------------------*/
-
-//- Holds name for a dictionary
-class dictionaryName
-{
-    // Private data
-
-        fileName name_;
-
-
-public:
-
-    // Constructors
-
-        //- Construct null
-        dictionaryName()
-        {}
-
-        //- Construct as copy of the given fileName
-        dictionaryName(const fileName& name)
-        :
-            name_(name)
-        {}
-
-
-    // Member functions
-
-        //- Return the dictionary name
-        const fileName& name() const
-        {
-            return name_;
-        }
-
-        //- Return the dictionary name for modification (use with caution).
-        fileName& name()
-        {
-            return name_;
-        }
-
-        //- Return the local dictionary name (final part of scoped name)
-        word dictName() const
-        {
-            word scopedName(name_.name());
-
-            const auto i = scopedName.rfind('.');
-            if (i == std::string::npos)
-            {
-                return scopedName;
-            }
-
-            return scopedName.substr(i+1);
-        }
-};
-
-
 /*---------------------------------------------------------------------------*\
                          Class dictionary Declaration
 \*---------------------------------------------------------------------------*/
 
 class dictionary
 :
-    public dictionaryName,
     public IDLList<entry>
 {
 public:
@@ -250,7 +192,7 @@ public:
             {}
 
 
-            //- Entry was found.
+            //- True if entry was found
             inline bool found() const
             {
                 return eptr_;
@@ -298,6 +240,18 @@ public:
             {
                 return *reinterpret_cast<const Searcher<!Const>*>(this);
             }
+
+            //- A pointer to the entry (nullptr if not found)
+            pointer operator->() const
+            {
+                return eptr_;
+            }
+
+            //- A reference to the entry (Error if not found)
+            reference operator*() const
+            {
+                return *eptr_;
+            }
         };
 
 
@@ -326,6 +280,9 @@ private:
         //  Set/unset via an InfoSwitch
         static bool writeOptionalEntries;
 
+        //- The dictionary name
+        fileName name_;
+
         //- Parent dictionary
         const dictionary& parent_;
 
@@ -353,6 +310,21 @@ private:
 
     // Private Member Functions
 
+        //- Convert old-style (1806) boolean search specification to enum
+        //
+        //  \param recursive search parent dictionaries
+        //  \param pattern match using regular expressions as well
+        static inline enum keyType::option
+        matchOpt(bool recursive, bool pattern)
+        {
+            return
+                keyType::option
+                (
+                    (pattern ? keyType::REGEX : keyType::LITERAL)
+                  | (recursive ? keyType::RECURSIVE : 0)
+                );
+        }
+
         //- Search using a '.' for scoping.
         //  A leading dot means to use the parent dictionary.
         //  An intermediate dot separates a sub-dictionary or sub-entry.
@@ -363,13 +335,11 @@ private:
         //  The heuristic tries successively longer top-level entries
         //  until there is a suitable match.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param matchOpt the search mode
         const_searcher csearchDotScoped
         (
             const word& keyword,
-            bool recursive,
-            bool patternMatch
+            enum keyType::option matchOpt
         ) const;
 
         //- Search using a '/' for scoping.
@@ -379,11 +349,11 @@ private:
         //  ambiguity between separator and content.
         //  No possibility or need for recursion.
         //
-        //  \param patternMatch use regular expressions
+        //  \param matchOpt the search mode. Recursive is ignored.
         const_searcher csearchSlashScoped
         (
             const word& keyword,
-            bool patternMatch
+            enum keyType::option matchOpt
         ) const;
 
 
@@ -411,16 +381,17 @@ public:
         explicit dictionary(const fileName& name);
 
         //- Construct given the entry name, parent dictionary and Istream,
-        //- reading entries until EOF
+        //- reading entries until EOF, optionally keeping the header
         dictionary
         (
             const fileName& name,
             const dictionary& parentDict,
-            Istream& is
+            Istream& is,
+            bool keepHeader = false
         );
 
         //- Construct top-level dictionary from Istream,
-        //- reading entries until EOF
+        //- reading entries until EOF. Discards the header.
         dictionary(Istream& is);
 
         //- Construct top-level dictionary from Istream,
@@ -435,7 +406,7 @@ public:
 
         //- Construct top-level dictionary as copy from pointer to dictionary.
         //  A null pointer is treated like an empty dictionary.
-        dictionary(const dictionary* dictPtr);
+        dictionary(const dictionary* dict);
 
         //- Move construct for given parent dictionary
         dictionary(const dictionary& parentDict, dictionary&& dict);
@@ -458,6 +429,32 @@ public:
 
     // Access
 
+        //- The dictionary name
+        const fileName& name() const
+        {
+            return name_;
+        }
+
+        //- The dictionary name for modification (use with caution).
+        fileName& name()
+        {
+            return name_;
+        }
+
+        //- The local dictionary name (final part of scoped name)
+        word dictName() const
+        {
+            word scopedName(name_.name());
+
+            const auto i = scopedName.rfind('.');
+            if (i == std::string::npos)
+            {
+                return scopedName;
+            }
+
+            return scopedName.substr(i+1);
+        }
+
         //- Return the parent dictionary
         const dictionary& parent() const
         {
@@ -482,131 +479,137 @@ public:
 
     // Search and lookup
 
-        //- Search dictionary for given keyword.
-        //  Default search: non-recursive with patterns.
+        //- Search for an entry (const access) with the given keyword.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param matchOpt the default search is non-recursive with patterns
+        //
+        //  \return True if entry was found
         bool found
         (
             const word& keyword,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option matchOpt = keyType::REGEX
         ) const;
 
-        //- Find and return an entry pointer if present, or return a nullptr.
+        //- Find for an entry (non-const access) with the given keyword.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
-        const entry* lookupEntryPtr
+        //  \param matchOpt the search mode
+        //
+        //  \return the entry pointer found or a nullptr.
+        entry* findEntry
         (
             const word& keyword,
-            bool recursive,
-            bool patternMatch
-        ) const;
-
-        //- Find and return an entry pointer for manipulation if present,
-        //- or return a nullptr.
-        //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
-        entry* lookupEntryPtr
-        (
-            const word& keyword,
-            bool recursive,
-            bool patternMatch
+            enum keyType::option matchOpt = keyType::REGEX
         );
 
-        //- Find and return an entry if present, otherwise FatalIOError.
+        //- Find an entry (const access) with the given keyword.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param matchOpt the default search is non-recursive with patterns
+        //
+        //  \return the entry pointer found or a nullptr.
+        const entry* findEntry
+        (
+            const word& keyword,
+            enum keyType::option matchOpt = keyType::REGEX
+        ) const;
+
+        //- Search for a scoped entry (const access) with the given keyword.
+        //  Allows scoping using '.'.
+        //  Special handling for an absolute anchor (^) at start of the keyword
+        //  and for '..' to ascend into the parent dictionaries.
+        //
+        //  \param matchOpt the default search is non-recursive with patterns
+        //
+        //  \return the entry pointer found or a nullptr.
+        const entry* findScoped
+        (
+            const word& keyword,
+            enum keyType::option matchOpt = keyType::REGEX
+        ) const;
+
+        //- Find and return a sub-dictionary pointer if present
+        //  (and a sub-dictionary) otherwise return nullptr.
+        //
+        //  \param matchOpt the default search is non-recursive with patterns
+        dictionary* findDict
+        (
+            const word& keyword,
+            enum keyType::option matchOpt = keyType::REGEX
+        );
+
+        //- Search for an entry (const access) with the given keyword.
+        //- Find and return a sub-dictionary pointer if present
+        //  (and a sub-dictionary) otherwise return nullptr.
+        //
+        //  \param matchOpt the default search is non-recursive with patterns
+        const dictionary* findDict
+        (
+            const word& keyword,
+            enum keyType::option matchOpt = keyType::REGEX
+        ) const;
+
+        //
+        //  \param matchOpt the default search is non-recursive with patterns
+        //
+        //  \return return an entry if present, otherwise FatalIOError.
         const entry& lookupEntry
         (
             const word& keyword,
-            bool recursive,
-            bool patternMatch
+            enum keyType::option matchOpt
         ) const;
 
         //- Find and return a T.
-        //- FatalIOError if not found, or if there are excess tokens.
-        //  Default search: non-recursive with patterns.
+        //- FatalIOError if not found, or if the number of tokens is incorrect.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param matchOpt the default search is non-recursive with patterns
         template<class T>
         T get
         (
             const word& keyword,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option matchOpt = keyType::REGEX
         ) const;
 
         //- Find and return an entry data stream.
-        //  Default search: non-recursive with patterns.
+        //- FatalIOError if not found, or if the number of tokens is incorrect.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param matchOpt the default search is non-recursive with patterns
         ITstream& lookup
         (
             const word& keyword,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option matchOpt = keyType::REGEX
         ) const;
 
-        //- Find and return a T.
-        //- FatalIOError if not found, or if there are excess tokens.
-        //  Default search: non-recursive with patterns.
+        //- Find and return a T, or return the given default value.
+        //- FatalIOError if it is found and the number of tokens is incorrect.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
-        //
-        //  \deprecated - same as the get() method
-        template<class T>
-        T lookupType
-        (
-            const word& keyword,
-            bool recursive = false,
-            bool patternMatch = true
-        ) const;
-
-        //- Find and return a T, or return the given default value
-        //- FatalIOError if it is found and there are excess tokens.
-        //  Default search: non-recursive with patterns.
-        //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param matchOpt the default search is non-recursive with patterns
         template<class T>
         T lookupOrDefault
         (
             const word& keyword,
             const T& deflt,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option matchOpt = keyType::REGEX
         ) const;
 
         //- Find and return a T, or return the given default value
         //- and add it to dictionary.
-        //- FatalIOError if it is found and there are excess tokens.
-        //  Default search: non-recursive with patterns.
+        //- FatalIOError if it is found and the number of tokens is incorrect.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param matchOpt the default search is non-recursive with patterns
         template<class T>
         T lookupOrAddDefault
         (
             const word& keyword,
             const T& deflt,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option matchOpt = keyType::REGEX
         );
 
         //- Find entry and assign to T val.
-        //- FatalIOError if it is found and there are excess tokens.
-        //  Default search: non-recursive with patterns.
+        //- FatalIOError if it is found and the number of tokens is incorrect,
+        //- or it is mandatory and not found.
         //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param val the value to read into
+        //  \param matchOpt the default search is non-recursive with patterns
+        //  \param mandatory the keyword is mandatory
         //
         //  \return true if the entry was found.
         template<class T>
@@ -614,18 +617,16 @@ public:
         (
             const word& keyword,
             T& val,
-            bool recursive = false,
-            bool patternMatch = true,
+            enum keyType::option matchOpt = keyType::REGEX,
             bool mandatory = true
         ) const;
 
         //- Find an entry if present, and assign to T val.
-        //- FatalIOError if it is found and there are excess tokens.
+        //- FatalIOError if it is found and the number of tokens is incorrect.
         //  Default search: non-recursive with patterns.
         //
-        //  \param val the value to read
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
+        //  \param val the value to read into
+        //  \param matchOpt the default search is non-recursive with patterns
         //
         //  \return true if the entry was found.
         template<class T>
@@ -633,41 +634,14 @@ public:
         (
             const word& keyword,
             T& val,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option matchOpt = keyType::REGEX
         ) const;
 
-        //- Find and return an entry pointer if present, or return a nullptr.
-        //  Allows scoping using '.'.
-        //  Special handling for an absolute anchor (^) at start of the keyword
-        //  and for '..' to ascend into the parent dictionaries.
-        //
-        //  \param recursive search parent dictionaries
-        //  \param patternMatch use regular expressions
-        const entry* lookupScopedEntryPtr
-        (
-            const word& keyword,
-            bool recursive,
-            bool patternMatch
-        ) const;
-
-        //- Check if entry exists and is a sub-dictionary.
+        //- Check if entry is found and and is a sub-dictionary.
         //
         //  Search type: non-recursive with patterns.
         bool isDict(const word& keyword) const;
 
-        //- Find and return a sub-dictionary pointer if present
-        //  (and a sub-dictionary) otherwise return nullptr.
-        //
-        //  Search type: non-recursive with patterns.
-        const dictionary* subDictPtr(const word& keyword) const;
-
-        //- Find and return a sub-dictionary pointer if present
-        //  (and a sub-dictionary) otherwise return nullptr.
-        //
-        //  Search type: non-recursive with patterns.
-        dictionary* subDictPtr(const word& keyword);
-
         //- Find and return a sub-dictionary.
         //  Fatal if the entry does not exist or is not a sub-dictionary.
         //
@@ -856,8 +830,7 @@ public:
         const_searcher csearch
         (
             const word& keyword,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         ) const;
 
         //- Search dictionary for given keyword
@@ -868,8 +841,7 @@ public:
         const_searcher search
         (
             const word& keyword,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         ) const;
 
         //- Search dictionary for given keyword
@@ -880,8 +852,7 @@ public:
         searcher search
         (
             const word& keyword,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         );
 
         //- Search using scoping.
@@ -910,8 +881,7 @@ public:
         const_searcher csearchScoped
         (
             const word& keyword,
-            bool recursive,
-            bool patternMatch
+            enum keyType::option
         ) const;
 
         //- Search using dot or slash scoping.
@@ -921,8 +891,7 @@ public:
         const_searcher searchScoped
         (
             const word& keyword,
-            bool recursive,
-            bool patternMatch
+            enum keyType::option
         ) const;
 
         //- Search using dot or slash scoping.
@@ -932,25 +901,24 @@ public:
         searcher searchScoped
         (
             const word& keyword,
-            bool recursive,
-            bool patternMatch
+            enum keyType::option
         );
 
         //- Locate a sub-dictionary using slash-scoping
         //  \return nullptr if the dictionary path does not exist
-        const dictionary* cfindScopedDictPtr(const fileName& dictPath) const;
+        const dictionary* cfindScopedDict(const fileName& dictPath) const;
 
         //- Locate a sub-dictionary using slash-scoping
         //  \return nullptr if the dictionary path does not exist
-        const dictionary* findScopedDictPtr(const fileName& dictPath) const;
+        const dictionary* findScopedDict(const fileName& dictPath) const;
 
         //- Locate a sub-dictionary using slash-scoping
         //  \return nullptr if the dictionary path does not exist
-        dictionary* findScopedDictPtr(const fileName& dictPath);
+        dictionary* findScopedDict(const fileName& dictPath);
 
         //- Locate existing or create sub-dictionary using slash-scoping
         //  \return nullptr if the dictionary path could not be created
-        dictionary* makeScopedDictPtr(const fileName& dictPath);
+        dictionary* makeScopedDict(const fileName& dictPath);
 
 
     // Compatibility helpers
@@ -969,8 +937,7 @@ public:
         (
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         ) const;
 
         //- Search dictionary for given keyword and any compatibility names
@@ -984,8 +951,7 @@ public:
         (
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         ) const;
 
         //- Find and return an entry pointer if present, or return a nullptr,
@@ -995,12 +961,11 @@ public:
         //      OpenFOAM version for which they were used.
         //  \param recursive search parent dictionaries
         //  \param patternMatch use regular expressions
-        const entry* lookupEntryPtrCompat
+        const entry* findCompat
         (
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
-            bool recursive,
-            bool patternMatch
+            enum keyType::option
         ) const;
 
         //- Find and return an entry if present, otherwise FatalIOError,
@@ -1014,8 +979,7 @@ public:
         (
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
-            bool recursive,
-            bool patternMatch
+            enum keyType::option
         ) const;
 
         //- Find and return a T
@@ -1032,8 +996,7 @@ public:
         (
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         ) const;
 
         //- Find and return an entry data stream,
@@ -1048,8 +1011,7 @@ public:
         (
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         ) const;
 
         //- Find and return a T, or return the given default value
@@ -1066,8 +1028,7 @@ public:
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
             const T& deflt,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         ) const;
 
         //- Find entry and assign to T val
@@ -1088,8 +1049,7 @@ public:
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
             T& val,
-            bool recursive = false,
-            bool patternMatch = true,
+            enum keyType::option = keyType::REGEX,
             bool mandatory = true
         ) const;
 
@@ -1111,22 +1071,12 @@ public:
             const word& keyword,
             std::initializer_list<std::pair<const char*,int>> compat,
             T& val,
-            bool recursive = false,
-            bool patternMatch = true
+            enum keyType::option = keyType::REGEX
         ) const;
 
 
     // Member Operators
 
-        //- Find and return an entry data stream (identical to #lookup method).
-        //  Search: non-recursive with patterns.
-        //
-        //  \deprecated use lookup() method instead (deprecated JUL-2018)
-        ITstream& operator[](const word& keyword) const
-        {
-            return lookup(keyword);
-        }
-
         //- Copy assignment
         void operator=(const dictionary& rhs);
 
@@ -1152,19 +1102,196 @@ public:
         friend Ostream& operator<<(Ostream& os, const dictionary& dict);
 
 
-    // Shortcuts - may be more useable in templated code
+    // Housekeeping
+
+        //- Find and return an entry data stream (identical to #lookup method).
+        //
+        //  \deprecated use lookup() method instead (JUL-2018)
+        ITstream& operator[](const word& keyword) const
+        {
+            return lookup(keyword);
+        }
+
+        //- Find and return a T.
+        //  \deprecated - same as the get() method (OCT-2018)
+        template<class T>
+        T lookupType
+        (
+            const word& keyword,
+            bool recursive = false,
+            bool patternMatch = true
+        ) const
+        {
+            return get<T>(keyword, matchOpt(recursive, patternMatch));
+        }
+
+        //- Search dictionary for given keyword.
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        bool found
+        (
+            const word& keyword,
+            bool recursive,
+            bool patternMatch = true
+        ) const
+        {
+            return found(keyword, matchOpt(recursive, patternMatch));
+        }
+
+        //- Find and return an entry pointer for manipulation if present,
+        //- or return a nullptr.
+        //
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        entry* lookupEntryPtr
+        (
+            const word& keyword,
+            bool recursive,
+            bool patternMatch
+        )
+        {
+            return findEntry(keyword, matchOpt(recursive, patternMatch));
+        }
+
+        //- Find and return an entry pointer if present, or return a nullptr.
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        const entry* lookupEntryPtr
+        (
+            const word& keyword,
+            bool recursive,
+            bool patternMatch
+        ) const
+        {
+            return findEntry(keyword, matchOpt(recursive, patternMatch));
+        }
+
+        //- Find and return an entry pointer if present, or return a nullptr.
+        //  Allows scoping using '.'.
+        //  Special handling for an absolute anchor (^) at start of the keyword
+        //  and for '..' to ascend into the parent dictionaries.
+        //
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        const entry* lookupScopedEntryPtr
+        (
+            const word& keyword,
+            bool recursive,
+            bool patternMatch
+        ) const
+        {
+            return findScoped(keyword, matchOpt(recursive, patternMatch));
+        }
+
+        //- Find and return a sub-dictionary pointer if present
+        //  (and a sub-dictionary) otherwise return nullptr.
+        //
+        //  Search type: non-recursive with patterns.
+        const dictionary* subDictPtr(const word& keyword) const
+        {
+            return findDict(keyword, keyType::REGEX);
+        }
+
+        //- Find and return a sub-dictionary pointer if present
+        //  (and a sub-dictionary) otherwise return nullptr.
+        //
+        //  Search type: non-recursive with patterns.
+        dictionary* subDictPtr(const word& keyword)
+        {
+            return findDict(keyword, keyType::REGEX);
+        }
+
+        //- Find and return an entry if present, otherwise FatalIOError.
+        //
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        const entry& lookupEntry
+        (
+            const word& keyword,
+            bool recursive,
+            bool patternMatch
+        ) const
+        {
+            return lookupEntry(keyword, matchOpt(recursive, patternMatch));
+        }
+
+        //- Find and return an entry data stream.
+        //  Default search: non-recursive with patterns.
+        //
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        ITstream& lookup
+        (
+            const word& keyword,
+            bool recursive,
+            bool patternMatch = true
+        ) const
+        {
+            return lookup(keyword, matchOpt(recursive, patternMatch));
+        }
+
+        //- Find and return a T, or return the given default value
+        //- FatalIOError if it is found and there are excess tokens.
+        //
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        template<class T>
+        T lookupOrDefault
+        (
+            const word& keyword,
+            const T& deflt,
+            bool recursive,
+            bool patternMatch = true
+        ) const
+        {
+            return
+                lookupOrDefault
+                (keyword, matchOpt(recursive, patternMatch));
+        }
+
+        //- Find and return a T, or return the given default value
+        //- and add it to dictionary.
+        //- FatalIOError if it is found and there are excess tokens.
+        //
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        template<class T>
+        T lookupOrAddDefault
+        (
+            const word& keyword,
+            const T& deflt,
+            bool recursive,
+            bool patternMatch = true
+        )
+        {
+            return
+                lookupOrAddDefault
+                (keyword, deflt, matchOpt(recursive, patternMatch));
+        }
+
+        //- Find an entry if present, and assign to T val.
+        //- FatalIOError if it is found and there are excess tokens.
+        //
+        //  \deprecated - use keyType::option version instead (OCT-2018)
+        template<class T>
+        bool readIfPresent
+        (
+            const word& keyword,
+            T& val,
+            bool recursive,
+            bool patternMatch = true
+        ) const
+        {
+            return
+                readIfPresent
+                (keyword, val, matchOpt(recursive, patternMatch));
+        }
+
+
+    // Shortcuts - when a templated classes also inherits from a dictionary
 
         #undef defineDictionaryGetter
-        #define defineDictionaryGetter(Func,Type)                             \
+        #define defineDictionaryGetter(Func, Type)                            \
             /** Same as get\<Type\> */                                        \
             Type Func                                                         \
             (                                                                 \
                 const word& keyword,                                          \
-                bool recursive = false,                                       \
-                bool patternMatch = true                                      \
+                enum keyType::option matchOpt = keyType::REGEX                \
             ) const                                                           \
             {                                                                 \
-                return get<Type>(keyword, recursive, patternMatch);           \
+                return get<Type>(keyword, matchOpt);                          \
             }
 
         defineDictionaryGetter(getBool, bool);
diff --git a/src/OpenFOAM/db/dictionary/dictionaryCompat.C b/src/OpenFOAM/db/dictionary/dictionaryCompat.C
index 49fb277fb5..c16f7de0d8 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryCompat.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryCompat.C
@@ -49,11 +49,10 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchCompat
 (
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    const_searcher finder(csearch(keyword, recursive, patternMatch));
+    const_searcher finder(csearch(keyword, matchOpt));
 
     if (finder.found())
     {
@@ -62,7 +61,7 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchCompat
 
     for (const std::pair<const char*,int>& iter : compat)
     {
-        finder = csearch(word::validate(iter.first), recursive, patternMatch);
+        finder = csearch(word::validate(iter.first), matchOpt);
 
         if (finder.found())
         {
@@ -99,23 +98,21 @@ bool Foam::dictionary::foundCompat
 (
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    return csearchCompat(keyword, compat, recursive, patternMatch).found();
+    return csearchCompat(keyword, compat, matchOpt).found();
 }
 
 
-const Foam::entry* Foam::dictionary::lookupEntryPtrCompat
+const Foam::entry* Foam::dictionary::findCompat
 (
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    return csearchCompat(keyword, compat, recursive, patternMatch).ptr();
+    return csearchCompat(keyword, compat, matchOpt).ptr();
 }
 
 
@@ -123,12 +120,10 @@ const Foam::entry& Foam::dictionary::lookupEntryCompat
 (
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    const const_searcher
-        finder(csearchCompat(keyword, compat, recursive, patternMatch));
+    const const_searcher finder(csearchCompat(keyword, compat, matchOpt));
 
     if (!finder.found())
     {
@@ -146,12 +141,10 @@ Foam::ITstream& Foam::dictionary::lookupCompat
 (
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    return
-        lookupEntryCompat(keyword, compat, recursive, patternMatch).stream();
+    return lookupEntryCompat(keyword, compat, matchOpt).stream();
 }
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index 7a51ae2d67..de4ff879aa 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -33,31 +33,26 @@ Foam::dictionary::dictionary
 (
     const fileName& name,
     const dictionary& parentDict,
-    Istream& is
+    Istream& is,
+    bool keepHeader
 )
 :
-    dictionaryName(parentDict.name() + '.' + name),
+    name_(parentDict.name() + '.' + name),
     parent_(parentDict)
 {
-    read(is);
+    read(is, keepHeader);
 }
 
 
 Foam::dictionary::dictionary(Istream& is)
 :
-    dictionaryName(is.name()),
-    parent_(dictionary::null)
-{
-    // Reset input mode as this is a "top-level" dictionary
-    entry::resetInputMode();
-
-    read(is);
-}
+    dictionary(is, false)
+{}
 
 
 Foam::dictionary::dictionary(Istream& is, bool keepHeader)
 :
-    dictionaryName(is.name()),
+    name_(is.name()),
     parent_(dictionary::null)
 {
     // Reset input mode as this is a "top-level" dictionary
diff --git a/src/OpenFOAM/db/dictionary/dictionarySearch.C b/src/OpenFOAM/db/dictionary/dictionarySearch.C
index 4c8ec03c07..902d10f07d 100644
--- a/src/OpenFOAM/db/dictionary/dictionarySearch.C
+++ b/src/OpenFOAM/db/dictionary/dictionarySearch.C
@@ -69,8 +69,7 @@ namespace
 Foam::dictionary::const_searcher Foam::dictionary::csearchDotScoped
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
     auto scopePos = keyword.find('.');
@@ -78,9 +77,12 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchDotScoped
     if (scopePos == string::npos)
     {
         // Normal, non-scoped search
-        return csearch(keyword, recursive, patternMatch);
+        return csearch(keyword, matchOpt);
     }
 
+    // It is '.' scoped - force non-recusive searching
+    matchOpt = keyType::option(matchOpt & ~(keyType::RECURSIVE));
+
     if (scopePos == 0)
     {
         // Starting with a '.' -> go up for every further '.' found
@@ -113,8 +115,7 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchDotScoped
         return dictPtr->csearchDotScoped
         (
             keyword.substr(scopePos),
-            false,
-            patternMatch
+            matchOpt
         );
     }
 
@@ -122,8 +123,7 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchDotScoped
     const_searcher finder = csearchDotScoped
     (
         keyword.substr(0, scopePos),
-        false,
-        patternMatch
+        matchOpt
     );
 
     // Fall back to finding key with '.' so e.g. if keyword is
@@ -137,7 +137,7 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchDotScoped
             scopePos = keyword.find('.', scopePos+1);
 
             // Local entry:
-            finder = csearch(keyword.substr(0, scopePos), false, patternMatch);
+            finder = csearch(keyword.substr(0, scopePos), matchOpt);
 
             if (scopePos == string::npos)
             {
@@ -152,8 +152,7 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchDotScoped
         return finder.dict().csearchDotScoped
         (
             keyword.substr(scopePos),
-            false,
-            patternMatch
+            matchOpt
         );
     }
 
@@ -164,9 +163,13 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchDotScoped
 Foam::dictionary::const_searcher Foam::dictionary::csearchSlashScoped
 (
     const word& keyword,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
+
+    // With '/' scoping - recursive is never allowed
+    matchOpt = keyType::option(matchOpt & ~(keyType::RECURSIVE));
+
     const dictionary* dictPtr = this;
 
     const auto slash = keyword.find('/');
@@ -175,7 +178,7 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchSlashScoped
     {
         // No slashes:
         // Can use normal (non-scoped) search at the current dictionary level
-        return csearch(keyword, false, patternMatch);
+        return csearch(keyword, matchOpt);
     }
     else if (slash == 0)
     {
@@ -220,7 +223,7 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchSlashScoped
             // Find entry
             const word key = word::validate(cmpt);
 
-            auto finder = dictPtr->csearch(key, false, patternMatch);
+            auto finder = dictPtr->csearch(key, matchOpt);
 
             if (finder.found())
             {
@@ -259,8 +262,7 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchSlashScoped
 Foam::dictionary::const_searcher Foam::dictionary::csearch
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
     const_searcher finder(this);
@@ -273,27 +275,22 @@ Foam::dictionary::const_searcher Foam::dictionary::csearch
         return finder;
     }
 
-    if (patternMatch && patterns_.size())
+    if ((matchOpt & keyType::REGEX) && patterns_.size())
     {
         pattern_const_iterator wcLink = patterns_.begin();
         regexp_const_iterator  reLink = regexps_.begin();
 
         // Find in patterns using regular expressions only
-        if (findInPatterns(patternMatch, keyword, wcLink, reLink))
+        if (findInPatterns(true, keyword, wcLink, reLink))
         {
             finder.set(*wcLink);
             return finder;
         }
     }
 
-    if (recursive && &parent_ != &dictionary::null)
+    if ((matchOpt & keyType::RECURSIVE) && &parent_ != &dictionary::null)
     {
-        return parent_.csearch
-        (
-            keyword,
-            recursive,
-            patternMatch
-        );
+        return parent_.csearch(keyword, matchOpt);
     }
 
     return finder;
@@ -303,22 +300,20 @@ Foam::dictionary::const_searcher Foam::dictionary::csearch
 Foam::dictionary::const_searcher Foam::dictionary::search
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    return csearch(keyword, recursive, patternMatch);
+    return csearch(keyword, matchOpt);
 }
 
 
 Foam::dictionary::searcher Foam::dictionary::search
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 )
 {
-    const_searcher finder = csearch(keyword, recursive, patternMatch);
+    const_searcher finder = csearch(keyword, matchOpt);
 
     return static_cast<const searcher&>(finder);
 }
@@ -327,17 +322,19 @@ Foam::dictionary::searcher Foam::dictionary::search
 Foam::dictionary::const_searcher Foam::dictionary::csearchScoped
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
     if (keyword.find('/') != string::npos)
     {
-        return csearchSlashScoped(keyword, patternMatch);
+        return csearchSlashScoped(keyword, matchOpt);
     }
 
     if (keyword[0] == ':' || keyword[0] == '^')
     {
+        // It is ':' scoped - force non-recusive searching
+        matchOpt = keyType::option(matchOpt & ~(keyType::RECURSIVE));
+
         // Ascend to top-level
         const dictionary* dictPtr = this;
         while (&dictPtr->parent_ != &dictionary::null)
@@ -345,43 +342,36 @@ Foam::dictionary::const_searcher Foam::dictionary::csearchScoped
             dictPtr = &dictPtr->parent_;
         }
 
-        return dictPtr->csearchDotScoped
-        (
-            keyword.substr(1),
-            false,
-            patternMatch
-        );
+        return dictPtr->csearchDotScoped(keyword.substr(1), matchOpt);
     }
 
-    return csearchDotScoped(keyword, recursive, patternMatch);
+    return csearchDotScoped(keyword, matchOpt);
 }
 
 
 Foam::dictionary::const_searcher Foam::dictionary::searchScoped
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    return csearchScoped(keyword, recursive, patternMatch);
+    return csearchScoped(keyword, matchOpt);
 }
 
 
 Foam::dictionary::searcher Foam::dictionary::searchScoped
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 )
 {
-    const_searcher finder = csearchScoped(keyword, recursive, patternMatch);
+    const_searcher finder = csearchScoped(keyword, matchOpt);
 
     return static_cast<const searcher&>(finder);
 }
 
 
-const Foam::dictionary* Foam::dictionary::cfindScopedDictPtr
+const Foam::dictionary* Foam::dictionary::cfindScopedDict
 (
     const fileName& dictPath
 ) const
@@ -466,26 +456,26 @@ const Foam::dictionary* Foam::dictionary::cfindScopedDictPtr
 }
 
 
-const Foam::dictionary* Foam::dictionary::findScopedDictPtr
+const Foam::dictionary* Foam::dictionary::findScopedDict
 (
     const fileName& dictPath
 ) const
 {
-    return cfindScopedDictPtr(dictPath);
+    return cfindScopedDict(dictPath);
 }
 
 
-Foam::dictionary* Foam::dictionary::findScopedDictPtr
+Foam::dictionary* Foam::dictionary::findScopedDict
 (
     const fileName& dictPath
 )
 {
-    const dictionary* ptr = cfindScopedDictPtr(dictPath);
+    const dictionary* ptr = cfindScopedDict(dictPath);
     return const_cast<dictionary*>(ptr);
 }
 
 
-Foam::dictionary* Foam::dictionary::makeScopedDictPtr(const fileName& dictPath)
+Foam::dictionary* Foam::dictionary::makeScopedDict(const fileName& dictPath)
 {
     // Or warning
     if (dictPath.empty())
@@ -536,7 +526,8 @@ Foam::dictionary* Foam::dictionary::makeScopedDictPtr(const fileName& dictPath)
         else
         {
             // Non-recursive, no patternMatch
-            // -> can do direct lookup, without csearch(cmptName, false, false);
+            // -> can do direct lookup,
+            // without csearch(cmptName, keyType::LITERAL);
             const word cmptName(cmpt.str(), false);
 
             auto iter = dictPtr->hashedEntries_.find(cmptName);
diff --git a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
index fab47e6488..a8656dcb08 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryTemplates.C
@@ -53,12 +53,11 @@ template<class T>
 T Foam::dictionary::get
 (
     const word& keyword,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
     T val;
-    readEntry<T>(keyword, val, recursive, patternMatch);
+    readEntry<T>(keyword, val, matchOpt);
     return val;
 }
 
@@ -68,12 +67,11 @@ T Foam::dictionary::getCompat
 (
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
     T val;
-    readCompat<T>(keyword, compat, val, recursive, patternMatch);
+    readCompat<T>(keyword, compat, val, matchOpt);
     return val;
 }
 
@@ -84,13 +82,11 @@ bool Foam::dictionary::readCompat
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
     T& val,
-    bool recursive,
-    bool patternMatch,
+    enum keyType::option matchOpt,
     bool mandatory
 ) const
 {
-    const const_searcher
-        finder(csearchCompat(keyword, compat, recursive, patternMatch));
+    const const_searcher finder(csearchCompat(keyword, compat, matchOpt));
 
     if (finder.found())
     {
@@ -113,29 +109,15 @@ bool Foam::dictionary::readCompat
 }
 
 
-// older name
-template<class T>
-T Foam::dictionary::lookupType
-(
-    const word& keyword,
-    bool recursive,
-    bool patternMatch
-) const
-{
-    return get<T>(keyword, recursive, patternMatch);
-}
-
-
 template<class T>
 T Foam::dictionary::lookupOrDefault
 (
     const word& keyword,
     const T& deflt,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    const const_searcher finder(csearch(keyword, recursive, patternMatch));
+    const const_searcher finder(csearch(keyword, matchOpt));
 
     if (finder.found())
     {
@@ -165,11 +147,10 @@ T Foam::dictionary::lookupOrAddDefault
 (
     const word& keyword,
     const T& deflt,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 )
 {
-    const const_searcher finder(csearch(keyword, recursive, patternMatch));
+    const const_searcher finder(csearch(keyword, matchOpt));
 
     if (finder.found())
     {
@@ -200,12 +181,11 @@ bool Foam::dictionary::readEntry
 (
     const word& keyword,
     T& val,
-    bool recursive,
-    bool patternMatch,
+    enum keyType::option matchOpt,
     bool mandatory
 ) const
 {
-    const const_searcher finder(csearch(keyword, recursive, patternMatch));
+    const const_searcher finder(csearch(keyword, matchOpt));
 
     if (finder.found())
     {
@@ -233,12 +213,11 @@ bool Foam::dictionary::readIfPresent
 (
     const word& keyword,
     T& val,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
     // Read is non-mandatory
-    return readEntry<T>(keyword, val, recursive, patternMatch, false);
+    return readEntry<T>(keyword, val, matchOpt, false);
 }
 
 
@@ -248,12 +227,10 @@ T Foam::dictionary::lookupOrDefaultCompat
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
     const T& deflt,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
-    const const_searcher
-        finder(csearchCompat(keyword, compat, recursive, patternMatch));
+    const const_searcher finder(csearchCompat(keyword, compat, matchOpt));
 
     if (finder.found())
     {
@@ -284,12 +261,11 @@ bool Foam::dictionary::readIfPresentCompat
     const word& keyword,
     std::initializer_list<std::pair<const char*,int>> compat,
     T& val,
-    bool recursive,
-    bool patternMatch
+    enum keyType::option matchOpt
 ) const
 {
     // Read is non-mandatory
-    return readCompat<T>(keyword, compat, val, recursive, patternMatch, false);
+    return readCompat<T>(keyword, compat, val, matchOpt, false);
 }
 
 
diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C
index 0e50a68e9b..cd7a335c0b 100644
--- a/src/OpenFOAM/db/dictionary/entry/entryIO.C
+++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C
@@ -241,7 +241,8 @@ bool Foam::entry::New
             const word varName = keyword.substr(1);
 
             // Lookup the variable name in the given dictionary
-            const auto finder = parentDict.csearchScoped(varName, true, true);
+            const auto finder =
+                parentDict.csearchScoped(varName, keyType::REGEX_RECURSIVE);
 
             if (finder.found())
             {
@@ -301,8 +302,8 @@ bool Foam::entry::New
         auto finder =
         (
             scoped
-          ? parentDict.searchScoped(keyword, false, false)
-          : parentDict.search(keyword, false, false)
+          ? parentDict.searchScoped(keyword, keyType::LITERAL)
+          : parentDict.search(keyword, keyType::LITERAL)
         );
 
         // How to manage duplicate entries
@@ -387,10 +388,7 @@ bool Foam::entry::New
             // Get or create the dictionary-path.
             // fileName::path == dictionary-path
             dictionary* subDictPtr =
-                parentDict.makeScopedDictPtr
-                (
-                    fileName::path(fullPath)
-                );
+                parentDict.makeScopedDict(fileName::path(fullPath));
 
             if (subDictPtr)
             {
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.C
index 25e452fce3..2a216f5c5f 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.C
@@ -61,8 +61,7 @@ bool Foam::functionEntries::removeEntry::execute
         if (key.isLiteral() && key.find('/') != string::npos)
         {
             // Remove scoped keyword, or keyword in the local scope
-            dictionary::searcher finder =
-                parentDict.searchScoped(key, false, false);
+            auto finder(parentDict.searchScoped(key, keyType::LITERAL));
 
             if (finder.found())
             {
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
index 0998353e9f..3c8715a2c0 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C
@@ -78,7 +78,8 @@ bool Foam::primitiveEntry::expandVariable
     // The $internalField would be matched by the ".*" !!!
 
     // Recursive, non-patterns
-    const entry* eptr = dict.lookupScopedEntryPtr(varName, true, false);
+    const entry* eptr = dict.findScoped(varName, keyType::LITERAL_RECURSIVE);
+
     if (!eptr)
     {
         // Not found - revert to environment variable
diff --git a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
index f7dabea32c..0cbb02b7a2 100644
--- a/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
+++ b/src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
@@ -55,14 +55,14 @@ static inline void writeEntryIfPresent
 )
 {
     // non-recursive like dictionary::found, but no pattern-match either
-    const entry* ptr = dict.lookupEntryPtr(key, false, false);
+    const entry* eptr = dict.findEntry(key, keyType::LITERAL);
 
-    if (ptr)
+    if (eptr)
     {
         os.writeKeyword(key)
             << token::HASH << token::BEGIN_BLOCK;
 
-        os.writeQuoted(string(ptr->stream()), false)
+        os.writeQuoted(string(eptr->stream()), false)
             << token::HASH << token::END_BLOCK
             << token::END_STATEMENT << nl;
     }
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
index 6f41078867..a626aa7874 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
@@ -44,50 +44,40 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
     // - necessary for compilation options, convenient for includes
     // and body.
 
-    const entry* codePtr = dict.lookupEntryPtr
-    (
-        "code",
-        false,
-        false
-    );
+    const entry* codePtr = dict.findEntry("code", keyType::LITERAL);
+
     if (codePtr)
     {
         code_ = stringOps::trim(codePtr->stream());
         stringOps::inplaceExpand(code_, dict);
     }
 
-    const entry* includePtr = dict.lookupEntryPtr
-    (
-        "codeInclude",
-        false,
-        false
-    );
+    const entry* includePtr = dict.findEntry("codeInclude", keyType::LITERAL);
+
     if (includePtr)
     {
         include_ = stringOps::trim(includePtr->stream());
         stringOps::inplaceExpand(include_, dict);
     }
 
-    const entry* optionsPtr = dict.lookupEntryPtr
-    (
-        "codeOptions",
-        false,
-        false
-    );
+    const entry* optionsPtr = dict.findEntry("codeOptions", keyType::LITERAL);
+
     if (optionsPtr)
     {
         options_ = stringOps::trim(optionsPtr->stream());
         stringOps::inplaceExpand(options_, dict);
     }
 
-    const entry* libsPtr = dict.lookupEntryPtr("codeLibs", false, false);
+    const entry* libsPtr = dict.findEntry("codeLibs", keyType::LITERAL);
+
     if (libsPtr)
     {
         libs_ = stringOps::trim(libsPtr->stream());
         stringOps::inplaceExpand(libs_, dict);
     }
 
-    const entry* localPtr = dict.lookupEntryPtr("localCode", false, false);
+    const entry* localPtr = dict.findEntry("localCode", keyType::LITERAL);
+
     if (localPtr)
     {
         localCode_ = stringOps::trim(localPtr->stream());
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index db9902b94f..2fd7f11563 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -706,12 +706,8 @@ bool Foam::functionObjectList::read()
     }
 
     // Update existing and add new functionObjects
-    const entry* entryPtr = parentDict_.lookupEntryPtr
-    (
-        "functions",
-        false,
-        false
-    );
+    const entry* entryPtr =
+        parentDict_.findEntry("functions", keyType::LITERAL);
 
     if (entryPtr)
     {
diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C
index 2b7206cc4f..d9102084f1 100644
--- a/src/OpenFOAM/global/debug/debug.C
+++ b/src/OpenFOAM/global/debug/debug.C
@@ -135,12 +135,9 @@ Foam::dictionary& Foam::debug::switchSet
 {
     if (!subDictPtr)
     {
-        entry* ePtr = controlDict().lookupEntryPtr
-        (
-            subDictName, false, false
-        );
+        entry* eptr = controlDict().findEntry(subDictName, keyType::LITERAL);
 
-        if (!ePtr || !ePtr->isDict())
+        if (!eptr || !eptr->isDict())
         {
             cerr<< "debug::switchSet(const char*, dictionary*&):\n"
                 << "    Cannot find " <<  subDictName << " in dictionary "
@@ -150,7 +147,7 @@ Foam::dictionary& Foam::debug::switchSet
             ::exit(1);
         }
 
-        subDictPtr = &ePtr->dict();
+        subDictPtr = &(eptr->dict());
     }
 
     return *subDictPtr;
@@ -179,7 +176,7 @@ int Foam::debug::debugSwitch(const char* name, const int defaultValue)
 {
     return debugSwitches().lookupOrAddDefault
     (
-        name, defaultValue, false, false
+        name, defaultValue, keyType::LITERAL
     );
 }
 
@@ -188,7 +185,7 @@ int Foam::debug::infoSwitch(const char* name, const int defaultValue)
 {
     return infoSwitches().lookupOrAddDefault
     (
-        name, defaultValue, false, false
+        name, defaultValue, keyType::LITERAL
     );
 }
 
@@ -197,7 +194,7 @@ int Foam::debug::optimisationSwitch(const char* name, const int defaultValue)
 {
     return optimisationSwitches().lookupOrAddDefault
     (
-        name, defaultValue, false, false
+        name, defaultValue, keyType::LITERAL
     );
 }
 
@@ -210,7 +207,7 @@ float Foam::debug::floatOptimisationSwitch
 {
     return optimisationSwitches().lookupOrAddDefault
     (
-        name, defaultValue, false, false
+        name, defaultValue, keyType::LITERAL
     );
 }
 
@@ -412,17 +409,17 @@ void listSwitches
 
         wordHashSet controlDictDebug
         (
-            controlDict.subDict("DebugSwitches").sortedToc()
+            controlDict.subDict("DebugSwitches").toc()
         );
 
         wordHashSet controlDictInfo
         (
-            controlDict.subDict("InfoSwitches").sortedToc()
+            controlDict.subDict("InfoSwitches").toc()
         );
 
         wordHashSet controlDictOpt
         (
-            controlDict.subDict("OptimisationSwitches").sortedToc()
+            controlDict.subDict("OptimisationSwitches").toc()
         );
 
 
diff --git a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
index 03cf4bc80c..a06170d709 100644
--- a/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
@@ -50,8 +50,7 @@ namespace Foam
             "fileHandler",
             //Foam::fileOperations::uncollatedFileOperation::typeName,
             "uncollated",
-            false,
-            false
+            keyType::LITERAL
         )
     );
 }
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
index 892f6569d1..88a1f86380 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixPreconditioner.C
@@ -43,8 +43,10 @@ Foam::word Foam::lduMatrix::preconditioner::getName
 {
     word name;
 
-    // handle primitive or dictionary entry
-    const entry& e = solverControls.lookupEntry("preconditioner", false, false);
+    // Handle primitive or dictionary entry
+    const entry& e =
+        solverControls.lookupEntry("preconditioner", keyType::LITERAL);
+
     if (e.isDict())
     {
         e.dict().readEntry("preconditioner", name);
@@ -67,8 +69,11 @@ Foam::lduMatrix::preconditioner::New
 {
     word name;
 
-    // handle primitive or dictionary entry
-    const entry& e = solverControls.lookupEntry("preconditioner", false, false);
+    // Handle primitive or dictionary entry
+
+    const entry& e =
+        solverControls.lookupEntry("preconditioner", keyType::LITERAL);
+
     if (e.isDict())
     {
         e.dict().readEntry("preconditioner", name);
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
index 3399023218..0e1bbaa015 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixSmoother.C
@@ -43,8 +43,10 @@ Foam::lduMatrix::smoother::getName
 {
     word name;
 
-    // handle primitive or dictionary entry
-    const entry& e = solverControls.lookupEntry("smoother", false, false);
+    // Handle primitive or dictionary entry
+    const entry& e =
+        solverControls.lookupEntry("smoother", keyType::LITERAL);
+
     if (e.isDict())
     {
         e.dict().readEntry("smoother", name);
@@ -70,8 +72,10 @@ Foam::autoPtr<Foam::lduMatrix::smoother> Foam::lduMatrix::smoother::New
 {
     word name;
 
-    // handle primitive or dictionary entry
-    const entry& e = solverControls.lookupEntry("smoother", false, false);
+    // Handle primitive or dictionary entry
+    const entry& e =
+        solverControls.lookupEntry("smoother", keyType::LITERAL);
+
     if (e.isDict())
     {
         e.dict().readEntry("smoother", name);
diff --git a/src/OpenFOAM/matrices/solution/solution.C b/src/OpenFOAM/matrices/solution/solution.C
index b08dde5b91..b2a3a07800 100644
--- a/src/OpenFOAM/matrices/solution/solution.C
+++ b/src/OpenFOAM/matrices/solution/solution.C
@@ -35,9 +35,9 @@ namespace Foam
 
 // List of sub-dictionaries to rewrite
 static const Foam::List<Foam::word> subDictNames
-{
+({
     "preconditioner", "smoother"
-};
+});
 
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
@@ -184,14 +184,13 @@ Foam::label Foam::solution::upgradeSolverDict
             // 1) primitiveEntry w/o settings,
             // 2) or a dictionaryEntry.
             // transform primitiveEntry with settings -> dictionaryEntry
-            forAll(subDictNames, dictI)
+            for (const word& dictName : subDictNames)
             {
-                const word& dictName = subDictNames[dictI];
-                entry* ePtr = subdict.lookupEntryPtr(dictName,false,false);
+                entry* eptr = subdict.findEntry(dictName, keyType::LITERAL);
 
-                if (ePtr && !ePtr->isDict())
+                if (eptr && !eptr->isDict())
                 {
-                    Istream& is = ePtr->stream();
+                    Istream& is = eptr->stream();
                     is >> name;
 
                     if (!is.eof())
@@ -234,10 +233,8 @@ bool Foam::solution::cache(const word& name) const
 
         return cache_.found(name);
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
index fe97b5acc2..9063d21f83 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
@@ -57,7 +57,7 @@ Foam::autoPtr<Foam::Function1<Type>> Foam::Function1<Type>::New
     }
     else
     {
-        Istream& is(dict.lookup(entryName, false));
+        Istream& is = dict.lookup(entryName); // non-recursive, allow patterns
 
         token firstToken(is);
         word Function1Type;
diff --git a/src/OpenFOAM/primitives/strings/keyType/keyType.H b/src/OpenFOAM/primitives/strings/keyType/keyType.H
index 608468105f..cf9db5128f 100644
--- a/src/OpenFOAM/primitives/strings/keyType/keyType.H
+++ b/src/OpenFOAM/primitives/strings/keyType/keyType.H
@@ -82,6 +82,20 @@ public:
         static const keyType null;
 
 
+    // Public data types
+
+        //- Enumeration for search/match modes as bitmask
+        //  eg, (keyType::REGEX | keyType::RECURSIVE)
+        enum option
+        {
+            LITERAL = 0,        //!< String literal
+            REGEX   = 1,        //!< Regular expression
+            RECURSIVE = 0x10,   //!< Recursive search (eg, in dictionary)
+            LITERAL_RECURSIVE = (LITERAL | RECURSIVE),
+            REGEX_RECURSIVE   = (REGEX | RECURSIVE)
+        };
+
+
     // Constructors
 
         //- Construct null
@@ -100,19 +114,19 @@ public:
         inline keyType(const char* s);
 
         //- Copy construct from std::string with specified treatment
-        inline keyType(const std::string& s, const bool isPattern);
+        inline keyType(const std::string& s, bool isPattern);
 
         //- Move construct, retaining type (literal or regex)
         inline keyType(keyType&& s);
 
-        //- Move construct from word. Not treated as a regular expression
+        //- Move construct from word, treat as literal.
         inline keyType(word&& s);
 
-        //- Move construct from string. Treat as regular expression.
+        //- Move construct from string, treat as regular expression.
         inline keyType(string&& s);
 
         //- Move construct from std::string with specified treatment
-        inline keyType(std::string&& s, const bool isPattern);
+        inline keyType(std::string&& s, bool isPattern);
 
         //- Construct from Istream
         //  Treat as regular expression if surrounded by quotation marks.
diff --git a/src/OpenFOAM/primitives/strings/keyType/keyTypeI.H b/src/OpenFOAM/primitives/strings/keyType/keyTypeI.H
index bf84de6a23..3b4b0f3289 100644
--- a/src/OpenFOAM/primitives/strings/keyType/keyTypeI.H
+++ b/src/OpenFOAM/primitives/strings/keyType/keyTypeI.H
@@ -77,7 +77,7 @@ inline Foam::keyType::keyType(const char* s)
 {}
 
 
-inline Foam::keyType::keyType(const std::string& s, const bool isPattern)
+inline Foam::keyType::keyType(const std::string& s, bool isPattern)
 :
     word(s, false),
     isPattern_(isPattern)
@@ -107,7 +107,7 @@ inline Foam::keyType::keyType(string&& s)
 {}
 
 
-inline Foam::keyType::keyType(std::string&& s, const bool isPattern)
+inline Foam::keyType::keyType(std::string&& s, bool isPattern)
 :
     word(std::move(s), false),
     isPattern_(isPattern)
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index 484ef5f9f5..325e64051d 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -437,7 +437,7 @@ Foam::string Foam::stringOps::getVariable
 {
     string value;
 
-    const entry* eptr = dict.lookupScopedEntryPtr(name, true, false);
+    const entry* eptr = dict.findScoped(name, keyType::LITERAL_RECURSIVE);
 
     if (eptr)
     {
@@ -720,20 +720,16 @@ void Foam::stringOps::inplaceExpand
                         varBeg + 1 + delim,
                         varEnd - varBeg - 2*delim
                     ),
-                    false
+                    false   // Already validated
                 );
 
 
                 // Lookup in the dictionary without wildcards.
                 // See note in primitiveEntry
-                const entry* eptr = dict.lookupScopedEntryPtr
-                (
-                    varName,
-                    true,
-                    false
-                );
+                const entry* eptr =
+                    dict.findScoped(varName, keyType::LITERAL_RECURSIVE);
 
-                // if defined - copy its entries
+                // Copy its entries if defined
                 if (eptr)
                 {
                     OStringStream buf;
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
index 9976ecb6dc..5b83bda346 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -96,14 +96,14 @@ public:
         //  Note that 'REGEX' is implicit if 'ICASE' is specified alone.
         enum compOption
         {
-            LITERAL = 0, //!< Treat as a string literal
-            DETECT  = 1, //!< Detect if the string contains meta-characters
-            UNKNOWN = 1, //!< Unknown content.
-            REGEX   = 2, //!< Treat as regular expression
-            ICASE   = 4, //!< Ignore case in regular expression
-            NOCASE  = 4, //!< \deprecated Alias for ICASE (deprecated APR-2018)
+            LITERAL = 0, //!< String literal
+            REGEX   = 1, //!< Regular expression
+            ICASE   = 2, //!< Ignore case in regular expression
+            NOCASE  = 2, //!< \deprecated Alias for ICASE (deprecated APR-2018)
+            DETECT  = 4, //!< Detect if the string contains meta-characters
+            UNKNOWN = 4, //!< Unknown content.
+            REGEX_ICASE  = (REGEX|ICASE),   //!< Combined REGEX and ICASE
             DETECT_ICASE = (DETECT|ICASE),  //!< Combined DETECT and ICASE
-            REGEX_ICASE  = (REGEX|ICASE)    //!< Combined REGEX and ICASE
         };
 
 
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
index 8a5aadee53..361fbe216e 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoCheck.C
@@ -62,53 +62,59 @@ bool Foam::motionSmootherAlgo::checkMesh
 {
     const scalar maxNonOrtho
     (
-        dict.get<scalar>("maxNonOrtho", true)
+        dict.get<scalar>("maxNonOrtho", keyType::REGEX_RECURSIVE)
     );
     const scalar minVol
     (
-        dict.get<scalar>("minVol", true)
+        dict.get<scalar>("minVol", keyType::REGEX_RECURSIVE)
     );
     const scalar minTetQuality
     (
-        dict.get<scalar>("minTetQuality", true)
+        dict.get<scalar>("minTetQuality", keyType::REGEX_RECURSIVE)
     );
     const scalar maxConcave
     (
-        dict.get<scalar>("maxConcave", true)
+        dict.get<scalar>("maxConcave", keyType::REGEX_RECURSIVE)
     );
     const scalar minArea
     (
-        dict.get<scalar>("minArea", true)
+        dict.get<scalar>("minArea", keyType::REGEX_RECURSIVE)
     );
     const scalar maxIntSkew
     (
-        dict.get<scalar>("maxInternalSkewness", true)
+        dict.get<scalar>("maxInternalSkewness", keyType::REGEX_RECURSIVE)
     );
     const scalar maxBounSkew
     (
-        dict.get<scalar>("maxBoundarySkewness", true)
+        dict.get<scalar>("maxBoundarySkewness", keyType::REGEX_RECURSIVE)
     );
     const scalar minWeight
     (
-        dict.get<scalar>("minFaceWeight", true)
+        dict.get<scalar>("minFaceWeight", keyType::REGEX_RECURSIVE)
     );
     const scalar minVolRatio
     (
-        dict.get<scalar>("minVolRatio", true)
+        dict.get<scalar>("minVolRatio", keyType::REGEX_RECURSIVE)
     );
     const scalar minTwist
     (
-        dict.get<scalar>("minTwist", true)
+        dict.get<scalar>("minTwist", keyType::REGEX_RECURSIVE)
     );
     const scalar minTriangleTwist
     (
-        dict.get<scalar>("minTriangleTwist", true)
+        dict.get<scalar>("minTriangleTwist", keyType::REGEX_RECURSIVE)
+    );
+
+    const scalar minFaceFlatness
+    (
+        dict.lookupOrDefault<scalar>
+        (
+            "minFaceFlatness", -1, keyType::REGEX_RECURSIVE
+        )
     );
-    scalar minFaceFlatness = -1.0;
-    dict.readIfPresent("minFaceFlatness", minFaceFlatness, true);
     const scalar minDet
     (
-        dict.get<scalar>("minDeterminant", true)
+        dict.get<scalar>("minDeterminant", keyType::REGEX_RECURSIVE)
     );
     label nWrongFaces = 0;
 
@@ -467,53 +473,58 @@ bool Foam::motionSmootherAlgo::checkMesh
 {
     const scalar maxNonOrtho
     (
-        dict.get<scalar>("maxNonOrtho", true)
+        dict.get<scalar>("maxNonOrtho", keyType::REGEX_RECURSIVE)
     );
     const scalar minVol
     (
-        dict.get<scalar>("minVol", true)
+        dict.get<scalar>("minVol", keyType::REGEX_RECURSIVE)
     );
     const scalar minTetQuality
     (
-        dict.get<scalar>("minTetQuality", true)
+        dict.get<scalar>("minTetQuality", keyType::REGEX_RECURSIVE)
     );
     const scalar maxConcave
     (
-        dict.get<scalar>("maxConcave", true)
+        dict.get<scalar>("maxConcave", keyType::REGEX_RECURSIVE)
     );
     const scalar minArea
     (
-        dict.get<scalar>("minArea", true)
+        dict.get<scalar>("minArea", keyType::REGEX_RECURSIVE)
     );
     const scalar maxIntSkew
     (
-        dict.get<scalar>("maxInternalSkewness", true)
+        dict.get<scalar>("maxInternalSkewness", keyType::REGEX_RECURSIVE)
     );
     const scalar maxBounSkew
     (
-        dict.get<scalar>("maxBoundarySkewness", true)
+        dict.get<scalar>("maxBoundarySkewness", keyType::REGEX_RECURSIVE)
     );
     const scalar minWeight
     (
-        dict.get<scalar>("minFaceWeight", true)
+        dict.get<scalar>("minFaceWeight", keyType::REGEX_RECURSIVE)
     );
     const scalar minVolRatio
     (
-        dict.get<scalar>("minVolRatio", true)
+        dict.get<scalar>("minVolRatio", keyType::REGEX_RECURSIVE)
     );
     const scalar minTwist
     (
-        dict.get<scalar>("minTwist", true)
+        dict.get<scalar>("minTwist", keyType::REGEX_RECURSIVE)
     );
     const scalar minTriangleTwist
     (
-        dict.get<scalar>("minTriangleTwist", true)
+        dict.get<scalar>("minTriangleTwist", keyType::REGEX_RECURSIVE)
+    );
+    const scalar minFaceFlatness
+    (
+        dict.lookupOrDefault<scalar>
+        (
+            "minFaceFlatness", -1, keyType::REGEX_RECURSIVE
+        )
     );
-    scalar minFaceFlatness = -1.0;
-    dict.readIfPresent("minFaceFlatness", minFaceFlatness, true);
     const scalar minDet
     (
-        dict.get<scalar>("minDeterminant", true)
+        dict.get<scalar>("minDeterminant", keyType::REGEX_RECURSIVE)
     );
     label nWrongFaces = 0;
 
diff --git a/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C b/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C
index c403486a2c..e8b4d8551a 100644
--- a/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C
+++ b/src/finiteVolume/cfdTools/general/solutionControl/loopControl/loopControl.C
@@ -170,7 +170,7 @@ Foam::loopControl::loopControl
     loopControl(runTime, 0, dictName)
 {
     // The loop sub-dictionary
-    const dictionary* dictptr = algorithmDict.subDictPtr(dictName);
+    const dictionary* dictptr = algorithmDict.findDict(dictName);
 
     if (dictptr)
     {
@@ -192,13 +192,12 @@ Foam::loopControl::loopControl
     fvSolution fvsol(time_);
 
     // Eg, PIMPLE or SIMPLE from <system/fvSolution>
-    const dictionary* dictptr =
-        fvsol.solutionDict().subDictPtr(algorithmName);
+    const dictionary* dictptr = fvsol.solutionDict().findDict(algorithmName);
 
     if (dictptr)
     {
         // The loop sub-dictionary
-        dictptr = dictptr->subDictPtr(dictName);
+        dictptr = dictptr->findDict(dictName);
 
         if (dictptr)
         {
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
index 62d65ffaf3..6b4136d384 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
@@ -193,12 +193,7 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
 
     dict.readCompat<word>("name", {{"redirectType", 1706}}, name_);
 
-    const entry* dataPtr = dict.lookupEntryPtr
-    (
-        "codeData",
-        false,
-        false
-    );
+    const entry* dataPtr = dict.findEntry("codeData", keyType::LITERAL);
     if (dataPtr)
     {
         codeData_ = stringOps::trim(dataPtr->stream());
@@ -211,12 +206,7 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
         );
     }
 
-    const entry* readPtr = dict.lookupEntryPtr
-    (
-        "codeRead",
-        false,
-        false
-    );
+    const entry* readPtr = dict.findEntry("codeRead", keyType::LITERAL);
     if (readPtr)
     {
         codeRead_ = stringOps::trim(readPtr->stream());
@@ -229,12 +219,7 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
         );
     }
 
-    const entry* execPtr = dict.lookupEntryPtr
-    (
-        "codeExecute",
-        false,
-        false
-    );
+    const entry* execPtr = dict.findEntry("codeExecute", keyType::LITERAL);
     if (execPtr)
     {
         codeExecute_ = stringOps::trim(execPtr->stream());
@@ -247,12 +232,7 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
         );
     }
 
-    const entry* writePtr = dict.lookupEntryPtr
-    (
-        "codeWrite",
-        false,
-        false
-    );
+    const entry* writePtr = dict.findEntry("codeWrite", keyType::LITERAL);
     if (writePtr)
     {
         codeWrite_ = stringOps::trim(writePtr->stream());
@@ -265,12 +245,7 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
         );
     }
 
-    const entry* endPtr = dict.lookupEntryPtr
-    (
-        "codeEnd",
-        false,
-        false
-    );
+    const entry* endPtr = dict.findEntry("codeEnd", keyType::LITERAL);
     if (endPtr)
     {
         codeEnd_ = stringOps::trim(endPtr->stream());
@@ -283,7 +258,7 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
         );
     }
 
-    if(!dataPtr && !readPtr && !execPtr && !writePtr && !endPtr)
+    if (!dataPtr && !readPtr && !execPtr && !writePtr && !endPtr)
     {
         IOWarningInFunction
         (
diff --git a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
index bf27297e0e..8cbeeecda2 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
@@ -40,12 +40,9 @@ bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
 
         // Code snippets
         {
-            const entry& e = coeffs_.lookupEntry
-            (
-                "codeCorrect",
-                false,
-                false
-            );
+            const entry& e =
+                coeffs_.lookupEntry("codeCorrect", keyType::LITERAL);
+
             codeCorrect_ = stringOps::trim(e.stream());
             stringOps::inplaceExpand(codeCorrect_, coeffs_);
             dynamicCodeContext::addLineDirective
@@ -57,12 +54,9 @@ bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
         }
 
         {
-            const entry& e = coeffs_.lookupEntry
-            (
-                "codeAddSup",
-                false,
-                false
-            );
+            const entry& e =
+                coeffs_.lookupEntry("codeAddSup", keyType::LITERAL);
+
             codeAddSup_ = stringOps::trim(e.stream());
             stringOps::inplaceExpand(codeAddSup_, coeffs_);
             dynamicCodeContext::addLineDirective
@@ -74,12 +68,9 @@ bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
         }
 
         {
-            const entry& e = coeffs_.lookupEntry
-            (
-                "codeSetValue",
-                false,
-                false
-            );
+            const entry& e =
+                coeffs_.lookupEntry("codeSetValue", keyType::LITERAL);
+
             codeSetValue_ = stringOps::trim(e.stream());
             stringOps::inplaceExpand(codeSetValue_, coeffs_);
             dynamicCodeContext::addLineDirective
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index b29cc4e042..3ef592ba70 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -300,7 +300,7 @@ void Foam::lumpedPointMovement::readDict(const dictionary& dict)
 
     const dictionary* scaleDict = nullptr;
 
-    if ((scaleDict = commDict.subDictPtr("scaleInput")))
+    if ((scaleDict = commDict.findDict("scaleInput")))
     {
         for (int i=0; i < scaleInput_.size(); ++i)
         {
@@ -318,7 +318,7 @@ void Foam::lumpedPointMovement::readDict(const dictionary& dict)
         }
     }
 
-    if ((scaleDict = commDict.subDictPtr("scaleOutput")))
+    if ((scaleDict = commDict.findDict("scaleOutput")))
     {
         for (int i=0; i < scaleOutput_.size(); ++i)
         {
diff --git a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
index 175ecf9688..f1f6f81ccc 100644
--- a/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
+++ b/src/mesh/blockMesh/blockDescriptor/blockDescriptor.C
@@ -369,7 +369,7 @@ void Foam::blockDescriptor::write
     const dictionary& d
 )
 {
-    const dictionary* varDictPtr = d.subDictPtr("namedBlocks");
+    const dictionary* varDictPtr = d.findDict("namedBlocks");
     if (varDictPtr)
     {
         blockMeshTools::write(os, val, *varDictPtr);
diff --git a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
index 62f5347cf1..f136aa3d41 100644
--- a/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
+++ b/src/mesh/blockMesh/blockMesh/blockMeshTopology.C
@@ -350,7 +350,7 @@ Foam::autoPtr<Foam::polyMesh> Foam::blockMesh::createTopology
     // Read the names/types for the unassigned patch faces
     // this is a bit heavy handed (and ugly), but there is currently
     // no easy way to rename polyMesh patches subsequently
-    if (const dictionary* dictPtr = meshDescription.subDictPtr("defaultPatch"))
+    if (const dictionary* dictPtr = meshDescription.findDict("defaultPatch"))
     {
         dictPtr->readIfPresent("name", defaultPatchName);
         dictPtr->readIfPresent("type", defaultPatchType);
diff --git a/src/mesh/blockMesh/blockMeshTools/blockMeshTools.C b/src/mesh/blockMesh/blockMeshTools/blockMeshTools.C
index 45eebc4956..9e5bc55a9b 100644
--- a/src/mesh/blockMesh/blockMeshTools/blockMeshTools.C
+++ b/src/mesh/blockMesh/blockMeshTools/blockMeshTools.C
@@ -42,16 +42,13 @@ void Foam::blockMeshTools::read
     else if (t.isWord())
     {
         const word& varName = t.wordToken();
-        const entry* ePtr = dict.lookupScopedEntryPtr
-        (
-            varName,
-            true,
-            true
-        );
-        if (ePtr)
+        const entry* eptr =
+            dict.findScoped(varName, keyType::REGEX_RECURSIVE);
+
+        if (eptr)
         {
             // Read as label
-            val = Foam::readLabel(ePtr->stream());
+            val = Foam::readLabel(eptr->stream());
         }
         else
         {
diff --git a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
index bf60160723..653e38dfec 100644
--- a/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
+++ b/src/mesh/blockMesh/blockVertices/blockVertex/blockVertex.C
@@ -104,7 +104,7 @@ Foam::autoPtr<Foam::blockVertex> Foam::blockVertex::New
 
 Foam::label Foam::blockVertex::read(Istream& is, const dictionary& dict)
 {
-    const dictionary* varDictPtr = dict.subDictPtr("namedVertices");
+    const dictionary* varDictPtr = dict.findDict("namedVertices");
     if (varDictPtr)
     {
         return blockMeshTools::read(is, *varDictPtr);
@@ -120,7 +120,7 @@ void Foam::blockVertex::write
     const dictionary& d
 )
 {
-    const dictionary* varDictPtr = d.subDictPtr("namedVertices");
+    const dictionary* varDictPtr = d.findDict("namedVertices");
     if (varDictPtr)
     {
         blockMeshTools::write(os, val, *varDictPtr);
diff --git a/src/mesh/blockMesh/blockVertices/namedVertex/namedVertex.C b/src/mesh/blockMesh/blockVertices/namedVertex/namedVertex.C
index 5e9738602e..017117e03d 100644
--- a/src/mesh/blockMesh/blockVertices/namedVertex/namedVertex.C
+++ b/src/mesh/blockMesh/blockVertices/namedVertex/namedVertex.C
@@ -53,10 +53,10 @@ Foam::blockVertices::namedVertex::namedVertex
 {
     dictionary& d = const_cast<dictionary&>(dict);
 
-    dictionary* varDictPtr = d.subDictPtr("namedVertices");
+    dictionary* varDictPtr = d.findDict("namedVertices");
     if (varDictPtr)
     {
-        const_cast<dictionary&>(*varDictPtr).add(name_, index);
+        varDictPtr->add(name_, index);
     }
     else
     {
diff --git a/src/mesh/blockMesh/blocks/namedBlock/namedBlock.C b/src/mesh/blockMesh/blocks/namedBlock/namedBlock.C
index 023638b75e..b24481803a 100644
--- a/src/mesh/blockMesh/blocks/namedBlock/namedBlock.C
+++ b/src/mesh/blockMesh/blocks/namedBlock/namedBlock.C
@@ -54,10 +54,10 @@ Foam::blocks::namedBlock::namedBlock
     block(dict, index, vertices, edges, faces, is)
 {
     dictionary& d = const_cast<dictionary&>(dict);
-    dictionary* varDictPtr = d.subDictPtr("namedBlocks");
+    dictionary* varDictPtr = d.findDict("namedBlocks");
     if (varDictPtr)
     {
-        const_cast<dictionary&>(*varDictPtr).add(*this, index);
+        varDictPtr->add(*this, index);
     }
     else
     {
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
index d7a02c0f42..2476b0922e 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
@@ -1205,7 +1205,8 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
             const labelList allFaces(identity(mesh_.nFaces()));
             label nWrongFaces = 0;
 
-            //const scalar minV(motionDict.get<scalar>("minVol", true));
+            //const scalar minV
+            //(motionDict.get<scalar>("minVol", keyType::REGEX_RECURSIVE));
             //if (minV > -GREAT)
             //{
             //    polyMeshGeometry::checkFacePyramids
diff --git a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
index 71a63b20f5..ec4a95b43a 100644
--- a/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
+++ b/src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
@@ -184,7 +184,8 @@ Foam::refinementSurfaces::refinementSurfaces
     {
         const word& geomName = allGeometry_.names()[geomI];
 
-        const entry* ePtr = surfacesDict.lookupEntryPtr(geomName, false, true);
+        const entry* ePtr =
+            surfacesDict.findEntry(geomName, keyType::LITERAL);
 
         if (ePtr)
         {
diff --git a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
index 210a423248..8de4a57b4d 100644
--- a/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
+++ b/src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C
@@ -578,13 +578,11 @@ Foam::shellSurfaces::shellSurfaces
 
     // Count number of shells.
     label shellI = 0;
-    forAll(allGeometry.names(), geomI)
+    for (const word& geomName : allGeometry_.names())
     {
-        const word& geomName = allGeometry_.names()[geomI];
-
         if (shellsDict.found(geomName))
         {
-            shellI++;
+            ++shellI;
         }
     }
 
@@ -615,12 +613,12 @@ Foam::shellSurfaces::shellSurfaces
     {
         const word& geomName = allGeometry_.names()[geomI];
 
-        const entry* ePtr = shellsDict.lookupEntryPtr(geomName, false, true);
+        const entry* eptr = shellsDict.findEntry(geomName, keyType::LITERAL);
 
-        if (ePtr)
+        if (eptr)
         {
-            const dictionary& dict = ePtr->dict();
-            unmatchedKeys.erase(ePtr->keyword());
+            const dictionary& dict = eptr->dict();
+            unmatchedKeys.erase(eptr->keyword());
 
             shells_[shellI] = geomI;
             modes_[shellI] = refineModeNames_.lookup("mode", dict);
@@ -637,12 +635,9 @@ Foam::shellSurfaces::shellSurfaces
                 labelPair(labelMax, labelMin),
                 labelVector::zero
             );
-            const entry* levelPtr = dict.lookupEntryPtr
-            (
-                "levelIncrement",
-                false,
-                true
-            );
+            const entry* levelPtr =
+                dict.findEntry("levelIncrement", keyType::REGEX);
+
             if (levelPtr)
             {
                 // Do reading ourselves since using labelPair would require
diff --git a/src/meshTools/coordinate/systems/coordinateSystem.C b/src/meshTools/coordinate/systems/coordinateSystem.C
index 1b6cb2911d..4f80e3a8d4 100644
--- a/src/meshTools/coordinate/systems/coordinateSystem.C
+++ b/src/meshTools/coordinate/systems/coordinateSystem.C
@@ -78,7 +78,7 @@ void Foam::coordinateSystem::assign(const dictionary& dict)
     const auto finder = dict.csearchCompat
     (
         "rotation", {{"coordinateRotation", -1806}},
-        false, false
+        keyType::LITERAL
     );
 
     if (finder.isDict())
diff --git a/src/meshTools/coordinate/systems/coordinateSystemNew.C b/src/meshTools/coordinate/systems/coordinateSystemNew.C
index 13c21578ed..af2d569c7d 100644
--- a/src/meshTools/coordinate/systems/coordinateSystemNew.C
+++ b/src/meshTools/coordinate/systems/coordinateSystemNew.C
@@ -42,7 +42,7 @@ const Foam::dictionary* Foam::coordinateSystem::subDictCompat
     {
         // Non-recursive, no pattern matching in the search
         const auto finder =
-            dictPtr->csearch(coordinateSystem::typeName_(), false, false);
+            dictPtr->csearch(coordinateSystem::typeName_(), keyType::LITERAL);
 
         if (finder.isDict())
         {
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index 110f57feeb..791c8d993b 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -100,7 +100,7 @@ Foam::fileName Foam::triSurfaceMesh::checkFile
 )
 {
     fileName fName;
-    if (dict.readIfPresent("file", fName, false, false))
+    if (dict.readIfPresent("file", fName, keyType::LITERAL))
     {
         fName = relativeFilePath(io, fName, isGlobal);
 
@@ -318,7 +318,7 @@ Foam::triSurfaceMesh::triSurfaceMesh
     outsideVolType_(volumeType::UNKNOWN)
 {
     // Reading from supplied file name instead of objectPath/filePath
-    if (dict.readIfPresent("file", fName_, false, false))
+    if (dict.readIfPresent("file", fName_, keyType::LITERAL))
     {
         fName_ = relativeFilePath
         (
@@ -418,7 +418,7 @@ Foam::triSurfaceMesh::triSurfaceMesh
     outsideVolType_(volumeType::UNKNOWN)
 {
     // Reading from supplied file name instead of objectPath/filePath
-    if (dict.readIfPresent("file", fName_, false, false))
+    if (dict.readIfPresent("file", fName_, keyType::LITERAL))
     {
         fName_ = relativeFilePath
         (
diff --git a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
index 378516e334..c354832edf 100644
--- a/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
+++ b/src/overset/dynamicOversetFvMesh/dynamicOversetFvMesh.C
@@ -306,11 +306,11 @@ bool Foam::dynamicOversetFvMesh::interpolateFields()
     // Use whatever the solver has set up as suppression list
     const dictionary* dictPtr
     (
-        this->schemesDict().subDictPtr("oversetInterpolationSuppressed")
+        this->schemesDict().findDict("oversetInterpolationSuppressed")
     );
     if (dictPtr)
     {
-        suppressed.insert(dictPtr->sortedToc());
+        suppressed.insert(dictPtr->toc());
     }
 
     interpolate<volScalarField>(suppressed);
diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.C b/src/overset/oversetPolyPatch/oversetFvPatchField.C
index c60307d635..16905ef7ac 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatchField.C
+++ b/src/overset/oversetPolyPatch/oversetFvPatchField.C
@@ -136,12 +136,12 @@ void Foam::oversetFvPatchField<Type>::initEvaluate
 
             const dictionary* dictPtr
             (
-                fvSchemes.subDictPtr("oversetInterpolationSuppressed")
+                fvSchemes.findDict("oversetInterpolationSuppressed")
             );
 
             if (dictPtr)
             {
-                suppressed.insert(dictPtr->sortedToc());
+                suppressed.insert(dictPtr->toc());
             }
 
             if (!suppressed.found(fldName))
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index d2cec72e0b..26da76af43 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -121,7 +121,7 @@ void Foam::decompositionMethod::readConstraints()
     // Read any constraints
     wordList constraintTypes;
 
-    const dictionary* dictptr = decompositionDict_.subDictPtr("constraints");
+    const dictionary* dictptr = decompositionDict_.findDict("constraints");
 
     if (dictptr)
     {
diff --git a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
index 728e782cbb..da1772e30d 100644
--- a/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
@@ -68,9 +68,9 @@ void Foam::multiLevelDecomp::createMethodsDict()
     if
     (
         // non-recursive, no patterns
-        coeffsDict_.readIfPresent("method", defaultMethod, false, false)
+        coeffsDict_.readIfPresent("method", defaultMethod, keyType::LITERAL)
         // non-recursive, no patterns
-     && coeffsDict_.readIfPresent("domains", domains, false, false)
+     && coeffsDict_.readIfPresent("domains", domains, keyType::LITERAL)
     )
     {
         // Short-cut version specified by method, domains only
@@ -169,14 +169,14 @@ void Foam::multiLevelDecomp::createMethodsDict()
             (
                 iter().isDict()
                 // non-recursive, no patterns
-             && iter().dict().found("numberOfSubdomains", false, false)
+             && iter().dict().found("numberOfSubdomains", keyType::LITERAL)
             )
             {
                 // No method specified? can use a default method?
 
                 const bool addDefaultMethod
                 (
-                    !(iter().dict().found("method", false, false))
+                    !(iter().dict().found("method", keyType::LITERAL))
                  && !defaultMethod.empty()
                 );
 
diff --git a/src/parallel/decompose/metisDecomp/metisDecomp.C b/src/parallel/decompose/metisDecomp/metisDecomp.C
index 43b16be9f6..5fabedf464 100644
--- a/src/parallel/decompose/metisDecomp/metisDecomp.C
+++ b/src/parallel/decompose/metisDecomp/metisDecomp.C
@@ -72,7 +72,7 @@ Foam::label Foam::metisDecomp::decomposeSerial
     word method("recursive");
 
     const dictionary* coeffsDictPtr =
-        decompositionDict_.subDictPtr("metisCoeffs");
+        decompositionDict_.findDict("metisCoeffs");
 
     label numCells = xadj.size()-1;
 
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index c2abb3cd23..8641753fd8 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -149,9 +149,9 @@ bool Foam::regionModels::regionModel::read()
     {
         if (active_)
         {
-            if (const dictionary* dictPtr = subDictPtr(modelName_ + "Coeffs"))
+            if (const dictionary* dictptr = findDict(modelName_ + "Coeffs"))
             {
-                coeffs_ <<= *dictPtr;
+                coeffs_ <<= *dictptr;
             }
 
             infoOutput_.readIfPresent("infoOutput", *this);
@@ -159,10 +159,8 @@ bool Foam::regionModels::regionModel::read()
 
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 
@@ -170,18 +168,16 @@ bool Foam::regionModels::regionModel::read(const dictionary& dict)
 {
     if (active_)
     {
-        if (const dictionary* dictPtr = dict.subDictPtr(modelName_ + "Coeffs"))
+        if (const dictionary* dictptr = dict.findDict(modelName_ + "Coeffs"))
         {
-            coeffs_ <<= *dictPtr;
+            coeffs_ <<= *dictptr;
         }
 
         infoOutput_.readIfPresent("infoOutput", dict);
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 

From 5c8a1b746dfc1ce067f8b7b8f42da7d084bd75bd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 15 Oct 2018 21:19:13 +0200
Subject: [PATCH 26/43] STYLE: use <case> instead of $FOAM_CASE expansion in
 more places

---
 .../dynamicLibrary/dynamicCode/dynamicCode.C  |  2 +-
 .../dynamicLibrary/dynamicCode/dynamicCode.H  |  6 +--
 .../functionObject/functionObject.C           |  2 +-
 .../functionObject/functionObject.H           |  9 ++---
 .../functionObjectList/functionObjectList.C   | 38 +++++++------------
 .../functionObjectList/functionObjectList.H   |  2 +-
 src/functionObjects/utilities/abort/abort.C   | 13 +++++--
 src/functionObjects/utilities/abort/abort.H   |  6 +--
 .../noise/noiseModels/noiseModel/noiseModel.C | 21 +++++-----
 .../noise/noiseModels/pointNoise/pointNoise.C |  7 +++-
 .../noiseModels/surfaceNoise/surfaceNoise.C   |  6 ++-
 11 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
index 761391b605..7404683aea 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
@@ -292,7 +292,7 @@ bool Foam::dynamicCode::writeDigest(const std::string& sha1) const
 
 Foam::dynamicCode::dynamicCode(const word& codeName, const word& codeDirName)
 :
-    codeRoot_(stringOps::expand("$FOAM_CASE")/topDirName),
+    codeRoot_(stringOps::expand("<case>")/topDirName),
     libSubDir_(stringOps::expand("platforms/$WM_OPTIONS/lib")),
     codeName_(codeName),
     codeDirName_(codeDirName)
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
index f8b7c2fcfb..02cf92b12c 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H
@@ -197,7 +197,7 @@ public:
         }
 
         //- Root for dynamic code compilation
-        //  Expanded from \$FOAM_CASE/dynamicCode
+        //  Expanded from \<case\>/dynamicCode
         const fileName& codeRoot() const
         {
             return codeRoot_;
@@ -228,12 +228,12 @@ public:
             #endif
         }
 
-        //- Path for specified code name relative to \$FOAM_CASE
+        //- Path for specified code name relative to \<case\>
         //  Corresponds to topDirName/codeDirName()
         fileName codeRelPath() const;
 
 
-        //- Library path for specified code name relative to \$FOAM_CASE
+        //- Library path for specified code name relative to \<case\>
         //  Corresponds to
         //  dynamicCode/codeDirName()/libSubDir()/lib\<codeName\>.so
         fileName libRelPath() const;
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 3804a2c4af..a3a3b42db4 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -140,7 +140,7 @@ bool Foam::functionObject::read(const dictionary& dict)
 {
     if (!postProcess)
     {
-        log = dict.lookupOrDefault<Switch>("log", true);
+        log = dict.lookupOrDefault("log", true);
     }
 
     return true;
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 7d19a907ca..6cf20b4d47 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -34,8 +34,8 @@ Description
 
     \section secFunctionObjects Using function objects
 
-    FunctionObjects are selected by additional entries in the
-    $FOAM_CASE/system/controlDict dictionary.  Each object is listed in the \c
+    FunctionObjects are selected by additional entries in the global case
+    system/controlDict dictionary.  Each object is listed in the \c
     functions sub-dictionary, e.g. to select the \c functionObjectType
     functionObject the following entry would be specified:
 
@@ -59,7 +59,7 @@ Description
 
     Where:
     \table
-        Property | Description                       | Required | Default value
+        Property | Description                           | Required | Default
         type     | Type of function object               | yes      |
         libs     | Libraries containing implementation   | yes      |
         region   | Name of region for multi-region cases | no       |
@@ -120,7 +120,6 @@ SourceFiles
 
 #include "typeInfo.H"
 #include "autoPtr.H"
-#include "Switch.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -176,7 +175,7 @@ public:
     static word outputPrefix;
 
     //- Switch write log to Info
-    Switch log;
+    bool log;
 
 
     // Declare run-time constructor selection tables
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 2fd7f11563..4519ceb282 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -98,64 +98,54 @@ Foam::functionObject* Foam::functionObjectList::remove
 void Foam::functionObjectList::listDir
 (
     const fileName& dir,
-    wordHashSet& foMap
+    wordHashSet& available
 )
 {
     // Search specified directory for functionObject configuration files
+    for (const fileName& f : fileHandler().readDir(dir))
     {
-        fileNameList foFiles(fileHandler().readDir(dir));
-        for (const fileName& f : foFiles)
+        if (f.ext().empty())
         {
-            if (f.ext().empty())
-            {
-                foMap.insert(f);
-            }
+            available.insert(f);
         }
     }
 
     // Recurse into sub-directories
+    for (const fileName& d : fileHandler().readDir(dir, fileName::DIRECTORY))
     {
-        fileNameList foDirs(fileHandler().readDir(dir, fileName::DIRECTORY));
-        for (const fileName& d : foDirs)
-        {
-            listDir(dir/d, foMap);
-        }
+        listDir(dir/d, available);
     }
 }
 
 
 void Foam::functionObjectList::list()
 {
-    wordHashSet foMap;
+    wordHashSet available;
 
-    fileNameList etcDirs(findEtcDirs(functionObjectDictPath));
-
-    for (const fileName& d : etcDirs)
+    for (const fileName& d : findEtcDirs(functionObjectDictPath))
     {
-        listDir(d, foMap);
+        listDir(d, available);
     }
 
     Info<< nl
         << "Available configured functionObjects:"
-        << foMap.sortedToc()
+        << available.sortedToc()
         << nl;
 }
 
 
 Foam::fileName Foam::functionObjectList::findDict(const word& funcName)
 {
-    // First check if there is a functionObject dictionary file in the
-    // case system directory
-    fileName dictFile = stringOps::expand("$FOAM_CASE")/"system"/funcName;
+    // First check for functionObject dictionary file in globalCase system/
+
+    fileName dictFile = stringOps::expand("<system>")/funcName;
 
     if (isFile(dictFile))
     {
         return dictFile;
     }
 
-    fileNameList etcDirs(findEtcDirs(functionObjectDictPath));
-
-    for (const fileName& d : etcDirs)
+    for (const fileName& d : findEtcDirs(functionObjectDictPath))
     {
         dictFile = search(funcName, d);
         if (!dictFile.empty())
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 5d4597ed7c..4977098b13 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -102,7 +102,7 @@ class functionObjectList
 
         //- Search the specified directory for functionObject
         //- configuration files, add to the given map and recurse
-        static void listDir(const fileName& dir, wordHashSet& foMap);
+        static void listDir(const fileName& dir, wordHashSet& available);
 
         //- No copy construct
         functionObjectList(const functionObjectList&) = delete;
diff --git a/src/functionObjects/utilities/abort/abort.C b/src/functionObjects/utilities/abort/abort.C
index 560e4411f1..02d6a69112 100644
--- a/src/functionObjects/utilities/abort/abort.C
+++ b/src/functionObjects/utilities/abort/abort.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -99,11 +99,12 @@ Foam::functionObjects::abort::abort
 :
     functionObject(name),
     time_(runTime),
-    abortFile_("$FOAM_CASE/" + name),
+    abortFile_(time_.globalPath()/name),
     action_(Time::stopAtControls::saNextWrite),
     triggered_(false)
 {
-    abortFile_.expand();
+    abortFile_.clean();
+
     read(dict);
 
     // Cleanup old files from previous runs
@@ -123,6 +124,12 @@ bool Foam::functionObjects::abort::read(const dictionary& dict)
     if (dict.readIfPresent("file", abortFile_))
     {
         abortFile_.expand();
+
+        if (!abortFile_.isAbsolute())
+        {
+            abortFile_ = time_.globalPath()/abortFile_;
+            abortFile_.clean();
+         }
     }
 
     const auto oldAction = action_;
diff --git a/src/functionObjects/utilities/abort/abort.H b/src/functionObjects/utilities/abort/abort.H
index 10c1467557..c2c86aa564 100644
--- a/src/functionObjects/utilities/abort/abort.H
+++ b/src/functionObjects/utilities/abort/abort.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,7 @@ Group
     grpUtilitiesFunctionObjects
 
 Description
-    Watches for presence of the named file in the $FOAM_CASE directory
+    Watches for presence of the named file in the case directory
     and aborts the calculation if it is present.
 
     The presence of the abort file is only checked on the master process.
@@ -42,7 +42,7 @@ Description
     \table
         Property  | Description         | Required  | Default value
         type      | Type name: abort    | yes       |
-        file      | The abort filename  | no        | $FOAM_CASE/name
+        file      | The abort filename  | no        | \<case\>/name
         action    | Abort action        | no        | nextWrite
     \endtable
 
diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
index b65541cfe5..1104fabc3f 100644
--- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
+++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C
@@ -25,6 +25,7 @@ License
 
 #include "noiseModel.H"
 #include "functionObject.H"
+#include "stringOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -140,17 +141,15 @@ Foam::label Foam::noiseModel::findStartTimeIndex
 
 Foam::fileName Foam::noiseModel::baseFileDir(const label dataseti) const
 {
-    fileName baseDir("$FOAM_CASE");
-    word datasetName("input" + Foam::name(dataseti));
-    baseDir =
-        baseDir.expand()
-       /functionObject::outputPrefix
-       /"noise"
-       /outputPrefix_
-       /type()
-       /datasetName;
-
-    return baseDir;
+    return
+    (
+        stringOps::expand("<case>")    // ie, globalPath()
+      / functionObject::outputPrefix
+      / "noise"
+      / outputPrefix_
+      / type()
+      / ("input" + Foam::name(dataseti))
+    );
 }
 
 
diff --git a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
index c14632bc07..c5474aee3b 100644
--- a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
+++ b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
@@ -25,6 +25,7 @@ License
 
 #include "pointNoise.H"
 #include "noiseFFT.H"
+#include "stringOps.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -240,11 +241,13 @@ void pointNoise::calculate()
     {
         fileName fName = inputFileNames_[filei];
         fName.expand();
+
         if (!fName.isAbsolute())
         {
-            fName = "$FOAM_CASE"/fName;
-            fName.expand();
+            // ie, globalPath() / name
+            fName = stringOps::expand("<case>")/fName;
         }
+
         Function1Types::CSV<scalar> data("pressure", dict_, fName);
         processData(filei, data);
     }
diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
index 5bdd27e8f5..a60902aafb 100644
--- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
+++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
@@ -28,6 +28,7 @@ License
 #include "surfaceWriter.H"
 #include "noiseFFT.H"
 #include "graph.H"
+#include "stringOps.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -464,10 +465,11 @@ void surfaceNoise::calculate()
 
         if (!fName.isAbsolute())
         {
-            fName = "$FOAM_CASE"/fName;
+            // ie, globalPath() / name
+            fName = stringOps::expand("<case>")/fName;
         }
 
-        initialise(fName.expand());
+        initialise(fName);
 
         // Container for pressure time history data per face
         List<scalarField> pData;

From 50852b3392fc09a67a64c1f7216daa1d7ea27c29 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 15 Oct 2018 21:37:46 +0200
Subject: [PATCH 27/43] CONFIG: improve shell env handling of paths with spaces
 (#1007, #1008)

- foamCleanPath now only splits the environment variable on ':', which
  allows other directories with spaces or '(..)' etc to pass through
  without major issue.

- The filter arguments are split on whitespace, colons or semi-colons.
---
 bin/foamCleanPath              | 69 +++++++++++++++++-----------------
 etc/bashrc                     | 12 +++---
 etc/config.sh/ADIOS            |  2 +-
 etc/config.sh/ADIOS2           |  2 +-
 etc/config.sh/CGAL             |  2 +-
 etc/config.sh/FFTW             |  2 +-
 etc/config.sh/aliases          | 16 ++++----
 etc/config.sh/bash_completion  |  2 +-
 etc/config.sh/example/paraview |  4 +-
 etc/config.sh/functions        | 33 ++++++++--------
 etc/config.sh/gperftools       |  2 +-
 etc/config.sh/hypre            |  2 +-
 etc/config.sh/mpi              | 10 ++---
 etc/config.sh/paraview         | 18 +++++----
 etc/config.sh/petsc            |  2 +-
 etc/config.sh/settings         |  4 +-
 etc/config.sh/unset            | 12 +++---
 etc/config.sh/vtk              |  2 +-
 18 files changed, 101 insertions(+), 95 deletions(-)

diff --git a/bin/foamCleanPath b/bin/foamCleanPath
index 5d197ac0b1..f54575a8d9 100755
--- a/bin/foamCleanPath
+++ b/bin/foamCleanPath
@@ -14,20 +14,19 @@
 #     foamCleanPath
 #
 # Description
-#     Usage: foamCleanPath [OPTION] path [wildcard] .. [wildcard]
-#            foamCleanPath [OPTION] -env=name [wildcard1] .. [wildcardN]
+#     Usage: foamCleanPath [OPTION] path [filter] .. [filter]
+#            foamCleanPath [OPTION] -env=name [filter] .. [filter]
 #
 #     Prints its argument (which should be a ':' separated path)
 #     without the following:
 #         - duplicate elements
-#         - elements whose start matches a wildcard
+#         - elements matching the specified filter(s)
 #         - inaccessible directories (with the -strip option)
 #
 # Note
-#     - this routine fails when directories have embedded spaces
-#     - false matches possible if a wildcard contains '.' (sed regex)
-#     - the wildcards themselves can be written together and separated
-#       by colons or whitespace
+#     - false matches possible when the filter contains '.' (sed regex) etc.
+#     - a single composite filter can be passed in. This composite filter
+#       is assumed to be delimited by whitespace, colons or semi-colons.
 #
 # Examples for cleaning the path:
 #
@@ -38,9 +37,9 @@
 #       cleaned=$(foamCleanPath -env=PATH dir1:dir2) && PATH=$cleaned
 #
 #     - Using shell evaluation for the output
-#       eval $(foamCleanPath -sh=PATH "$PATH" dir1:dir2)
-#       eval $(foamCleanPath -sh=PATH -env=PATH dir1:dir2)
-#       eval $(foamCleanPath -sh-env=PATH dir1:dir2)
+#       eval $(foamCleanPath -sh=PATH $PATH" dir1:dir2)
+#       eval "$(foamCleanPath -sh=PATH -env=PATH dir1:dir2)"
+#       eval "$(foamCleanPath -sh-env=PATH dir1:dir2)"
 #
 #     - Similarly for c-shell
 #       eval `foamCleanPath -csh-env=PATH dir1:dir2`
@@ -48,28 +47,27 @@
 #------------------------------------------------------------------------------
 usage() {
     cat <<USAGE 1>&2
-Usage: foamCleanPath [OPTION] path [wildcard1] .. [wildcardN]]
-       foamCleanPath [OPTION] -env=name [wildcard1] .. [wildcardN]
-
+Usage: foamCleanPath [OPTION] path [filter] .. [filter]
+       foamCleanPath [OPTION] -env=name [filter] .. [filter]
 options:
   -csh=NAME         Produce 'setenv NAME ...' output for csh eval
   -sh=NAME          Produce 'NAME=...' output for sh eval
   -csh-env=NAME     As per -csh, with -env for initial content
   -sh-env=NAME      As per -sh,  with -env for initial content
   -env=NAME         Evaluate NAME to obtain initial content
-  -debug            print debug information to stderr
-  -strip            remove inaccessible directories
-  -verbose          report some progress (input, output, ...)
-  -help             print the usage
+  -debug            Print debug information to stderr
+  -strip            Remove inaccessible directories
+  -verbose          Report some progress (input, output, ...)
+  -help             Print the usage
 
 Prints its argument (which should be a ':' separated list) cleansed from
   * duplicate elements
-  * elements whose start matches one of the wildcard(s)
+  * elements whose start matches one of the filters
   * inaccessible directories (the -strip option)
 
 Exit status
     0  on success
-    1  for miscellaneous errors.
+    1  general error
     2  initial value of 'path' is empty
 
 USAGE
@@ -169,19 +167,20 @@ else
     printDebug() { true; }      # No-op
 fi
 
-# Check directory existence (optional)
+# Optional test for directory existence
 if [ -n "$optStrip" ]
 then
-    isDir() { test -d "$1"; }   # Check for directory
+    isDir() { test -d "$1"; }   # Check for directory existence
 else
-    isDir() { true; }           # No check (always true)
+    isDir() { test -n "$1"; }   # Only check for non-zero string
 fi
 
-# The "wildcard1 ... wildcardN" may have been passed as a single parameter
-# or may contain ':' separators
+# The "filter ... filterN" may have been passed as a single parameter
+# or may contain ':' separators.
+# Currently (OCT-2018) also accept split on whitespace too.
 
 oldIFS="$IFS"       # Preserve initial IFS
-IFS=':; '           # Split on colon, whitespace (semi-colon for good measure)
+IFS=':; '           # Split on colon, semicolon, whitespace
 set -- $*
 
 if [ -n "$optVerbose" ]
@@ -192,22 +191,20 @@ fi
 
 printDebug "input>$dirList<"
 
-# Strip out wildcards via sed. Path and wildcard cannot contain '?'.
-for wildcard
+# Apply filters via sed. Path and filter cannot contain '?'.
+for filter
 do
-    if [ -n "$wildcard" ]
+    if [ -n "$filter" ]
     then
-        printDebug "remove>$wildcard<"
-        dirList=$(echo "$dirList:" | sed -e "s?${wildcard}[^:]*:??g")
+        printDebug "remove>$filter<"
+        dirList=$(echo "$dirList:" | sed -e "s?${filter}[^:]*:??g")
     fi
 done
 printDebug "intermediate>$dirList<"
 
-IFS=':; '           # Split on colon, whitespace (semi-colon for good measure)
+IFS=':'             # Split on colon. No split on whitespace.
 set -- $dirList
 
-IFS="$oldIFS"       # Restore initial IFS
-
 # Rebuild the list
 unset dirList
 for dir
@@ -227,12 +224,14 @@ do
     fi
 done
 
+IFS="$oldIFS"       # Restore initial IFS
+
 printDebug "output>$dirList<"
 if [ -n "$optVerbose" ]
 then
-    echo "output: $dirList" 1>&2
+    echo "output: \"$dirList\"" 1>&2
 fi
 
-echo "$shellOutput$dirList"
+echo "$shellOutput\"$dirList\""
 
 #------------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index f076066796..7340532d7e 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -47,10 +47,10 @@ export WM_PROJECT_VERSION=plus
 #    set one of the fallback values to an appropriate path.
 # --
 rc="${BASH_SOURCE:-${ZSH_NAME:+$0}}"
-[ -n "$rc" ] && FOAM_INST_DIR=$(\cd $(dirname $rc)/../.. && \pwd -L) || \
-FOAM_INST_DIR=$HOME/$WM_PROJECT
-# FOAM_INST_DIR=/opt/$WM_PROJECT
-# FOAM_INST_DIR=/usr/local/$WM_PROJECT
+[ -n "$rc" ] && FOAM_INST_DIR="$(\cd $(dirname $rc)/../.. && \pwd -L)" || \
+FOAM_INST_DIR="$HOME/$WM_PROJECT"
+# FOAM_INST_DIR="/opt/$WM_PROJECT"
+# FOAM_INST_DIR="/usr/local/$WM_PROJECT"
 #
 # END OF (NORMAL) USER EDITABLE PART
 ################################################################################
@@ -153,7 +153,7 @@ then
     unset FOAM_SETTINGS
 else
     export FOAM_SETTINGS
-    _foamEval $@
+    _foamEval "$@"
 fi
 
 # Clean standard environment variables (PATH, MANPATH, LD_LIBRARY_PATH)
@@ -170,7 +170,7 @@ _foamEtc -config  settings
 # Setup for third-party packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 _foamEtc -config  mpi
-_foamEtc -config  paraview -- $@        # Pass through for evaluation
+_foamEtc -config  paraview -- "$@"  # Pass through for evaluation
 _foamEtc -config  vtk
 _foamEtc -config  ensight
 _foamEtc -config  gperftools
diff --git a/etc/config.sh/ADIOS b/etc/config.sh/ADIOS
index 54534209dd..df1fec50e2 100644
--- a/etc/config.sh/ADIOS
+++ b/etc/config.sh/ADIOS
@@ -37,7 +37,7 @@ export ADIOS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
 then
     echo "Using adios ($adios_version)  ->  $ADIOS_ARCH_PATH" 1>&2
 fi
diff --git a/etc/config.sh/ADIOS2 b/etc/config.sh/ADIOS2
index b77593e9a5..3719333378 100644
--- a/etc/config.sh/ADIOS2
+++ b/etc/config.sh/ADIOS2
@@ -25,7 +25,7 @@ export ADIOS2_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adio
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
 then
     echo "Using adios ($adios2_version)  ->  $ADIOS2_ARCH_PATH" 1>&2
 fi
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 9acf55892b..1e5558017b 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -49,7 +49,7 @@ export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_v
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
 then
     echo "Using boost ($boost_version)  ->  $BOOST_ARCH_PATH" 1>&2
     echo "Using CGAL ($cgal_version)  ->  $CGAL_ARCH_PATH" 1>&2
diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW
index f20d2b5421..f273b64267 100644
--- a/etc/config.sh/FFTW
+++ b/etc/config.sh/FFTW
@@ -38,7 +38,7 @@ export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_v
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
 then
     echo "Using fftw ($fftw_version)  ->  $FFTW_ARCH_PATH" 1>&2
 fi
diff --git a/etc/config.sh/aliases b/etc/config.sh/aliases
index 2a5c579064..a0a54de311 100644
--- a/etc/config.sh/aliases
+++ b/etc/config.sh/aliases
@@ -58,10 +58,10 @@ alias uutil='cd $WM_PROJECT_USER_DIR/applications/utilities'
 unset -f wmRefresh 2>/dev/null
 wmRefresh()
 {
-    local projectDir=$WM_PROJECT_DIR
-    local foamSettings=$FOAM_SETTINGS
+    local projectDir="$WM_PROJECT_DIR"
+    local foamSettings="$FOAM_SETTINGS"
     wmUnset
-    . $projectDir/etc/bashrc $foamSettings
+    . "$projectDir/etc/bashrc" "$foamSettings"
 }
 
 
@@ -73,13 +73,13 @@ foamVersion()
     if [ "$#" -gt 0 ]
     then
         local dir="${WM_PROJECT_DIR%/*}"    # Parent directory
-        local ver=$1
+        local ver="$1"
         shift
 
         if [ -f "$dir/OpenFOAM-$ver/etc/bashrc" ]
         then
             wmUnset
-            . $dir/OpenFOAM-$ver/etc/bashrc
+            . "$dir/OpenFOAM-$ver/etc/bashrc"
             foam
             echo "Changed to OpenFOAM-$WM_PROJECT_VERSION" 1>&2
         else
@@ -104,7 +104,7 @@ foamVersion()
 unset -f foamPV 2>/dev/null
 foamPV()
 {
-    . $WM_PROJECT_DIR/etc/config.sh/paraview "${@+ParaView_VERSION=$@}"
+    . "$WM_PROJECT_DIR/etc/config.sh/paraview" "${@+ParaView_VERSION=$@}"
     local pvdir="${ParaView_DIR##*/}"
     echo "${pvdir:-ParaView_DIR not set}" 1>&2
 }
@@ -117,13 +117,13 @@ foamPwd()
 {
     if [ -d "$WM_PROJECT_DIR" ]
     then
-        echo $PWD | sed \
+        echo "$PWD" | sed \
         -e "s#^${FOAM_RUN}#\$FOAM_RUN#;" \
         -e "s#^${WM_PROJECT_DIR}#\$WM_PROJECT_DIR#;" \
         -e "s#^${WM_PROJECT_USER_DIR}#\$WM_PROJECT_USER_DIR#;" \
         -e "s#^${HOME}#\$HOME#";
     else
-        echo $PWD | sed -e "s#^${HOME}#\$HOME#;"
+        echo "$PWD" | sed -e "s#^${HOME}#\$HOME#;"
     fi
 }
 
diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion
index d2ea0b0315..98c3556b20 100644
--- a/etc/config.sh/bash_completion
+++ b/etc/config.sh/bash_completion
@@ -37,7 +37,7 @@ then
     foamOldDirs="$(complete 2>/dev/null | sed -ne 's/^.*-F _of_.* \(..*\)$/\1/p')"
     for cleaned in $foamOldDirs
     do
-        complete -r $cleaned 2>/dev/null
+        complete -r "$cleaned" 2>/dev/null
     done
 fi
 
diff --git a/etc/config.sh/example/paraview b/etc/config.sh/example/paraview
index fb91cc1699..ced794a3f3 100644
--- a/etc/config.sh/example/paraview
+++ b/etc/config.sh/example/paraview
@@ -27,6 +27,8 @@ pv=5.5.0
 pv=5.5.0-mpipy
 qt=qt-5.9.0
 
-eval $(foamEtcFile -sh -config -mode=o paraview -- ParaView_VERSION=$pv ParaView_QT=$qt)
+eval \
+    "$(foamEtcFile -sh -config -mode=o paraview -- \
+    ParaView_VERSION=$pv ParaView_QT=$qt)"
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/functions b/etc/config.sh/functions
index 39afd27bd8..cd4f9d2550 100644
--- a/etc/config.sh/functions
+++ b/etc/config.sh/functions
@@ -28,22 +28,22 @@ then
     WM_SHELL_FUNCTIONS=loaded
 
     # Cleaning environment variables
-    foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
+    foamClean="$WM_PROJECT_DIR/bin/foamCleanPath"
 
     # Cleaning environment variables
     unset -f _foamClean 2>/dev/null
     _foamClean()
     {
-         foamVar_name=$1
+         foamVar_name="$1"
          shift
-         eval $($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=$foamVar_name "$@")
-         unset foamVar_name
+         eval "$($foamClean -sh-env=$foamVar_name $@)"
+         unset "foamVar_name"
     }
 
     # Source an etc file, possibly with some verbosity
     # - use eval to avoid intermediate variables (ksh doesn't have 'local')
     unset -f _foamEtc 2>/dev/null
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
     then
         _foamEtc()
         {
@@ -60,21 +60,21 @@ then
     unset -f _foamAddPath 2>/dev/null
     _foamAddPath()
     {
-        [ -n "$1" ] && export PATH=$1:$PATH
+        [ -n "$1" ] && export PATH="$1:$PATH"
     }
 
     # Prepend MANPATH
     unset -f _foamAddMan 2>/dev/null
     _foamAddMan()
     {
-        [ -n "$1" ] && export MANPATH=$1:$MANPATH
+        [ -n "$1" ] && export MANPATH="$1:$MANPATH"
     }
 
     # Prepend LD_LIBRARY_PATH
     unset -f _foamAddLib 2>/dev/null
     _foamAddLib()
     {
-        [ -n "$1" ] && export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+        [ -n "$1" ] && export LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH"
     }
 
     # Prepend to LD_LIBRARY_PATH with additional checking
@@ -106,7 +106,7 @@ then
             do
                 if [ -d "$foamVar_prefix/$foamVar_end" ]
                 then
-                    export LD_LIBRARY_PATH=$foamVar_prefix/$foamVar_end:$LD_LIBRARY_PATH
+                    export LD_LIBRARY_PATH="$foamVar_prefix/$foamVar_end:$LD_LIBRARY_PATH"
                     unset foamVar_prefix foamVar_end
                     return 0
                 fi
@@ -119,10 +119,10 @@ then
         then
             case "$foamVar_end" in
             /*)     # An absolute path
-                export LD_LIBRARY_PATH=$foamVar_end:$LD_LIBRARY_PATH
+                export LD_LIBRARY_PATH="$foamVar_end:$LD_LIBRARY_PATH"
                 ;;
             (*)     # Relative to prefix
-                export LD_LIBRARY_PATH=$foamVar_prefix/$foamVar_end:$LD_LIBRARY_PATH
+                export LD_LIBRARY_PATH="$foamVar_prefix/$foamVar_end:$LD_LIBRARY_PATH"
                 ;;
             esac
             unset foamVar_prefix foamVar_end
@@ -143,7 +143,7 @@ then
         # Prepend DYLD_LIBRARY_PATH
         _foamAddLib()
         {
-            [ -n "$1" ] && export DYLD_LIBRARY_PATH=$1:$DYLD_LIBRARY_PATH
+            [ -n "$1" ] && export DYLD_LIBRARY_PATH="$1:$DYLD_LIBRARY_PATH"
         }
 
         # Prepend to DYLD_LIBRARY_PATH with additional checking
@@ -168,19 +168,22 @@ then
                 ;;
             *=)
                 # name=       -> unset name
-                [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "unset ${1%=}" 1>&2
+                [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ] \
+                    && echo "unset ${1%=}" 1>&2
                 eval "unset ${1%=}"
                 ;;
             *=*)
                 # name=value  -> export name=value
-                [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "export $1" 1>&2
+                [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ] \
+                    && echo "export $1" 1>&2
                 eval "export $1"
                 ;;
             *)
                 # Filename: source it
                 if [ -f "$1" ]
                 then
-                    [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Using: $1" 1>&2
+                    [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ] \
+                        && echo "Using: $1" 1>&2
                     . "$1"
                 else
                     _foamEtc -silent "$1"
diff --git a/etc/config.sh/gperftools b/etc/config.sh/gperftools
index f23ee42bbb..e1d2a01a1c 100644
--- a/etc/config.sh/gperftools
+++ b/etc/config.sh/gperftools
@@ -40,7 +40,7 @@ GPERFTOOLS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$gperfto
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
 then
     echo "Using gperftools ($gperftools_version)  ->  $GPERFTOOLS_ARCH_PATH" 1>&2
 fi
diff --git a/etc/config.sh/hypre b/etc/config.sh/hypre
index 79fc3a316e..7850728e41 100644
--- a/etc/config.sh/hypre
+++ b/etc/config.sh/hypre
@@ -31,7 +31,7 @@ export HYPRE_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRE
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
 then
     echo "Using hypre ($hypre_version)  ->  $HYPRE_ARCH_PATH" 1>&2
 fi
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 4feee87312..bba158bc4e 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -68,7 +68,7 @@ OPENMPI)
     # Inform openmpi where to find its install directory
     export OPAL_PREFIX=$MPI_ARCH_PATH
 
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
     then
         echo "Using $WM_MPLIB" 1>&2
         echo "    FOAM_MPI    : $FOAM_MPI" 1>&2
@@ -168,7 +168,7 @@ CRAY-MPICH)
     export FOAM_MPI=cray-mpich
     export MPI_ARCH_PATH=$MPICH_DIR
 
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
     then
         echo "Using $WM_MPLIB" 1>&2
         echo "    FOAM_MPI  : $FOAM_MPI" 1>&2
@@ -247,7 +247,7 @@ SGIMPI)
         echo "    Currently using '$MPI_ARCH_PATH'" 1>&2
     }
 
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
     then
         echo "Using $WM_MPLIB" 1>&2
         echo "    FOAM_MPI : $FOAM_MPI" 1>&2
@@ -269,7 +269,7 @@ INTELMPI)
         # If subdirectory is version number only, prefix with 'impi-'
         case "$FOAM_MPI" in ([0-9]*) FOAM_MPI="impi-$FOAM_MPI";; esac
 
-        if [ "$FOAM_VERBOSE" -a "$PS1" ]
+        if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
         then
             echo "Using $WM_MPLIB" 1>&2
             echo "    FOAM_MPI   : $FOAM_MPI" 1>&2
@@ -283,7 +283,7 @@ INTELMPI)
         # If subdirectory is version number only, prefix with 'impi-'
         case "$FOAM_MPI" in ([0-9]*) FOAM_MPI="impi-$FOAM_MPI";; esac
 
-        if [ "$FOAM_VERBOSE" -a "$PS1" ]
+        if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
         then
             echo "Using $WM_MPLIB" 1>&2
             echo "    FOAM_MPI : $FOAM_MPI" 1>&2
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 41c8c8e20c..591febeb8b 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -58,18 +58,20 @@ pv_api=auto             # Either auto or pair of (major.minor) digits
 archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
 
 # Clean PATH and LD_LIBRARY_PATH
-eval $($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=PATH \
-    "$ParaView_DIR $archDir/ParaView- $archDir/qt- $archDir/cmake-")
+eval \
+    "$($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=PATH \
+    $ParaView_DIR $archDir/ParaView- $archDir/qt- $archDir/cmake-)"
 
-eval $($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=LD_LIBRARY_PATH \
-    "$ParaView_DIR $archDir/ParaView- $archDir/qt-")
+eval \
+    "$($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=LD_LIBRARY_PATH \
+    $ParaView_DIR $archDir/ParaView- $archDir/qt-)"
 
 # ThirdParty cmake
-cmake=$archDir/$cmake_version
-if [ -r $cmake/bin/cmake ]
+cmake="$archDir/$cmake_version"
+if [ -r "$cmake/bin/cmake" ]
 then
     # _foamAddPath not available when foamPV function is used
-    PATH=$cmake/bin:$PATH
+    PATH="$cmake/bin:$PATH"
 fi
 
 # Evaluate command-line parameters for ParaView
@@ -159,7 +161,7 @@ then
             ;;
         esac
 
-        if [ "$FOAM_VERBOSE" -a "$PS1" ]
+        if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
         then
             echo "Using paraview"
             echo "    ParaView_DIR         : $ParaView_DIR"
diff --git a/etc/config.sh/petsc b/etc/config.sh/petsc
index 25448b7977..937d4ff508 100644
--- a/etc/config.sh/petsc
+++ b/etc/config.sh/petsc
@@ -31,7 +31,7 @@ export PETSC_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRE
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
 then
     echo "Using petsc ($petsc_version)  ->  $PETSC_ARCH_PATH" 1>&2
 fi
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index 6b51ae3b05..c03bcdb230 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -273,7 +273,7 @@ GCC_NOT_FOUND
 
     _foamAddLibAuto $mpcDir
 
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
     then
         echo "Using ThirdParty compiler"
         echo "    ${gccDir##*/}  (${gmpDir##*/}  $${mpfrDir##*/}  ${mpcDir##*/})"
@@ -299,7 +299,7 @@ CLANG_NOT_FOUND
     _foamAddPath    $clangDir/bin
     _foamAddLib     $clangDir/lib  # For things like libomp (openmp) etc
 
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
     then
         echo "Using ThirdParty compiler"
         echo "    ${clangDir##*/}"
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 871afe1ecd..4ebfe76185 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -92,7 +92,7 @@ unset MPI_ARCH_PATH
 unset MPI_BUFFER_SIZE
 
 # Undefine OPAL_PREFIX if set to one of the paths on foamOldDirs
-if [ -z "$($foamClean -env=OPAL_PREFIX "$foamOldDirs")" ]
+if [ -n "$foamClean" ] && [ -z "$($foamClean -env=OPAL_PREFIX $foamOldDirs)" ]
 then
     unset OPAL_PREFIX
 fi
@@ -108,7 +108,7 @@ unset PV_PLUGIN_PATH
 unset VTK_DIR
 
 # Undefine Qt5_DIR if set to one of the paths on foamOldDirs
-if [ -z "$($foamClean -env=Qt5_DIR "$foamOldDirs")" ]
+if [ -n "$foamClean" ] && [ -z "$($foamClean -env=Qt5_DIR $foamOldDirs)" ]
 then
     unset Qt5_DIR
 fi
@@ -137,9 +137,9 @@ unset SCOTCH_ARCH_PATH
 
 if [ -n "$foamClean" ]
 then
-    eval $($foamClean -sh-env=PATH "$foamOldDirs")
-    eval $($foamClean -sh-env=LD_LIBRARY_PATH "$foamOldDirs")
-    eval $($foamClean -sh-env=MANPATH "$foamOldDirs")
+    eval "$($foamClean -sh-env=PATH $foamOldDirs)"
+    eval "$($foamClean -sh-env=LD_LIBRARY_PATH $foamOldDirs)"
+    eval "$($foamClean -sh-env=MANPATH $foamOldDirs)"
 fi
 
 [ -n "$LD_LIBRARY_PATH" ] || unset LD_LIBRARY_PATH
@@ -189,7 +189,7 @@ unset -f foamPV     2>/dev/null
 foamOldDirs="$(complete 2>/dev/null | sed -ne 's/^.*-F _of_.* \(..*\)$/\1/p')"
 for cleaned in $foamOldDirs
 do
-    complete -r $cleaned 2>/dev/null
+    complete -r "$cleaned" 2>/dev/null
 done
 
 # Completion functions
diff --git a/etc/config.sh/vtk b/etc/config.sh/vtk
index 6e4df894fa..242407e977 100644
--- a/etc/config.sh/vtk
+++ b/etc/config.sh/vtk
@@ -39,7 +39,7 @@ export MESA_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_v
 
 # END OF (NORMAL) USER EDITABLE PART
 #------------------------------------------------------------------------------
-if [ "$FOAM_VERBOSE" -a "$PS1" ]
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
 then
     echo "Using vtk  ($vtk_version)  ->  $VTK_DIR" 1>&2
     echo "Using mesa ($mesa_version)  ->  $MESA_ARCH_PATH" 1>&2

From 7864672c78d9606fd8326a80d993437855b3d19f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 Oct 2018 01:30:44 +0200
Subject: [PATCH 28/43] ENH: make cwd() behaviour user-adjustable (issue #1007)

- with the 'cwd' optimization switch it is possible to select the
  preferred behaviour for the cwd() function.

  A value of 0 causes cwd() to return the physical directory,
  which is what getcwd() and `pwd -P` return.
  Until now, this was always the standard behaviour.

  With a value of 1, cwd() instead returns the logical directory,
  which what $PWD contains and `pwd -L` returns.
  If any of the sanity checks fail (eg, PWD points to something other
  than ".", etc), a warning is emitted and the physical cwd() is
  returned instead.

  Apart from the optical difference in the output, this additional
  control helps workaround file systems with whitespace or other
  characters in the directory that normally cause OpenFOAM to balk.
  Using a cleaner symlink elsewhere should skirt this issue.

  Eg,
      cd $HOME
      ln -s "/mounted volume/user/workdir"  workdir
      cd workdir
      # start working with OpenFOAM
---
 applications/test/POSIX/Test-POSIX.C |  6 +-
 etc/controlDict                      |  3 +
 src/OSspecific/POSIX/POSIX.C         | 91 +++++++++++++++++++++++++++-
 src/OSspecific/POSIX/fileStat.C      | 19 ++++--
 src/OSspecific/POSIX/fileStat.H      | 28 ++++++---
 src/OpenFOAM/include/OSspecific.H    | 10 ++-
 6 files changed, 140 insertions(+), 17 deletions(-)

diff --git a/applications/test/POSIX/Test-POSIX.C b/applications/test/POSIX/Test-POSIX.C
index e38899ec92..ad7639825f 100644
--- a/applications/test/POSIX/Test-POSIX.C
+++ b/applications/test/POSIX/Test-POSIX.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,6 +37,10 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    Info<<"cwd() " << cwd() << nl;
+    Info<<"cwd(-P) " << cwd(false) << nl;
+    Info<<"cwd(-L) " << cwd(true) << nl;
+
     Info<<"rmDir" << nl;
     rmDir("hmm");
 
diff --git a/etc/controlDict b/etc/controlDict
index 950e5adc2b..c5b0c7cd0a 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -69,6 +69,9 @@ InfoSwitches
 
 OptimisationSwitches
 {
+    // Use physical (0) or logical (1) value for the cwd.
+    cwd     0;
+
     // On NFS mounted file system: maximum wait for files to appear/get
     // updated. Set to 0 on distributed case.
     fileModificationSkew 10;
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 1953935f3c..05e134d9c4 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -74,6 +74,8 @@ namespace Foam
     defineTypeNameAndDebug(POSIX, 0);
 }
 
+static bool cwdPreference_(Foam::debug::optimisationSwitch("cwd", 0));
+
 
 // * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
 
@@ -280,7 +282,11 @@ Foam::fileName Foam::home(const std::string& userName)
 }
 
 
-Foam::fileName Foam::cwd()
+namespace Foam
+{
+
+//- The physical current working directory path name (pwd -P).
+static Foam::fileName cwd_P()
 {
     label pathLengthLimit = POSIX::pathLengthChunk;
     List<char> path(pathLengthLimit);
@@ -307,7 +313,7 @@ Foam::fileName Foam::cwd()
                     << exit(FatalError);
             }
 
-            path.setSize(pathLengthLimit);
+            path.resize(pathLengthLimit);
         }
         else
         {
@@ -319,7 +325,86 @@ Foam::fileName Foam::cwd()
         << "Couldn't get the current working directory"
         << exit(FatalError);
 
-    return fileName::null;
+    return fileName();
+}
+
+
+//- The logical current working directory path name.
+// From the PWD environment, same as pwd -L.
+static Foam::fileName cwd_L()
+{
+    const char* env = ::getenv("PWD");
+
+    // Basic check
+    if (!env || env[0] != '/')
+    {
+        WarningInFunction
+            << "PWD is invalid - reverting to physical description"
+            << nl;
+
+        return cwd_P();
+    }
+
+    fileName dir(env);
+
+    // Check for "/."
+    for
+    (
+        std::string::size_type pos = 0;
+        std::string::npos != (pos = dir.find("/.", pos));
+        /*nil*/
+    )
+    {
+        pos += 2;
+
+        if
+        (
+            // Ends in "/." or has "/./"
+            !dir[pos] || dir[pos] == '/'
+
+            // Ends in "/.." or has "/../"
+         || (dir[pos] == '.' && (!dir[pos+1] || dir[pos+1] == '/'))
+        )
+        {
+            WarningInFunction
+                << "PWD contains /. or /.. - reverting to physical description"
+                << nl;
+
+            return cwd_P();
+        }
+    }
+
+    // Finally, verify that PWD actually corresponds to the "." directory
+    if (!fileStat(dir, true).sameINode(fileStat(".", true)))
+    {
+        WarningInFunction
+            << "PWD is not the cwd() - reverting to physical description"
+            << nl;
+
+        return cwd_P();
+    }
+
+
+    return fileName(dir);
+}
+
+} // End namespace Foam
+
+
+Foam::fileName Foam::cwd()
+{
+    return cwd(cwdPreference_);
+}
+
+
+Foam::fileName Foam::cwd(bool logical)
+{
+    if (logical)
+    {
+        return cwd_L();
+    }
+
+    return cwd_P();
 }
 
 
diff --git a/src/OSspecific/POSIX/fileStat.C b/src/OSspecific/POSIX/fileStat.C
index 0d50a72186..706640a1a0 100644
--- a/src/OSspecific/POSIX/fileStat.C
+++ b/src/OSspecific/POSIX/fileStat.C
@@ -43,14 +43,14 @@ Foam::fileStat::fileStat()
 
 Foam::fileStat::fileStat
 (
-    const fileName& fName,
+    const char* fName,
     const bool followLink,
     const unsigned int maxTime
 )
 :
     isValid_(false)
 {
-    if (fName.empty())
+    if (!fName || !fName[0])
     {
         return;
     }
@@ -64,11 +64,11 @@ Foam::fileStat::fileStat
     {
         if (followLink)
         {
-            locIsValid = (::stat(fName.c_str(), &status_) == 0);
+            locIsValid = (::stat(fName, &status_) == 0);
         }
         else
         {
-            locIsValid = (::lstat(fName.c_str(), &status_) == 0);
+            locIsValid = (::lstat(fName, &status_) == 0);
         }
     }
 
@@ -77,6 +77,17 @@ Foam::fileStat::fileStat
 }
 
 
+Foam::fileStat::fileStat
+(
+    const fileName& fName,
+    const bool followLink,
+    const unsigned int maxTime
+)
+:
+    fileStat(fName.c_str(), followLink, maxTime)
+{}
+
+
 Foam::fileStat::fileStat(Istream& is)
 {
     is >> *this;
diff --git a/src/OSspecific/POSIX/fileStat.H b/src/OSspecific/POSIX/fileStat.H
index 62a61afbbf..e1a997b205 100644
--- a/src/OSspecific/POSIX/fileStat.H
+++ b/src/OSspecific/POSIX/fileStat.H
@@ -28,7 +28,7 @@ Description
     Wrapper for stat() and lstat() system calls.
 
 Warning
-    on Linux (an maybe on others) a stat() of an nfs mounted (remote)
+    On Linux (an maybe on others) a stat() of an nfs mounted (remote)
     file does never timeout and cannot be interrupted!
     So e.g. Foam::ping first and hope nfs is running.
 
@@ -79,16 +79,28 @@ public:
         fileStat();
 
         //- Construct from components.
-        // \param fName \n
-        // The file name or directory name to stat.
         //
-        // \param followLink \n
-        // If it is a link, get the status of the source file/directory.
+        //  \param fName The file name or directory name to stat.
+        //  \param followLink If it is a link, get the status of the source
+        //      file/directory.
+        //  \param maxTime The timeout value.
         //
-        // \param maxTime \n
-        // The timeout value.
+        //  \note An empty filename is a no-op.
+        fileStat
+        (
+            const char* fName,
+            const bool followLink = true,
+            const unsigned int maxTime = 0
+        );
+
+        //- Construct from components.
         //
-        // \note an empty filename is a no-op.
+        //  \param fName The file name or directory name to stat.
+        //  \param followLink If it is a link, get the status of the source
+        //      file/directory.
+        //  \param maxTime The timeout value.
+        //
+        //  \note An empty filename is a no-op.
         fileStat
         (
             const fileName& fName,
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index 85c84c1ae5..d8535cf8e9 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -92,9 +92,17 @@ fileName home();
 //- Return home directory path name for a particular user
 fileName home(const std::string& userName);
 
-//- Return current working directory path name
+//- The physical or logical current working directory path name.
+//  The behaviour is controlled by the \c cwd optimisation Switch
+//  A value of 0 corresponds to the physical value, which is identical
+//  to what getcwd and pwd -P would deliver.
+//  A value of 1 corresponds to the logical value, which corresponds
+//  to the PWD environment value and to what pwd -L would deliver.
 fileName cwd();
 
+//- The physical or logical current working directory path name.
+fileName cwd(bool logical);
+
 //- Change current directory to the one specified and return true on success.
 //  Using an empty name is a no-op and always returns false.
 bool chDir(const fileName& dir);

From 873b2f0a9f85770e885d1e0e27ea45c9cfe6fb90 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 Oct 2018 09:58:49 +0200
Subject: [PATCH 29/43] STYLE: use explicit dictionary access for
 dictionaryEntry

- clarifies the meanings of get<T> etc, avoids later ambiguities.

ENH: simplify phaseProperties construction, add input checks
---
 .../phaseModel/phaseModel.H                   |  2 -
 .../meshes/meshShapes/cellModel/cellModelIO.C |  5 +-
 .../motionSolvers/motionSolver/motionSolver.C |  7 +-
 .../motionSolvers/motionSolver/motionSolver.H |  4 +-
 .../fieldAverageItem/fieldAverageItemIO.C     | 21 +++---
 .../phaseProperties/phaseProperties.C         | 43 +++++--------
 .../phaseProperties/phaseProperties.H         |  6 +-
 .../phaseProperties/phasePropertiesIO.C       | 64 ++++++-------------
 .../LocalInteraction/patchInteractionData.C   | 12 ++--
 9 files changed, 63 insertions(+), 101 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
index 253b7fb07a..53a429f7ca 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
@@ -39,8 +39,6 @@ SourceFiles
 
 #include "rhoThermo.H"
 #include "volFields.H"
-#include "dictionaryEntry.H"
-
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
index 08609fb973..f00527eec7 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelIO.C
@@ -30,9 +30,10 @@ License
 
 Foam::cellModel::cellModel(Istream& is)
 {
-    dictionaryEntry dict(dictionary::null, is);
+    const dictionaryEntry dictEntry(dictionary::null, is);
+    const dictionary& dict = dictEntry.dict();
 
-    name_ = dict.keyword();
+    name_ = dictEntry.keyword();
     dict.readEntry("index", index_);
     dict.readEntry("numberOfPoints", nPoints_);
     dict.readEntry("faces", faces_);
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index 884736f729..b12c08b617 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -26,6 +26,7 @@ License
 #include "motionSolver.H"
 #include "Time.H"
 #include "polyMesh.H"
+#include "dictionaryEntry.H"
 #include "dlLibraryTable.H"
 #include "twoDPointCorrector.H"
 
@@ -172,7 +173,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::iNew::operator()
     Istream& is
 ) const
 {
-    dictionaryEntry dict(dictionary::null, is);
+    dictionaryEntry dictEntry(dictionary::null, is);
 
     return motionSolver::New
     (
@@ -181,11 +182,11 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::iNew::operator()
         (
             IOobject
             (
-                dict.name() + ":meshSolver",
+                dictEntry.name() + ":meshSolver",
                 mesh_.time().constant(),
                 mesh_
             ),
-            dict
+            dictEntry
         )
     );
 }
diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
index 7397ee064f..500f487747 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.H
@@ -40,15 +40,13 @@ SourceFiles
 
 #include "Time.H"
 #include "polyMesh.H"
-#include "dictionaryEntry.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward class declarations
-class polyMesh;
+// Forward declarations
 class mapPolyMesh;
 
 /*---------------------------------------------------------------------------*\
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
index f7c050a164..80d11c3fdb 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemIO.C
@@ -62,19 +62,20 @@ Foam::Istream& Foam::functionObjects::operator>>
 {
     is.check(FUNCTION_NAME);
 
-    const dictionaryEntry entry(dictionary::null, is);
+    const dictionaryEntry dictEntry(dictionary::null, is);
+    const dictionary& dict = dictEntry.dict();
 
     faItem.active_ = false;
-    faItem.fieldName_ = entry.keyword();
-    faItem.mean_ = entry.get<bool>("mean");
-    faItem.prime2Mean_ = entry.get<bool>("prime2Mean");
-    faItem.base_ = faItem.baseTypeNames_.lookup("base", entry);
-    faItem.window_ = entry.lookupOrDefault<scalar>("window", -1.0);
+    faItem.fieldName_ = dictEntry.keyword();
+    faItem.mean_ = dict.get<bool>("mean");
+    faItem.prime2Mean_ = dict.get<bool>("prime2Mean");
+    faItem.base_ = faItem.baseTypeNames_.lookup("base", dict);
+    faItem.window_ = dict.lookupOrDefault<scalar>("window", -1.0);
 
     if (faItem.window_ > 0)
     {
         faItem.windowType_ =
-            faItem.windowTypeNames_.lookup("windowType", entry);
+            faItem.windowTypeNames_.lookup("windowType", dict);
 
         if (faItem.windowType_ != fieldAverageItem::windowType::NONE)
         {
@@ -84,17 +85,17 @@ Foam::Istream& Foam::functionObjects::operator>>
              && label(faItem.window_) < 1
             )
             {
-                FatalIOErrorInFunction(entry)
+                FatalIOErrorInFunction(dictEntry)
                     << "Window must be 1 or more for base type "
                     << faItem.baseTypeNames_[fieldAverageItem::baseType::ITER]
                     << exit(FatalIOError);
             }
 
-            faItem.windowName_ = entry.lookupOrDefault<word>("windowName", "");
+            faItem.windowName_ = dict.lookupOrDefault<word>("windowName", "");
 
             if (faItem.windowType_ == fieldAverageItem::windowType::EXACT)
             {
-                faItem.allowRestart_ = entry.get<bool>("allowRestart");
+                faItem.allowRestart_ = dict.get<bool>("allowRestart");
 
                 if (!faItem.allowRestart_)
                 {
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 27f74158e2..6ed39e470c 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -124,18 +124,18 @@ void Foam::phaseProperties::setCarrierIds
 
 void Foam::phaseProperties::checkTotalMassFraction() const
 {
-    scalar total = 0.0;
-    forAll(Y_, speciei)
+    scalar total = 0;
+    for (const scalar& val : Y_)
     {
-        total += Y_[speciei];
+        total += val;
     }
 
-    if (Y_.size() != 0 && mag(total - 1.0) > SMALL)
+    if (Y_.size() && mag(total - 1.0) > SMALL)
     {
         FatalErrorInFunction
             << "Specie fractions must total to unity for phase "
             << phaseTypeNames[phase_] << nl
-            << "Species: " << nl << names_ << nl
+            << "Species: " << nl << flatOutput(names_) << nl
             << exit(FatalError);
     }
 }
@@ -143,22 +143,21 @@ void Foam::phaseProperties::checkTotalMassFraction() const
 
 Foam::word Foam::phaseProperties::phaseToStateLabel(const phaseType pt) const
 {
-    word state = "(unknown)";
     switch (pt)
     {
         case GAS:
         {
-            state = "(g)";
+            return "(g)";
             break;
         }
         case LIQUID:
         {
-            state = "(l)";
+            return "(l)";
             break;
         }
         case SOLID:
         {
-            state = "(s)";
+            return "(s)";
             break;
         }
         default:
@@ -167,10 +166,11 @@ Foam::word Foam::phaseProperties::phaseToStateLabel(const phaseType pt) const
                 << "Invalid phase: " << phaseTypeNames[pt] << nl
                 << "    phase must be gas, liquid or solid" << nl
                 << exit(FatalError);
+            break;
         }
     }
 
-    return state;
+    return "(unknown)";
 }
 
 
@@ -180,9 +180,9 @@ Foam::phaseProperties::phaseProperties()
 :
     phase_(UNKNOWN),
     stateLabel_("(unknown)"),
-    names_(0),
-    Y_(0),
-    carrierIds_(0)
+    names_(),
+    Y_(),
+    carrierIds_()
 {}
 
 
@@ -196,12 +196,6 @@ Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::phaseProperties::~phaseProperties()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void Foam::phaseProperties::reorder
@@ -246,6 +240,7 @@ void Foam::phaseProperties::reorder
                 << "Invalid phase: " << phaseTypeNames[phase_] << nl
                 << "    phase must be gas, liquid or solid" << nl
                 << exit(FatalError);
+            break;
         }
     }
 }
@@ -317,15 +312,7 @@ const Foam::labelList& Foam::phaseProperties::carrierIds() const
 
 Foam::label Foam::phaseProperties::id(const word& specieName) const
 {
-    forAll(names_, speciei)
-    {
-        if (names_[speciei] == specieName)
-        {
-            return speciei;
-        }
-    }
-
-    return -1;
+    return names_.find(specieName);
 }
 
 
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 87b6882d6c..c9ad41f3f6 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -120,14 +120,14 @@ public:
         phaseProperties();
 
         //- Construct from Istream
-        phaseProperties(Istream&);
+        phaseProperties(Istream& is);
 
         //- Construct as copy
-        phaseProperties(const phaseProperties&);
+        phaseProperties(const phaseProperties& pp);
 
 
     //- Destructor
-    ~phaseProperties();
+    ~phaseProperties() = default;
 
 
     // Public Member Functions
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
index 00ccbe7739..bc68d9979a 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -32,34 +32,11 @@ Foam::phaseProperties::phaseProperties(Istream& is)
 :
     phase_(UNKNOWN),
     stateLabel_("(unknown)"),
-    names_(0),
-    Y_(0),
-    carrierIds_(0)
+    names_(),
+    Y_(),
+    carrierIds_()
 {
-    is.check(FUNCTION_NAME);
-
-    dictionaryEntry phaseInfo(dictionary::null, is);
-
-    phase_ = phaseTypeNames[phaseInfo.keyword()];
-    stateLabel_ = phaseToStateLabel(phase_);
-
-    const label nComponents = phaseInfo.size();
-    if (nComponents)
-    {
-        names_.setSize(nComponents, "unknownSpecie");
-        Y_.setSize(nComponents, 0.0);
-        carrierIds_.setSize(nComponents, -1);
-
-        label cmptI = 0;
-        forAllConstIter(IDLList<entry>, phaseInfo, iter)
-        {
-            names_[cmptI] = iter().keyword();
-            Y_[cmptI] = readScalar(phaseInfo.lookup(names_[cmptI]));
-            cmptI++;
-        }
-
-        checkTotalMassFraction();
-    }
+    is >> *this;
 }
 
 
@@ -69,28 +46,25 @@ Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
 {
     is.check(FUNCTION_NAME);
 
-    dictionaryEntry phaseInfo(dictionary::null, is);
+    const dictionaryEntry phaseInfo(dictionary::null, is);
+    const dictionary& dict = phaseInfo.dict();
 
     pp.phase_ = pp.phaseTypeNames[phaseInfo.keyword()];
     pp.stateLabel_ = pp.phaseToStateLabel(pp.phase_);
 
-    const label nComponents = phaseInfo.size();
-    if (nComponents)
+    // The names in the dictionary order of appearance
+    pp.names_ = dict.toc();
+
+    const label nComponents = pp.names_.size();
+
+    pp.Y_.resize(nComponents, 0.0);
+    pp.carrierIds_.resize(nComponents, -1);
+
+    for (label cmpti = 0; cmpti < nComponents; ++cmpti)
     {
-        pp.names_.setSize(nComponents, "unknownSpecie");
-        pp.Y_.setSize(nComponents, 0.0);
-        pp.carrierIds_.setSize(nComponents, -1);
-
-        label cmptI = 0;
-        forAllConstIter(IDLList<entry>, phaseInfo, iter)
-        {
-            pp.names_[cmptI] = iter().keyword();
-            pp.Y_[cmptI] = readScalar(phaseInfo.lookup(pp.names_[cmptI]));
-            cmptI++;
-        }
-
-        pp.checkTotalMassFraction();
+        pp.Y_[cmpti] = dict.get<scalar>(pp.names_[cmpti]);
     }
+    pp.checkTotalMassFraction();
 
     return is;
 }
@@ -102,9 +76,9 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
 
     os.beginBlock(pp.phaseTypeNames[pp.phase_]);
 
-    forAll(pp.names_, cmptI)
+    forAll(pp.names_, cmpti)
     {
-        os.writeEntry(pp.names_[cmptI], pp.Y_[cmptI]);
+        os.writeEntry(pp.names_[cmpti], pp.Y_[cmpti]);
     }
 
     os.endBlock();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
index 1d22022f84..5491e4648c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
@@ -74,12 +74,14 @@ Foam::Istream& Foam::operator>>
 {
     is.check(FUNCTION_NAME);
 
-    const dictionaryEntry entry(dictionary::null, is);
+    const dictionaryEntry dictEntry(dictionary::null, is);
+    const dictionary& dict = dictEntry.dict();
 
-    pid.patchName_ = entry.keyword();
-    entry.readEntry("type", pid.interactionTypeName_);
-    pid.e_ = entry.lookupOrDefault<scalar>("e", 1.0);
-    pid.mu_ = entry.lookupOrDefault<scalar>("mu", 0.0);
+    pid.patchName_ = dictEntry.keyword();
+
+    dict.readEntry("type", pid.interactionTypeName_);
+    pid.e_ = dict.lookupOrDefault<scalar>("e", 1.0);
+    pid.mu_ = dict.lookupOrDefault<scalar>("mu", 0.0);
 
     return is;
 }

From 8a923518a59e31e95e1b9744b37774d822e4ded0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 Oct 2018 10:21:33 +0200
Subject: [PATCH 30/43] STYLE: mark compatibility change in motionSolver
 keyword

- was "solver" in 1612 and "motionSolver" for later versions
---
 .../motionSolvers/motionSolver/motionSolver.C      | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
index b12c08b617..924f2ee9a6 100644
--- a/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
+++ b/src/dynamicMesh/motionSolvers/motionSolver/motionSolver.C
@@ -107,12 +107,10 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
 {
     const word solverName
     (
-        solverDict.found("motionSolver")
-      ? solverDict.lookup("motionSolver")
-      : solverDict.lookup("solver")
+        solverDict.getCompat<word>("motionSolver", {{"solver", 1612}})
     );
 
-    Info<< "Selecting motion solver: " << solverName << endl;
+    Info<< "Selecting motion solver: " << solverName << nl;
 
     const_cast<Time&>(mesh.time()).libs().open
     (
@@ -135,7 +133,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New
         FatalErrorInFunction
             << "Unknown solver type "
             << solverName << nl << nl
-            << "Valid solver types :" << endl
+            << "Valid solver types :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
@@ -237,10 +235,8 @@ bool Foam::motionSolver::read()
 
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 

From 77017e58f4b1429bc69cc8c3372f19a7995f0781 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 Oct 2018 11:13:35 +0200
Subject: [PATCH 31/43] ENH: support token stream checking to entry (issue
 #762)

- Eg,
    scalar val(-GREAT);

    const entry* eptr = dict.findEntry(k);

    if (eptr)
    {
        val = eptr.get<scalar>();

        // Or
        eptr.readEntry(val);
    }
---
 .../test/dictionary2/Test-dictionary2.C       | 154 +++++++++++++-----
 .../Test-fvSolutionCombine.C                  |   5 +-
 .../dictionaryEntry/dictionaryEntry.H         |  16 +-
 src/OpenFOAM/db/dictionary/entry/entry.C      |  83 ++++++++++
 src/OpenFOAM/db/dictionary/entry/entry.H      |  35 +++-
 .../primitiveEntry/primitiveEntry.H           |  22 +--
 .../dynamicCode/dynamicCodeContext.C          |  15 +-
 .../dynamicCode/dynamicCodeContext.H          |   2 +-
 8 files changed, 257 insertions(+), 75 deletions(-)

diff --git a/applications/test/dictionary2/Test-dictionary2.C b/applications/test/dictionary2/Test-dictionary2.C
index fc883a9cf5..b309da36eb 100644
--- a/applications/test/dictionary2/Test-dictionary2.C
+++ b/applications/test/dictionary2/Test-dictionary2.C
@@ -48,6 +48,102 @@ void entryInfo(entry* e)
 }
 
 
+// Try with readScalar
+scalar try_readScalar(const dictionary& dict, const word& k)
+{
+    scalar val(-GREAT);
+
+    const bool throwingIOError = FatalIOError.throwExceptions();
+    const bool throwingError = FatalError.throwExceptions();
+
+    try
+    {
+        val = readScalar(dict.lookup(k));
+        Info<< "readScalar(" << k << ") = " << val << nl;
+    }
+    catch (Foam::IOerror& err)
+    {
+        Info<< "readScalar(" << k << ") Caught FatalIOError "
+            << err << nl << endl;
+    }
+    catch (Foam::error& err)
+    {
+        Info<< "readScalar(" << k << ") Caught FatalError "
+            << err << nl << endl;
+    }
+    FatalError.throwExceptions(throwingError);
+    FatalIOError.throwExceptions(throwingIOError);
+
+    return val;
+}
+
+
+// Try with get<scalar>
+scalar try_getScalar(const dictionary& dict, const word& k)
+{
+    scalar val(-GREAT);
+
+    const bool throwingIOError = FatalIOError.throwExceptions();
+    const bool throwingError = FatalError.throwExceptions();
+
+    try
+    {
+        val = dict.get<scalar>(k);
+        Info<< "get<scalar>(" << k << ") = " << val << nl;
+    }
+    catch (Foam::IOerror& err)
+    {
+        Info<< "get<scalar>(" << k << ") Caught FatalIOError "
+            << err << nl << endl;
+    }
+    catch (Foam::error& err)
+    {
+        Info<< "get<scalar>(" << k << ") Caught FatalError "
+            << err << nl << endl;
+    }
+    FatalError.throwExceptions(throwingError);
+    FatalIOError.throwExceptions(throwingIOError);
+
+    return val;
+}
+
+
+// Try with *entry (from findEntry) and get<scalar>
+scalar try_getScalar(const entry* eptr, const word& k)
+{
+    scalar val(-GREAT);
+
+    if (!eptr)
+    {
+        Info<< "No entry" << k << nl;
+        return val;
+    }
+
+    const bool throwingIOError = FatalIOError.throwExceptions();
+    const bool throwingError = FatalError.throwExceptions();
+
+    try
+    {
+        val = eptr->get<scalar>();
+        Info<< "entry get<scalar>(" << k << ") = " << val << nl;
+    }
+    catch (Foam::IOerror& err)
+    {
+        Info<< "entry get<scalar>(" << k << ") Caught FatalIOError "
+            << err << nl << endl;
+    }
+    catch (Foam::error& err)
+    {
+        Info<< "entry get<scalar>(" << k << ") Caught FatalError "
+            << err << nl << endl;
+    }
+    FatalError.throwExceptions(throwingError);
+    FatalIOError.throwExceptions(throwingIOError);
+
+    return val;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:
 
@@ -227,29 +323,9 @@ int main(int argc, char *argv[])
         {
             Info<< nl << "Test some bad input with readScalar()" << nl;
 
-            const bool throwingIOError = FatalIOError.throwExceptions();
-            const bool throwingError = FatalError.throwExceptions();
-
-            try
-            {
-                scalar val1 = readScalar(dict2.lookup("good"));
-                // scalar val2 = readScalar(dict2.lookup("bad"));
-                scalar val2 = -1;
-                scalar val3 = readScalar(dict2.lookup("empty"));
-
-                Info<< "got good=" << val1 << " bad=" << val2
-                    << " empty=" << val3 << nl;
-            }
-            catch (Foam::IOerror& err)
-            {
-                Info<< "Caught FatalIOError " << err << nl << endl;
-            }
-            catch (Foam::error& err)
-            {
-                Info<< "Caught FatalError " << err << nl << endl;
-            }
-            FatalError.throwExceptions(throwingError);
-            FatalIOError.throwExceptions(throwingIOError);
+            try_readScalar(dict2, "good");
+            // try_readScalar(dict2, "bad");
+            try_readScalar(dict2, "empty");
         }
 
 
@@ -257,29 +333,19 @@ int main(int argc, char *argv[])
         {
             Info<< nl << "Test some bad input with get<scalar>()" << nl;
 
-            const bool throwingIOError = FatalIOError.throwExceptions();
-            const bool throwingError = FatalError.throwExceptions();
+            try_getScalar(dict2, "good");
+            // try_getScalar(dict2, "bad");
+            try_getScalar(dict2, "empty");
+        }
 
-            try
-            {
-                scalar val1 = dict2.get<scalar>("good");
-                // scalar val2 = dict2.get<scalar>("bad");
-                scalar val2 = -1;
-                scalar val3 = dict2.get<scalar>("empty");
+        // With findEntry and get<scalar>
+        {
+            Info<< nl
+                << "Test some bad input with findEntry + get<scalar>()" << nl;
 
-                Info<< "got good=" << val1 << " bad=" << val2
-                    << " empty=" << val3 << nl;
-            }
-            catch (Foam::IOerror& err)
-            {
-                Info<< "Caught FatalIOError " << err << nl << endl;
-            }
-            catch (Foam::error& err)
-            {
-                Info<< "Caught FatalError " << err << nl << endl;
-            }
-            FatalError.throwExceptions(throwingError);
-            FatalIOError.throwExceptions(throwingIOError);
+            try_getScalar(dict2.findEntry("good"), "good");
+            // try_getScalar(dict2.findEntry("bad"), "bad");
+            try_getScalar(dict2.findEntry("empty"), "empty");
         }
     }
 
diff --git a/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
index f3ed843680..71d604395d 100644
--- a/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
+++ b/applications/test/fvSolutionCombine/Test-fvSolutionCombine.C
@@ -50,17 +50,16 @@ bool checkDictionaryContent(const dictionary& dict1, const dictionary& dict2)
     }
 
 
-    forAllConstIter(dictionary, dict1, iter1)
+    for (const entry& entry1 : dict1)
     {
         const entry* eptr =
-            dict2.findEntry(iter1().keyword(), keyType::LITERAL);
+            dict2.findEntry(entry1.keyword(), keyType::LITERAL);
 
         if (!eptr)
         {
             return false;
         }
 
-        const entry& entry1 = iter1();
         const entry& entry2 = *eptr;
 
         bool ok = false;
diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
index c7850f3124..62f4c8226d 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
+++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntry.H
@@ -111,26 +111,26 @@ public:
     // Member functions
 
         //- Return the scoped dictionary name (eg, dictA.dictB.dictC)
-        const fileName& name() const
+        virtual const fileName& name() const
         {
             return dictionary::name();
         }
 
         //- Return the scoped dictionary name (eg, dictA.dictB.dictC)
-        fileName& name()
+        virtual fileName& name()
         {
             return dictionary::name();
         }
 
         //- Return line number of first token in dictionary
-        label startLineNumber() const;
+        virtual label startLineNumber() const;
 
         //- Return line number of last token in dictionary
-        label endLineNumber() const;
+        virtual label endLineNumber() const;
 
         //- This entry is not a primitive,
         //  calling this function generates a FatalError
-        ITstream& stream() const;
+        virtual ITstream& stream() const;
 
 
         //- Return pointer to this dictionary
@@ -140,14 +140,14 @@ public:
         virtual dictionary* dictPtr();
 
         //- Return dictionary
-        const dictionary& dict() const;
+        virtual const dictionary& dict() const;
 
         //- Return non-const access to dictionary
-        dictionary& dict();
+        virtual dictionary& dict();
 
 
         //- Write
-        void write(Ostream& os) const;
+        virtual void write(Ostream& os) const;
 
         //- Return info proxy.
         //  Used to print token information to a stream
diff --git a/src/OpenFOAM/db/dictionary/entry/entry.C b/src/OpenFOAM/db/dictionary/entry/entry.C
index 81b88563b0..c7f8038092 100644
--- a/src/OpenFOAM/db/dictionary/entry/entry.C
+++ b/src/OpenFOAM/db/dictionary/entry/entry.C
@@ -26,6 +26,7 @@ License
 #include "entry.H"
 #include "dictionary.H"
 #include "StringStream.H"
+#include "JobInfo.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -46,6 +47,88 @@ void Foam::entry::resetInputMode()
 }
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::entry::checkITstream(const ITstream& is) const
+{
+    const word& keyword = keyword_;
+
+    if (is.nRemainingTokens())
+    {
+        const label remaining = is.nRemainingTokens();
+
+        // Similar to SafeFatalIOError
+        if (JobInfo::constructed)
+        {
+            OSstream& err =
+                FatalIOError
+                (
+                    "",                 // functionName
+                    "",                 // sourceFileName
+                    0,                  // sourceFileLineNumber
+                    this->name(),       // ioFileName
+                    is.lineNumber()     // ioStartLineNumber
+                );
+
+            err << "'" << keyword << "' has "
+                << remaining << " excess tokens in stream" << nl << nl
+                << "    ";
+            is.writeList(err, 0);
+
+            err << exit(FatalIOError);
+        }
+        else
+        {
+            std::cerr
+                << nl
+                << "--> FOAM FATAL IO ERROR:" << nl;
+
+            std::cerr
+                << "'" << keyword << "' has "
+                << remaining << " excess tokens in stream" << nl << nl;
+
+            std::cerr
+                << "file: " << this->name()
+                << " at line " << is.lineNumber() << '.' << nl
+                << std::endl;
+
+            ::exit(1);
+        }
+    }
+    else if (!is.size())
+    {
+        // Similar to SafeFatalIOError
+        if (JobInfo::constructed)
+        {
+            FatalIOError
+            (
+                "",                 // functionName
+                "",                 // sourceFileName
+                0,                  // sourceFileLineNumber
+                this->name(),       // ioFileName
+                is.lineNumber()     // ioStartLineNumber
+            )
+                << "'" << keyword << "' had no tokens in stream" << nl << nl
+                << exit(FatalIOError);
+        }
+        else
+        {
+            std::cerr
+                << nl
+                << "--> FOAM FATAL IO ERROR:" << nl
+                << "'" << keyword << "' had no tokens in stream" << nl << nl;
+
+            std::cerr
+                << "file: " << this->name()
+                << " at line " << is.lineNumber() << '.' << nl
+                << std::endl;
+
+            ::exit(1);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::entry::entry(const keyType& keyword)
diff --git a/src/OpenFOAM/db/dictionary/entry/entry.H b/src/OpenFOAM/db/dictionary/entry/entry.H
index ec7b17bd04..09d73d051e 100644
--- a/src/OpenFOAM/db/dictionary/entry/entry.H
+++ b/src/OpenFOAM/db/dictionary/entry/entry.H
@@ -107,6 +107,11 @@ private:
         //  \return True if it is a valid keyType.
         static bool getKeyword(keyType& keyword, Istream& is);
 
+        //- Check after reading if the input token stream has unconsumed
+        //- tokens remaining or if there were no tokens in the first place.
+        //  Emits FatalIOError
+        void checkITstream(const ITstream& is) const;
+
 
 public:
 
@@ -176,7 +181,7 @@ public:
     virtual ~entry() = default;
 
 
-    // Member functions
+    // Member Functions
 
         //- Return keyword
         const keyType& keyword() const
@@ -244,7 +249,31 @@ public:
         virtual void write(Ostream& os) const = 0;
 
 
-    // Member operators
+        //- Get a T from the stream,
+        //- FatalIOError if the number of tokens is incorrect.
+        template<class T>
+        T get() const
+        {
+            T val;
+            readEntry<T>(val);
+            return val;
+        }
+
+        //- Assign to T val,
+        //- FatalIOError if the number of tokens is incorrect.
+        //
+        //  \param val the value to read into
+        template<class T>
+        void readEntry(T& val) const
+        {
+            ITstream& is = this->stream();
+            is >> val;
+
+            checkITstream(is);
+        }
+
+
+    // Member Operators
 
         void operator=(const entry& e);
 
@@ -252,7 +281,7 @@ public:
         bool operator!=(const entry& e) const;
 
 
-    // Ostream operator
+    // Ostream Operator
 
         friend Ostream& operator<<(Ostream& os, const entry& e);
 };
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
index 86bea927e5..bdbe013ba2 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
@@ -138,51 +138,51 @@ public:
         }
 
 
-    // Member functions
+    // Member Functions
 
         //- Inherit read from ITstream
         using ITstream::read;
 
         //- Return the dictionary name
-        const fileName& name() const
+        virtual const fileName& name() const
         {
             return ITstream::name();
         }
 
         //- Return the dictionary name
-        fileName& name()
+        virtual fileName& name()
         {
             return ITstream::name();
         }
 
         //- Return line number of first token in dictionary
-        label startLineNumber() const;
+        virtual label startLineNumber() const;
 
         //- Return line number of last token in dictionary
-        label endLineNumber() const;
+        virtual label endLineNumber() const;
 
-        //- Return true because this entry is a stream
-        bool isStream() const
+        //- Return true - this entry is a stream
+        virtual bool isStream() const
         {
             return true;
         }
 
         //- Return token stream for this primitive entry
-        ITstream& stream() const;
+        virtual ITstream& stream() const;
 
         //- This entry is not a dictionary,
         //  calling this function generates a FatalError
-        const dictionary& dict() const;
+        virtual const dictionary& dict() const;
 
         //- This entry is not a dictionary,
         //  calling this function generates a FatalError
-        dictionary& dict();
+        virtual dictionary& dict();
 
         //- Read tokens from the given stream
         virtual bool read(const dictionary& dict, Istream& is);
 
         //- Write
-        void write(Ostream& os) const;
+        virtual void write(Ostream& os) const;
 
         //- Write, optionally with contents only (no keyword, etc)
         void write(Ostream& os, const bool contentsOnly) const;
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
index a626aa7874..dbd5fccb40 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
@@ -48,7 +48,8 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
 
     if (codePtr)
     {
-        code_ = stringOps::trim(codePtr->stream());
+        codePtr->readEntry(code_);
+        stringOps::inplaceTrim(code_);
         stringOps::inplaceExpand(code_, dict);
     }
 
@@ -56,7 +57,8 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
 
     if (includePtr)
     {
-        include_ = stringOps::trim(includePtr->stream());
+        includePtr->readEntry(include_);
+        stringOps::inplaceTrim(include_);
         stringOps::inplaceExpand(include_, dict);
     }
 
@@ -64,7 +66,8 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
 
     if (optionsPtr)
     {
-        options_ = stringOps::trim(optionsPtr->stream());
+        optionsPtr->readEntry(options_);
+        stringOps::inplaceTrim(options_);
         stringOps::inplaceExpand(options_, dict);
     }
 
@@ -72,7 +75,8 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
 
     if (libsPtr)
     {
-        libs_ = stringOps::trim(libsPtr->stream());
+        libsPtr->readEntry(libs_);
+        stringOps::inplaceTrim(libs_);
         stringOps::inplaceExpand(libs_, dict);
     }
 
@@ -80,7 +84,8 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
 
     if (localPtr)
     {
-        localCode_ = stringOps::trim(localPtr->stream());
+        localPtr->readEntry(localCode_);
+        stringOps::inplaceTrim(localCode_);
         stringOps::inplaceExpand(localCode_, dict);
     }
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
index c114d1303c..6228a09bd5 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.H
@@ -66,7 +66,7 @@ class dynamicCodeContext
         //- Optional "codeOptions" entry
         string options_;
 
-        //- Optional "codeLib" entry
+        //- Optional "codeLibs" entry
         string libs_;
 
         //- Calculated SHA1Digest

From 5d7b2329dd22f6f77daca5805c73ea769fa2c7a1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 Oct 2018 11:36:29 +0200
Subject: [PATCH 32/43] STYLE: use range-for in dictionary internals

---
 src/OpenFOAM/db/dictionary/dictionary.C   | 80 +++++++++++------------
 src/OpenFOAM/db/dictionary/dictionaryIO.C |  6 +-
 2 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 4cdc9a754c..1a66d3ca53 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -156,14 +156,14 @@ Foam::dictionary::dictionary
     name_(dict.name()),
     parent_(parentDict)
 {
-    forAllIter(parent_type, *this, iter)
+    for (entry& e : *this)
     {
-        hashedEntries_.insert(iter().keyword(), &iter());
+        hashedEntries_.insert(e.keyword(), &e);
 
-        if (iter().keyword().isPattern())
+        if (e.keyword().isPattern())
         {
-            patterns_.insert(&iter());
-            regexps_.insert(autoPtr<regExp>::New(iter().keyword()));
+            patterns_.insert(&e);
+            regexps_.insert(autoPtr<regExp>::New(e.keyword()));
         }
     }
 }
@@ -178,14 +178,14 @@ Foam::dictionary::dictionary
     name_(dict.name()),
     parent_(dictionary::null)
 {
-    forAllIter(parent_type, *this, iter)
+    for (entry& e : *this)
     {
-        hashedEntries_.insert(iter().keyword(), &iter());
+        hashedEntries_.insert(e.keyword(), &e);
 
-        if (iter().keyword().isPattern())
+        if (e.keyword().isPattern())
         {
-            patterns_.insert(&iter());
-            regexps_.insert(autoPtr<regExp>::New(iter().keyword()));
+            patterns_.insert(&e);
+            regexps_.insert(autoPtr<regExp>::New(e.keyword()));
         }
     }
 }
@@ -283,9 +283,9 @@ Foam::SHA1Digest Foam::dictionary::digest() const
     OSHA1stream os;
 
     // Process entries
-    forAllConstIter(parent_type, *this, iter)
+    for (const entry& e : *this)
     {
-        os << *iter;
+        os << e;
     }
 
     return os.digest();
@@ -298,9 +298,9 @@ Foam::tokenList Foam::dictionary::tokens() const
     OStringStream os;
 
     // Process entries
-    forAllConstIter(parent_type, *this, iter)
+    for (const entry& e : *this)
     {
-        os << *iter;
+        os << e;
     }
 
     // String re-parsed as a list of tokens
@@ -394,11 +394,9 @@ bool Foam::dictionary::substituteKeyword(const word& keyword, bool mergeEntry)
     // If defined insert its entries into this dictionary
     if (finder.found())
     {
-        const dictionary& addDict = finder.dict();
-
-        forAllConstIters(addDict, iter)
+        for (const entry& e : finder.dict())
         {
-            add(iter(), mergeEntry);
+            add(e, mergeEntry);
         }
 
         return true;
@@ -428,11 +426,9 @@ bool Foam::dictionary::substituteScopedKeyword
     // If defined insert its entries into this dictionary
     if (finder.found())
     {
-        const dictionary& addDict = finder.dict();
-
-        forAllConstIter(parent_type, addDict, iter)
+        for (const entry& e : finder.dict())
         {
-            add(iter(), mergeEntry);
+            add(e, mergeEntry);
         }
 
         return true;
@@ -570,9 +566,9 @@ Foam::wordList Foam::dictionary::toc() const
     wordList list(size());
 
     label n = 0;
-    forAllConstIters(*this, iter)
+    for (const entry& e : *this)
     {
-        list[n++] = iter().keyword();
+        list[n++] = e.keyword();
     }
 
     return list;
@@ -590,11 +586,11 @@ Foam::List<Foam::keyType> Foam::dictionary::keys(bool patterns) const
     List<keyType> list(size());
 
     label n = 0;
-    forAllConstIters(*this, iter)
+    for (const entry& e : *this)
     {
-        if (iter().keyword().isPattern() ? patterns : !patterns)
+        if (e.keyword().isPattern() ? patterns : !patterns)
         {
-            list[n++] = iter().keyword();
+            list[n++] = e.keyword();
         }
     }
     list.resize(n);
@@ -783,31 +779,31 @@ bool Foam::dictionary::merge(const dictionary& dict)
 
     bool changed = false;
 
-    forAllConstIters(dict, iter)
+    for (const entry& e : dict)
     {
-        auto fnd = hashedEntries_.find(iter().keyword());
+        auto fnd = hashedEntries_.find(e.keyword());
 
         if (fnd.found())
         {
             // Recursively merge sub-dictionaries
             // TODO: merge without copying
-            if (fnd()->isDict() && iter().isDict())
+            if (fnd()->isDict() && e.isDict())
             {
-                if (fnd()->dict().merge(iter().dict()))
+                if (fnd()->dict().merge(e.dict()))
                 {
                     changed = true;
                 }
             }
             else
             {
-                add(iter().clone(*this).ptr(), true);
+                add(e.clone(*this).ptr(), true);
                 changed = true;
             }
         }
         else
         {
             // Not found - just add
-            add(iter().clone(*this).ptr());
+            add(e.clone(*this).ptr());
             changed = true;
         }
     }
@@ -855,9 +851,9 @@ void Foam::dictionary::operator=(const dictionary& rhs)
     // Create clones of the entries in the given dictionary
     // resetting the parentDict to this dictionary
 
-    forAllConstIters(rhs, iter)
+    for (const entry& e : rhs)
     {
-        add(iter().clone(*this).ptr());
+        add(e.clone(*this).ptr());
     }
 }
 
@@ -872,9 +868,9 @@ void Foam::dictionary::operator+=(const dictionary& rhs)
             << abort(FatalIOError);
     }
 
-    forAllConstIters(rhs, iter)
+    for (const entry& e : rhs)
     {
-        add(iter().clone(*this).ptr());
+        add(e.clone(*this).ptr());
     }
 }
 
@@ -889,11 +885,11 @@ void Foam::dictionary::operator|=(const dictionary& rhs)
             << abort(FatalIOError);
     }
 
-    forAllConstIters(rhs, iter)
+    for (const entry& e : rhs)
     {
-        if (!found(iter().keyword()))
+        if (!found(e.keyword()))
         {
-            add(iter().clone(*this).ptr());
+            add(e.clone(*this).ptr());
         }
     }
 }
@@ -909,9 +905,9 @@ void Foam::dictionary::operator<<=(const dictionary& rhs)
             << abort(FatalIOError);
     }
 
-    forAllConstIters(rhs, iter)
+    for (const entry& e : rhs)
     {
-        set(iter().clone(*this).ptr());
+        set(e.clone(*this).ptr());
     }
 }
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index de4ff879aa..276229d8bb 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -169,10 +169,8 @@ void Foam::dictionary::writeEntry(const keyType& kw, Ostream& os) const
 
 void Foam::dictionary::writeEntries(Ostream& os, const bool extraNewLine) const
 {
-    forAllConstIter(parent_type, *this, iter)
+    for (const entry& e : *this)
     {
-        const entry& e = *iter;
-
         // Write entry
         os  << e;
 
@@ -187,7 +185,7 @@ void Foam::dictionary::writeEntries(Ostream& os, const bool extraNewLine) const
         if (!os.good())
         {
             WarningInFunction
-                << "Can't write entry " << iter().keyword()
+                << "Can't write entry " << e.keyword()
                 << " for dictionary " << name()
                 << endl;
         }

From 1eba709319227296f548fca37889f2844cbe5c05 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 16 Oct 2018 13:01:15 +0100
Subject: [PATCH 33/43] ENH: Added new fieldExtents function object

Description
    Calculates the spatial minimum and maximum extents of a field

    The extents are derived from the bound box limits after identifying
    the locations where field values exceed the user-supplied threshold
    value.

Usage
    Example of function object specification:

    fieldExtents1
    {
        type        fieldExtents;
        libs        ("libfieldFunctionObjects.so");
        ...
        writeToFile yes;
        log         yes;
        fields      (alpha);
        threshold   0.5;
        patches     ();
    }

    Where the entries comprise:

        Property      | Description              | Required   | Default
        type          | type name: fieldExtents  | yes        |
        writeToFile   | write extents data to file | no       | yes
        log           | write extents data to standard output | no | yes
        internalField | Process the internal field | no       | yes
        threshold     | Field value to identify extents boundary | yes |
        referencePosition | Reference position   | no         | (0 0 0)
        fields        | list of fields to process | yes       |
        patches       | list of patches to process | no       | <all>

    Output data is written to the file \<timeDir\>/fieldExtents.dat

Note
    For non-scalar fields, the magnitude of the field is employed and
    compared to the threshold value.
---
 src/functionObjects/field/Make/files          |   1 +
 .../field/fieldExtents/fieldExtents.C         | 201 +++++++++++++++++
 .../field/fieldExtents/fieldExtents.H         | 207 ++++++++++++++++++
 .../fieldExtents/fieldExtentsTemplates.C      | 120 ++++++++++
 .../rivuletPanel/system/controlDict           |  13 ++
 5 files changed, 542 insertions(+)
 create mode 100644 src/functionObjects/field/fieldExtents/fieldExtents.C
 create mode 100644 src/functionObjects/field/fieldExtents/fieldExtents.H
 create mode 100644 src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C

diff --git a/src/functionObjects/field/Make/files b/src/functionObjects/field/Make/files
index b666221d3a..1afdfb2ea7 100644
--- a/src/functionObjects/field/Make/files
+++ b/src/functionObjects/field/Make/files
@@ -3,6 +3,7 @@ fieldAverage/fieldAverageItem/fieldAverageItem.C
 fieldAverage/fieldAverageItem/fieldAverageItemIO.C
 
 fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.C
+fieldExtents/fieldExtents.C
 fieldMinMax/fieldMinMax.C
 
 fieldValues/fieldValue/fieldValue.C
diff --git a/src/functionObjects/field/fieldExtents/fieldExtents.C b/src/functionObjects/field/fieldExtents/fieldExtents.C
new file mode 100644
index 0000000000..8e65a802eb
--- /dev/null
+++ b/src/functionObjects/field/fieldExtents/fieldExtents.C
@@ -0,0 +1,201 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "fieldExtents.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+    defineTypeNameAndDebug(fieldExtents, 0);
+    addToRunTimeSelectionTable(functionObject, fieldExtents, dictionary);
+}
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::functionObjects::fieldExtents::writeFileHeader(Ostream& os)
+{
+    if (!fieldSet_.updateSelection())
+    {
+        return;
+    }
+
+    if (writtenHeader_)
+    {
+        writeBreak(os);
+    }
+    else
+    {
+        writeHeader(os, "Field extents");
+        writeHeaderValue(os, "Reference position", C0_);
+        writeHeaderValue(os, "Threshold", threshold_);
+    }
+
+    writeCommented(os, "Time");
+
+    forAllConstIters(fieldSet_.selection(), iter)
+    {
+        const word& fieldName = iter();
+        if (internalField_)
+        {
+            writeTabbed(os, fieldName + "_internal");
+        }
+        for (const label patchi : patchIDs_)
+        {
+            const word& patchName = mesh_.boundaryMesh()[patchi].name();
+            writeTabbed(os, fieldName + "_" + patchName);
+        }
+    }
+
+    os  << endl;
+
+    writtenHeader_ = true;
+}
+
+
+template<>
+Foam::tmp<Foam::volScalarField> Foam::functionObjects::fieldExtents::calcMask
+(
+    const GeometricField<scalar, fvPatchField, volMesh>& field
+) const
+{
+    return
+        pos
+        (
+            field
+          - dimensionedScalar("t", field.dimensions(), threshold_)
+        );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::fieldExtents::fieldExtents
+(
+    const word& name,
+    const Time& runTime,
+    const dictionary& dict
+)
+:
+    fvMeshFunctionObject(name, runTime, dict),
+    writeFile(mesh_, name, typeName, dict),
+    internalField_(true),
+    threshold_(0),
+    C0_(Zero),
+    fieldSet_(mesh_),
+    patchIDs_()
+{
+    read(dict);
+
+    // Note: delay creating the output file header to handle field names
+    // specified using regular expressions
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::functionObjects::fieldExtents::read(const dictionary& dict)
+{
+    if (fvMeshFunctionObject::read(dict) && writeFile::read(dict))
+    {
+        threshold_ = dict.get<scalar>("threshold");
+
+        dict.readIfPresent<bool>("internalField", internalField_);
+
+        dict.readIfPresent<vector>("referencePosition", C0_);
+
+        patchIDs_.clear();
+        const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
+
+        wordReList patchNames;
+        if (dict.readIfPresent("patches", patchNames))
+        {
+            for (const wordRe& name : patchNames)
+            {
+                patchIDs_.insert(pbm.findIndices(name));
+            }
+        }
+        else
+        {
+            // Add all non-processor and non-empty patches
+            forAll(pbm, patchi)
+            {
+                const polyPatch& pp = pbm[patchi];
+                if (!isA<processorPolyPatch>(pp) && !isA<emptyPolyPatch>(pp))
+                {
+                    patchIDs_.insert(patchi);
+                }
+            }
+        }
+
+        if (!internalField_ && patchIDs_.empty())
+        {
+            IOWarningInFunction(dict)
+                << "No internal field or patches selected - no field extent "
+                << "information will be generated" << endl;
+        }
+
+        fieldSet_.read(dict);
+
+        return true;
+    }
+
+    return false;
+}
+
+
+bool Foam::functionObjects::fieldExtents::execute()
+{
+    return true;
+}
+
+
+bool Foam::functionObjects::fieldExtents::write()
+{
+    writeFileHeader(file());
+
+    Log << type() << " " << name() <<  " write:" << nl;
+
+    for (const word& fieldName : fieldSet_.selection())
+    {
+        calcFieldExtents<scalar>(fieldName, true);
+        calcFieldExtents<vector>(fieldName);
+        calcFieldExtents<sphericalTensor>(fieldName);
+        calcFieldExtents<symmTensor>(fieldName);
+        calcFieldExtents<tensor>(fieldName);
+    }
+
+    Log << endl;
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/functionObjects/field/fieldExtents/fieldExtents.H b/src/functionObjects/field/fieldExtents/fieldExtents.H
new file mode 100644
index 0000000000..9d4d8ac939
--- /dev/null
+++ b/src/functionObjects/field/fieldExtents/fieldExtents.H
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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::functionObjects::fieldExtents
+
+Group
+    grpFieldFunctionObjects
+
+Description
+    Calculates the spatial minimum and maximum extents of a field
+
+    The extents are derived from the bound box limits after identifying the
+    locations where field values exceed the user-supplied threshold value.
+
+Usage
+    Example of function object specification:
+    \verbatim
+    fieldExtents1
+    {
+        type        fieldExtents;
+        libs        ("libfieldFunctionObjects.so");
+        ...
+        writeToFile yes;
+        log         yes;
+        fields      (alpha);
+        threshold   0.5;
+        patches     ();
+    }
+    \endverbatim
+
+    Where the entries comprise:
+    \table
+        Property      | Description              | Required   | Default value
+        type          | type name: fieldExtents  | yes        |
+        writeToFile   | write extents data to file | no       | yes
+        log           | write extents data to standard output | no | yes
+        internalField | Process the internal field | no       | yes
+        threshold     | Field value to identify extents boundary | yes |
+        referencePosition | Reference position   | no         | (0 0 0)
+        fields        | list of fields to process | yes       |
+        patches       | list of patches to process | no       | \<all patches\>
+    \endtable
+
+    Output data is written to the file \<timeDir\>/fieldExtents.dat
+
+Note
+    For non-scalar fields, the magnitude of the field is employed and compared
+    to the threshold value.
+
+See also
+    Foam::functionObjects::fvMeshFunctionObject
+    Foam::functionObjects::writeFile
+
+SourceFiles
+    fieldExtents.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjects_fieldExtents_H
+#define functionObjects_fieldExtents_H
+
+#include "fvMeshFunctionObject.H"
+#include "writeFile.H"
+#include "volFieldSelection.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class fieldExtents Declaration
+\*---------------------------------------------------------------------------*/
+
+class fieldExtents
+:
+    public fvMeshFunctionObject,
+    public writeFile
+{
+protected:
+
+    // Protected data
+
+        //- Flag to write the internal field extents
+        bool internalField_;
+
+        //- Threshold value
+        scalar threshold_;
+
+        //- Reference position; default = (0 0 0)
+        point C0_;
+
+        //- Fields to assess
+        volFieldSelection fieldSet_;
+
+        //- Patches to assess
+        labelHashSet patchIDs_;
+
+
+    // Protected Member Functions
+
+        //- Output file header information
+        virtual void writeFileHeader(Ostream& os);
+
+        //- Return the field mask
+        template<class Type>
+        tmp<volScalarField> calcMask
+        (
+            const GeometricField<Type, fvPatchField, volMesh>& field
+        ) const;
+
+        //- Main calculation
+        template<class Type>
+        void calcFieldExtents
+        (
+            const word& fieldName,
+            const bool calcMag = false
+        );
+
+        //- No copy construct
+        fieldExtents(const fieldExtents&) = delete;
+
+        //- No copy assignment
+        void operator=(const fieldExtents&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("fieldExtents");
+
+
+    // Constructors
+
+        //- Construct from Time and dictionary
+        fieldExtents
+        (
+            const word& name,
+            const Time& runTime,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~fieldExtents() = default;
+
+
+    // Member Functions
+
+        //- Read the field extents data
+        virtual bool read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual bool execute();
+
+        //- Write the fieldExtents
+        virtual bool write();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<>
+tmp<volScalarField> fieldExtents::calcMask
+(
+    const GeometricField<scalar, fvPatchField, volMesh>& field
+) const;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionObjects
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "fieldExtentsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
new file mode 100644
index 0000000000..9ea87aef7d
--- /dev/null
+++ b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "fieldExtents.H"
+#include "volFields.H"
+#include "boundBox.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::volScalarField> Foam::functionObjects::fieldExtents::calcMask
+(
+    const GeometricField<Type, fvPatchField, volMesh>& field
+) const
+{
+    return
+        pos
+        (
+            mag(field)
+          - dimensionedScalar("t", field.dimensions(), threshold_)
+        );
+}
+
+
+template<class Type>
+void Foam::functionObjects::fieldExtents::calcFieldExtents
+(
+    const word& fieldName,
+    const bool calcMag
+)
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
+
+    const VolFieldType* fieldPtr =
+        obr_.lookupObjectPtr<VolFieldType>(fieldName);
+
+    if (!fieldPtr)
+    {
+        return;
+    }
+
+    auto extents = [this](const scalarField& mask, const vectorField& C)
+    {
+        boundBox extents(boundBox::invertedBox);
+        forAll(mask, i)
+        {
+            if (mask[i] > 0.5)
+            {
+                extents.add(C[i] - C0_);
+            }
+        };
+
+        extents.reduce();
+
+        if (extents.empty())
+        {
+            extents.add(point::zero);
+        }
+
+        return extents;
+    };
+
+    Log << "field: " << fieldName << nl;
+
+    writeTime(file());
+
+    tmp<volScalarField> tmask = calcMask<Type>(*fieldPtr);
+    const volScalarField& mask = tmask();
+
+    // Internal field
+    if (internalField_)
+    {
+        boundBox bb(extents(mask, mesh_.C()));
+        Log << "    internal field: " << bb << nl;
+        file() << bb;
+
+        this->setResult(fieldName + "_internal_min" , bb.min());
+        this->setResult(fieldName + "_internal_max", bb.max());
+    }
+
+    // Patches
+    for (const label patchi : patchIDs_)
+    {
+        const fvPatchScalarField& maskp = mask.boundaryField()[patchi];
+        boundBox bb(extents(maskp, maskp.patch().Cf()));
+        const word& patchName = maskp.patch().name();
+        Log << "    patch " << patchName << ": " << bb << nl;
+        file() << bb;
+        this->setResult(fieldName + "_" + patchName + "_min", bb.min());
+        this->setResult(fieldName + "_" + patchName + "_max", bb.max());
+    }
+
+    Log << endl;
+    file() << endl;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
index b628460e8e..363963055d 100644
--- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
+++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/system/controlDict
@@ -51,5 +51,18 @@ maxCo           0.3;
 
 maxDeltaT       1e-03;
 
+functions
+{
+    fieldExtents
+    {
+        type            fieldExtents;
+        libs            ("libfieldFunctionObjects.so");
+        region          wallFilmRegion;
+        threshold       0.5;
+        fields          (alpha);
+        internalField   yes;
+        patches         ();
+    }
+}
 
 // ************************************************************************* //

From 8e034006350c2d43a7709440a7520f216723bc3a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 15 Oct 2018 11:33:00 +0100
Subject: [PATCH 34/43] ENH: snappyHexMesh: force all running; remove excess
 tutorial.

---
 tutorials/mesh/snappyHexMesh/Allrun           |   1 +
 .../directionalRefinement/Allclean            |   9 -
 .../directionalRefinement/Allrun              |  15 -
 .../directionalRefinement/README.txt          |   9 -
 .../constant/triSurface/mech_test.obj         | 124 -------
 .../system/blockMeshDict                      | 102 ------
 .../directionalRefinement/system/controlDict  |  49 ---
 .../system/decomposeParDict                   |  23 --
 .../directionalRefinement/system/fvSchemes    |  57 ---
 .../directionalRefinement/system/fvSolution   |  69 ----
 .../system/meshQualityDict                    |  21 --
 .../system/snappyHexMeshDict                  | 326 ------------------
 12 files changed, 1 insertion(+), 804 deletions(-)
 delete mode 100755 tutorials/mesh/snappyHexMesh/directionalRefinement/Allclean
 delete mode 100755 tutorials/mesh/snappyHexMesh/directionalRefinement/Allrun
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/README.txt
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/constant/triSurface/mech_test.obj
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/system/blockMeshDict
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/system/controlDict
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/system/decomposeParDict
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/system/fvSchemes
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/system/fvSolution
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/system/meshQualityDict
 delete mode 100644 tutorials/mesh/snappyHexMesh/directionalRefinement/system/snappyHexMeshDict

diff --git a/tutorials/mesh/snappyHexMesh/Allrun b/tutorials/mesh/snappyHexMesh/Allrun
index 8a3d913278..b92f5fbb01 100755
--- a/tutorials/mesh/snappyHexMesh/Allrun
+++ b/tutorials/mesh/snappyHexMesh/Allrun
@@ -5,6 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 ( cd addLayersToFaceZone && ./Allrun )
 ( cd gap_detection && ./Allrun )
 ( cd aerofoilNACA0012_directionalRefinement && ./Allrun )
+( cd iglooWithFridgesDirectionalRefinement && ./Allrun )
 
 exit 0
 
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/Allclean b/tutorials/mesh/snappyHexMesh/directionalRefinement/Allclean
deleted file mode 100755
index 6b45f82a41..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/Allclean
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/Allrun b/tutorials/mesh/snappyHexMesh/directionalRefinement/Allrun
deleted file mode 100755
index fb62f26883..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/Allrun
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-runApplication blockMesh
-
-runApplication decomposePar
-
-runParallel snappyHexMesh -overwrite
-
-runApplication reconstructParMesh -constant
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/README.txt b/tutorials/mesh/snappyHexMesh/directionalRefinement/README.txt
deleted file mode 100644
index c0effe76b8..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Testcase for directional and automatic gap refinement. The geometry
-is two nested boxes
-with a single small pipe between them.
-
-- 1 cell initial mesh
-- consistent normal orientation of surface so
-  specify a 'gapMode' to limit refinement only to
-  gaps on the 'outside' of the surface
-- directional refinement 
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/constant/triSurface/mech_test.obj b/tutorials/mesh/snappyHexMesh/directionalRefinement/constant/triSurface/mech_test.obj
deleted file mode 100644
index d078954dc0..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/constant/triSurface/mech_test.obj
+++ /dev/null
@@ -1,124 +0,0 @@
-# Wavefront OBJ file
-# Regions:
-#     0    patch0
-#
-# points    : 40
-# triangles : 76
-#
-v 80 20 -20
-v -80 20 -20
-v 100 0 0
-v -100 0 0
-v 80 20 -280
-v -80 20 -280
-v 80 280 -100
-v -80 280 -100
-v 100 0 -300
-v -100 0 -300
-v 100 300 -120
-v -100 300 -120
-v 80 280 -280
-v -80 280 -280
-v 100 300 -300
-v -100 300 -300
-v 0 445 0
-v 0 445 -20
-v 3.53538 446.464 0
-v -3.53538 446.464 0
-v -3.53538 446.464 -20
-v 3.53538 446.464 -20
-v 5 450 0
-v -5 450 0
-v -5 450 -20
-v 5 450 -20
-v -3.53538 453.536 0
-v 3.53538 453.536 0
-v -3.53538 453.536 -20
-v 3.53538 453.536 -20
-v 0 455 0
-v 0 455 -20
-v 80 580 -20
-v -80 580 -20
-v 80 580 -100
-v -80 580 -100
-v 100 600 0
-v -100 600 0
-v 100 600 -120
-v -100 600 -120
-g patch0
-f 39 37 3
-f 4 3 37
-f 11 39 3
-f 15 11 3
-f 9 15 3
-f 10 9 3
-f 10 3 4
-f 40 37 39
-f 19 4 37
-f 38 37 40
-f 27 37 38
-f 23 19 37
-f 28 23 37
-f 31 28 37
-f 27 31 37
-f 40 39 11
-f 16 11 15
-f 12 11 16
-f 40 11 12
-f 16 15 9
-f 16 9 10
-f 12 10 4
-f 38 12 4
-f 24 38 4
-f 20 24 4
-f 17 20 4
-f 19 17 4
-f 12 16 10
-f 38 40 12
-f 27 38 24
-f 25 24 20
-f 29 27 24
-f 29 24 25
-f 21 20 17
-f 21 25 20
-f 18 17 19
-f 21 17 18
-f 22 19 23
-f 18 19 22
-f 26 23 28
-f 22 23 26
-f 30 28 31
-f 26 28 30
-f 32 31 27
-f 30 31 32
-f 32 27 29
-f 7 5 1
-f 2 1 5
-f 33 7 1
-f 26 33 1
-f 34 1 2
-f 21 1 34
-f 22 26 1
-f 18 22 1
-f 21 18 1
-f 7 13 5
-f 6 5 13
-f 6 2 5
-f 14 13 7
-f 6 13 14
-f 33 35 7
-f 8 7 35
-f 14 7 8
-f 34 35 33
-f 36 35 34
-f 8 35 36
-f 30 34 33
-f 26 30 33
-f 36 34 2
-f 8 36 2
-f 14 8 2
-f 6 14 2
-f 29 25 34
-f 21 34 25
-f 32 29 34
-f 30 32 34
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/blockMeshDict b/tutorials/mesh/snappyHexMesh/directionalRefinement/system/blockMeshDict
deleted file mode 100644
index db9ee702e1..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/blockMeshDict
+++ /dev/null
@@ -1,102 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-scale   1;
-
-vertices
-(
-    (-400 -100  -400)
-    ( 400 -100  -400)
-    ( 400  700  -400)
-    (-400  700  -400)
-    (-400 -100   400)
-    ( 400 -100   400)
-    ( 400  700   400)
-    (-400  700   400)
-);
-
-blocks
-(
-    hex (0 1 2 3 4 5 6 7) (1 1 1) simpleGrading (1 1 1)
-);
-
-edges
-(
-);
-
-boundary
-(
-    maxY
-    {
-        type patch;
-        faces
-        (
-            (3 7 6 2)
-        );
-    }
-
-    minX
-    {
-        type patch;
-        faces
-        (
-            (0 4 7 3)
-        );
-    }
-
-    maxX
-    {
-        type patch;
-        faces
-        (
-            (2 6 5 1)
-        );
-    }
-
-    minY
-    {
-        type patch;
-        faces
-        (
-            (1 5 4 0)
-        );
-    }
-
-    ground
-    {
-        type patch;
-        faces
-        (
-            (0 3 2 1)
-        );
-    }
-
-    maxZ
-    {
-        type patch;
-        faces
-        (
-            (4 5 6 7)
-        );
-    }
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/controlDict b/tutorials/mesh/snappyHexMesh/directionalRefinement/system/controlDict
deleted file mode 100644
index 02cd153dbf..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/controlDict
+++ /dev/null
@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus  s                               |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     snappyHexMesh;
-
-startFrom       startTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         2000;
-
-deltaT          1;
-
-writeControl    timeStep;
-
-writeInterval   100;
-
-purgeWrite      0;
-
-writeFormat     binary;
-
-writePrecision  6;
-
-writeCompression off;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable true;
-
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/decomposeParDict b/tutorials/mesh/snappyHexMesh/directionalRefinement/system/decomposeParDict
deleted file mode 100644
index d1a1efb7ca..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/decomposeParDict
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      decomposeParDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-numberOfSubdomains 8;
-
-method          scotch;
-
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/fvSchemes b/tutorials/mesh/snappyHexMesh/directionalRefinement/system/fvSchemes
deleted file mode 100644
index 4e8a70ccda..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/fvSchemes
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
-    default         steadyState;
-}
-
-gradSchemes
-{
-    default         Gauss linear;
-}
-
-divSchemes
-{
-    default         none;
-
-    div(phi,U)      bounded Gauss upwind;
-    div(phi,T)      bounded Gauss upwind;
-    div(phi,k)      bounded Gauss upwind;
-    div(phi,epsilon) bounded Gauss upwind;
-    div(phi,R)      bounded Gauss upwind;
-    div(R)          Gauss linear;
-    div((nuEff*dev(T(grad(U))))) Gauss linear;
-}
-
-laplacianSchemes
-{
-    default         Gauss linear limited corrected 0.333;
-}
-
-interpolationSchemes
-{
-    default         linear;
-}
-
-snGradSchemes
-{
-    default         limited corrected 0.333;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/fvSolution b/tutorials/mesh/snappyHexMesh/directionalRefinement/system/fvSolution
deleted file mode 100644
index b636426959..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/fvSolution
+++ /dev/null
@@ -1,69 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    p_rgh
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-08;
-        relTol          0.01;
-    }
-
-    "(U|T|k|epsilon)"
-    {
-        solver          PBiCGStab;
-        preconditioner  DILU;
-        tolerance       1e-07;
-        relTol          0.1;
-    }
-}
-
-SIMPLE
-{
-    nNonOrthogonalCorrectors 2;
-    pRefCell        0;
-    pRefValue       0;
-
-    residualControl
-    {
-        p_rgh           1e-2;
-        U               1e-4;
-        T               1e-3;
-
-        // possibly check turbulence fields
-        "(k|epsilon|omega)" 1e-3;
-    }
-}
-
-relaxationFactors
-{
-    fields
-    {
-        p_rgh           0.7;
-    }
-    equations
-    {
-        U               0.2;
-        T               0.5;
-        "(k|epsilon)"   0.7;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/meshQualityDict b/tutorials/mesh/snappyHexMesh/directionalRefinement/system/meshQualityDict
deleted file mode 100644
index 3d43ee3a28..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/meshQualityDict
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      meshQualityDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Include defaults parameters from master dictionary
-#includeEtc "caseDicts/meshQualityDict"
-
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/snappyHexMeshDict b/tutorials/mesh/snappyHexMesh/directionalRefinement/system/snappyHexMeshDict
deleted file mode 100644
index 24c6f10678..0000000000
--- a/tutorials/mesh/snappyHexMesh/directionalRefinement/system/snappyHexMeshDict
+++ /dev/null
@@ -1,326 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      snappyHexMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Which of the steps to run
-castellatedMesh true;
-snap            false;
-addLayers       false;
-
-
-// Geometry. Definition of all surfaces. All surfaces are of class
-// searchableSurface.
-// Surfaces are used
-// - to specify refinement for any mesh cell intersecting it
-// - to specify refinement for any mesh cell inside/outside/near
-// - to 'snap' the mesh boundary to the surface
-geometry
-{
-    mech_test.obj
-    {
-        type triSurfaceMesh;
-    }
-    all
-    {
-        type searchableBox;
-        min (-1000 -1000 -1000);
-        max (1000 1000 1000);
-    }
-
-    dirRefinement
-    {
-        type searchableBox;
-        min (-75 25 -275);
-        max ( 75 275 -25);
-    }
-};
-
-
-
-// Settings for the castellatedMesh generation.
-castellatedMeshControls
-{
-
-    // Refinement parameters
-    // ~~~~~~~~~~~~~~~~~~~~~
-
-    // If local number of cells is >= maxLocalCells on any processor
-    // switches from from refinement followed by balancing
-    // (current method) to (weighted) balancing before refinement.
-    maxLocalCells 100000;
-
-    // Overall cell limit (approximately). Refinement will stop immediately
-    // upon reaching this number so a refinement level might not complete.
-    // Note that this is the number of cells before removing the part which
-    // is not 'visible' from the keepPoint. The final number of cells might
-    // actually be a lot less.
-    maxGlobalCells 2000000;
-
-    // The surface refinement loop might spend lots of iterations refining just a
-    // few cells. This setting will cause refinement to stop if <= minimumRefine
-    // are selected for refinement. Note: it will at least do one iteration
-    // (unless the number of cells to refine is 0)
-    minRefinementCells 0;
-
-    // Number of buffer layers between different levels.
-    // 1 means normal 2:1 refinement restriction, larger means slower
-    // refinement.
-    nCellsBetweenLevels 1;
-
-
-
-    // Explicit feature edge refinement
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Specifies a level for any cell intersected by its edges.
-    // This is a featureEdgeMesh, read from constant/triSurface for now.
-    features
-    (
-    );
-
-
-
-    // Surface based refinement
-    // ~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Specifies two levels for every surface. The first is the minimum level,
-    // every cell intersecting a surface gets refined up to the minimum level.
-    // The second level is the maximum level. Cells that 'see' multiple
-    // intersections where the intersections make an
-    // angle > resolveFeatureAngle get refined up to the maximum level.
-
-    refinementSurfaces
-    {
-        mech_test.obj
-        {
-            // Surface-wise min and max refinement level
-            level (0 0);
-        }
-    }
-
-    // Resolve sharp angles
-    resolveFeatureAngle 60;
-
-
-    // Region-wise refinement
-    // ~~~~~~~~~~~~~~~~~~~~~~
-
-    // Specifies refinement level for cells in relation to a surface. One of
-    // three modes
-    // - distance. 'levels' specifies per distance to the surface the
-    //   wanted refinement level. The distances need to be specified in
-    //   descending order.
-    // - inside. 'levels' is only one entry and only the level is used. All
-    //   cells inside the surface get refined up to the level. The surface
-    //   needs to be closed for this to be possible.
-    // - outside. Same but cells outside.
-
-    refinementRegions
-    {
-        all
-        {
-            mode        inside;
-
-            // Dummy base level
-            levels      ((10000 0));
-
-            // Optional: automatic gap refinement
-            // If cells
-            // - have level 0..9
-            // - and are in a gap < 3 cell sizes across
-            // - with the gap on the inside ('inside'), outside ('outside')
-            //   or both ('mixed') of the surface
-            // refine them. Ignores 'levels' and 'mode' settings
-            gapLevel    (4 0 10);
-            gapMode     outside;
-        }
-
-
-        dirRefinement
-        {
-            mode        inside;
-
-            // Disable uniform refinement
-            levels      ((10000 0));
-
-            // Optional: directional refinement
-            // (after all other refinement). Directional refinement
-            // for all cells according to 'mode' ('inside' or 'outside';
-            // 'distance' not supported) and within certain range. E.g.
-            //  - for all cells with level 2-5
-            //  - do one split in x direction and three splits in z direction.
-            // Ignores 'levels' and gap* settings. The resulting mesh is
-            // no longer compatible with e.g. dynamic refinement/unrefinement.
-            levelIncrement  (2 5 (1 0 3));
-        }
-    }
-
-
-    // Mesh selection
-    // ~~~~~~~~~~~~~~
-
-    // After refinement patches get added for all refinementSurfaces and
-    // all cells intersecting the surfaces get put into these patches. The
-    // section reachable from the locationInMesh is kept.
-    // NOTE: This point should never be on a face, always inside a cell, even
-    // after refinement.
-    locationInMesh (-100 -5 -300);
-
-
-    // Whether any faceZones (as specified in the refinementSurfaces)
-    // are only on the boundary of corresponding cellZones or also allow
-    // free-standing zone faces. Not used if there are no faceZones.
-    allowFreeStandingZoneFaces false;
-}
-
-
-
-// Settings for the snapping.
-snapControls
-{
-    //- Number of patch smoothing iterations before finding correspondence
-    //  to surface
-    nSmoothPatch 3;
-
-    //- Relative distance for points to be attracted by surface feature point
-    //  or edge. True distance is this factor times local
-    //  maximum edge length.
-    tolerance 2.0;
-
-    //- Number of mesh displacement relaxation iterations.
-    nSolveIter 30;
-
-    //- Maximum number of snapping relaxation iterations. Should stop
-    //  before upon reaching a correct mesh.
-    nRelaxIter 5;
-
-
-    // Feature snapping
-
-        //- Number of feature edge snapping iterations.
-        //  Leave out altogether to disable.
-        nFeatureSnapIter 10;
-
-        //- Detect (geometric) features by sampling the surface (default=false)
-        implicitFeatureSnap true;
-
-        //- Use castellatedMeshControls::features (default = true)
-        explicitFeatureSnap false;
-}
-
-
-
-// Settings for the layer addition.
-addLayersControls
-{
-    // Are the thickness parameters below relative to the undistorted
-    // size of the refined cell outside layer (true) or absolute sizes (false).
-    relativeSizes true;
-
-    // Per final patch (so not geometry!) the layer information
-    layers
-    {
-    }
-
-    // Expansion factor for layer mesh
-    expansionRatio 1.0;
-
-    // Wanted thickness of final added cell layer. If multiple layers
-    // is the thickness of the layer furthest away from the wall.
-    // Relative to undistorted size of cell outside layer.
-    // is the thickness of the layer furthest away from the wall.
-    // See relativeSizes parameter.
-    finalLayerThickness 0.5;
-
-    // Minimum thickness of cell layer. If for any reason layer
-    // cannot be above minThickness do not add layer.
-    // Relative to undistorted size of cell outside layer.
-    // See relativeSizes parameter.
-    minThickness 0.25;
-
-    // If points get not extruded do nGrow layers of connected faces that are
-    // also not grown. This helps convergence of the layer addition process
-    // close to features.
-    // Note: changed(corrected) w.r.t 17x! (didn't do anything in 17x)
-    nGrow 0;
-
-
-    // Advanced settings
-
-    // When not to extrude surface. 0 is flat surface, 90 is when two faces
-    // are perpendicular
-    featureAngle 60;
-
-    // Maximum number of snapping relaxation iterations. Should stop
-    // before upon reaching a correct mesh.
-    nRelaxIter 5;
-
-    // Number of smoothing iterations of surface normals
-    nSmoothSurfaceNormals 1;
-
-    // Number of smoothing iterations of interior mesh movement direction
-    nSmoothNormals 3;
-
-    // Smooth layer thickness over surface patches
-    nSmoothThickness 10;
-
-    // Stop layer growth on highly warped cells
-    maxFaceThicknessRatio 0.5;
-
-    // Reduce layer growth where ratio thickness to medial
-    // distance is large
-    maxThicknessToMedialRatio 0.3;
-
-    // Angle used to pick up medial axis points
-    // Note: changed(corrected) w.r.t 16x! 90 degrees corresponds to 130 in 16x.
-    minMedianAxisAngle 90;
-
-    // Create buffer region for new layer terminations
-    nBufferCellsNoExtrude 0;
-
-
-    // Overall max number of layer addition iterations. The mesher will exit
-    // if it reaches this number of iterations; possibly with an illegal
-    // mesh.
-    nLayerIter 50;
-}
-
-
-
-// Generic mesh quality settings. At any undoable phase these determine
-// where to undo.
-meshQualityControls
-{
-    #include "meshQualityDict"
-
-    // Advanced
-
-    //- Number of error distribution iterations
-    nSmoothScale 4;
-    //- amount to scale back displacement at error points
-    errorReduction 0.75;
-}
-
-
-// Advanced
-
-// Merge tolerance. Is fraction of overall bounding box of initial mesh.
-// Note: the write tolerance needs to be higher than this.
-mergeTolerance 1e-6;
-
-//debugFlags (mesh);
-//writeFlags (scalarLevels);
-
-// ************************************************************************* //

From 4cce1d74d2b4bc85eed7181dd9bd0377477ac43b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 15 Oct 2018 14:07:10 +0100
Subject: [PATCH 35/43] ENH: overset: do not trigger wall-wall interaction. See
 #1041.

---
 .../overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement
index 4e7cabf06d..543d8daad3 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement
@@ -33,7 +33,7 @@ boundaryField
         uniformValue    table
         (
             (0.0         (0 0 0))
-            (1.0         (0.31 0 0))
+            (1.0         (0.2 0 0))
             (2.0         (0 0 0))
         );
     }

From 03b5870c07faceaaf15437f89295d2dac26f0cf8 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 17 Oct 2018 08:54:34 +0100
Subject: [PATCH 36/43] ENH: overset: clean-up interpolation triggering. See
 #1041.

---
 .../oversetPolyPatch/oversetFvPatchField.C    | 102 ++++++++++--------
 1 file changed, 56 insertions(+), 46 deletions(-)

diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.C b/src/overset/oversetPolyPatch/oversetFvPatchField.C
index 16905ef7ac..b0698afc32 100644
--- a/src/overset/oversetPolyPatch/oversetFvPatchField.C
+++ b/src/overset/oversetPolyPatch/oversetFvPatchField.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -113,60 +113,27 @@ void Foam::oversetFvPatchField<Type>::initEvaluate
                     << fldName << endl;
             }
         }
-        else if
-        (
-           !fvSchemes.found("oversetInterpolation")
-         || (
-               fvSchemes.found("oversetInterpolationRequired")
-            == fvSchemes.found("oversetInterpolationSuppressed")
-            )
-        )
+        else if (!fvSchemes.found("oversetInterpolation"))
         {
             IOWarningInFunction(fvSchemes)
-                << "Missing required dictionary entries"
-                << " 'oversetInterpolation' and 'oversetInterpolationRequired'"
-                << " or 'oversetInterpolationSuppressed'"
+                << "Missing required dictionary entry"
+                << " 'oversetInterpolation'"
                 << ". Skipping overset interpolation for field "
                 << fldName << endl;
         }
-        else if (fvSchemes.found("oversetInterpolationSuppressed"))
+        else if (fvSchemes.found("oversetInterpolationRequired"))
         {
-             // Add the stencil suppression list
-            wordHashSet suppressed(Stencil::New(mesh).nonInterpolatedFields());
+            // Backwards compatibility mode: only interpolate what is
+            // explicitly mentioned
 
-            const dictionary* dictPtr
-            (
-                fvSchemes.findDict("oversetInterpolationSuppressed")
-            );
-
-            if (dictPtr)
+            if (fvSchemes.found("oversetInterpolationSuppressed"))
             {
-                suppressed.insert(dictPtr->toc());
+                FatalIOErrorInFunction(fvSchemes)
+                    << "Cannot have both dictionary entry"
+                    << " 'oversetInterpolationSuppresed' and "
+                    << " 'oversetInterpolationRequired' for field "
+                    << fldName << exit(FatalIOError);
             }
-
-            if (!suppressed.found(fldName))
-            {
-                if (debug)
-                {
-                    Info<< "Interpolating non-suppressed field " << fldName
-                        << endl;
-                }
-                mesh.interpolate
-                (
-                    const_cast<Field<Type>&>
-                    (
-                        this->primitiveField()
-                    )
-                );
-            }
-            else if (debug)
-            {
-                Info<< "Skipping suppressed overset interpolation for field "
-                    << fldName << endl;
-            }
-        }
-        else
-        {
             const dictionary& intDict = fvSchemes.subDict
             (
                 "oversetInterpolationRequired"
@@ -197,6 +164,49 @@ void Foam::oversetFvPatchField<Type>::initEvaluate
                     << fldName << endl;
             }
         }
+        else
+        {
+            const dictionary* dictPtr
+            (
+                fvSchemes.subDictPtr("oversetInterpolationSuppressed")
+            );
+
+            const wordHashSet& suppress =
+                Stencil::New(mesh).nonInterpolatedFields();
+
+            bool skipInterpolate = suppress.found(fldName);
+
+            if (dictPtr)
+            {
+                skipInterpolate =
+                    skipInterpolate
+                 || dictPtr->found(fldName);
+            }
+
+            if (skipInterpolate)
+            {
+                if (debug)
+                {
+                    Info<< "Skipping suppressed overset interpolation"
+                        << " for field " << fldName << endl;
+                }
+            }
+            else
+            {
+                if (debug)
+                {
+                    Info<< "Interpolating non-suppressed field " << fldName
+                        << endl;
+                }
+                mesh.interpolate
+                (
+                    const_cast<Field<Type>&>
+                    (
+                        this->primitiveField()
+                    )
+                );
+            }
+        }
     }
 }
 

From 8d590dd78047223e86811803139d4d8d3b275486 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 17 Oct 2018 08:55:55 +0100
Subject: [PATCH 37/43] STYLE: decompistionConstraint: indentation

---
 .../decompositionConstraint/decompositionConstraint.C        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
index 1bdd2a46b1..3be42dbba3 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/decompositionConstraint/decompositionConstraint.C
@@ -68,10 +68,7 @@ Foam::decompositionConstraint::New
             << exit(FatalIOError);
     }
 
-    return autoPtr<decompositionConstraint>
-    (
-        cstrIter()(dict, modelType)
-    );
+    return autoPtr<decompositionConstraint>(cstrIter()(dict, modelType));
 }
 
 

From 01737e14e7ed6e4f55411ba15a7a022f143a0fc5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 17 Oct 2018 09:13:35 +0100
Subject: [PATCH 38/43] BUG: removeFaces: do not remove if inbetween same
 cells. See #998.

This is the additional fix to make dynamic unrefinement work again.
---
 .../polyTopoChange/hexRef8/hexRef8.C          | 20 ++++++++++++-
 .../polyTopoChange/removeFaces.C              | 30 +++++++++++++++----
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index 0c0a5e2480..a66bd7c486 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -5572,9 +5572,27 @@ void Foam::hexRef8::setUnrefinement
 
         if (facesToRemove.size() != splitFaces.size())
         {
+            // Dump current mesh
+            {
+                const_cast<polyMesh&>(mesh_).setInstance
+                (
+                    mesh_.time().timeName()
+                );
+                mesh_.write();
+                pointSet pSet(mesh_, "splitPoints", splitPointLabels);
+                pSet.write();
+                faceSet fSet(mesh_, "splitFaces", splitFaces);
+                fSet.write();
+                faceSet removeSet(mesh_, "facesToRemove", facesToRemove);
+                removeSet.write();
+            }
+
             FatalErrorInFunction
                 << "Ininitial set of split points to unrefine does not"
                 << " seem to be consistent or not mid points of refined cells"
+                << " splitPoints:" << splitPointLabels.size()
+                << " splitFaces:" << splitFaces.size()
+                << " facesToRemove:" << facesToRemove.size()
                 << abort(FatalError);
         }
     }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
index 7baa85a3d1..496188b2ad 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
@@ -910,7 +910,7 @@ void Foam::removeFaces::setRefinement
         {
             if (nFacesPerEdge[edgeI] == 2)
             {
-                // See if they are two boundary faces
+                // Get the two face labels
                 label f0 = -1;
                 label f1 = -1;
 
@@ -920,7 +920,7 @@ void Foam::removeFaces::setRefinement
                 {
                     label facei = eFaces[i];
 
-                    if (!removedFace[facei] && !mesh_.isInternalFace(facei))
+                    if (!removedFace[facei])
                     {
                         if (f0 == -1)
                         {
@@ -934,7 +934,7 @@ void Foam::removeFaces::setRefinement
                     }
                 }
 
-                if (f0 != -1 && f1 != -1)
+                if (!mesh_.isInternalFace(f0) && !mesh_.isInternalFace(f1))
                 {
                     // Edge has two boundary faces remaining.
                     // See if should be merged.
@@ -979,7 +979,7 @@ void Foam::removeFaces::setRefinement
                         }
                     }
                 }
-                else if (f0 != -1 || f1 != -1)
+                else if (mesh_.isInternalFace(f0) != mesh_.isInternalFace(f1))
                 {
                     const edge& e = mesh_.edges()[edgeI];
 
@@ -1000,7 +1000,27 @@ void Foam::removeFaces::setRefinement
                 else
                 {
                     // Both kept faces are internal. Mark edge for preserving
-                    nFacesPerEdge[edgeI] = 3;
+                    // if inbetween different cells. If inbetween same cell
+                    // pair we probably want to merge them to
+                    //  - avoid upper-triangular ordering problems
+                    //  - allow hex unrefinement (expects single face inbetween
+                    //    cells)
+
+                    const edge ownEdge
+                    (
+                        cellRegion[mesh_.faceOwner()[f0]],
+                        cellRegion[mesh_.faceNeighbour()[f0]]
+                    );
+                    const edge neiEdge
+                    (
+                        cellRegion[mesh_.faceOwner()[f1]],
+                        cellRegion[mesh_.faceNeighbour()[f1]]
+                    );
+
+                    if (ownEdge != neiEdge)
+                    {
+                        nFacesPerEdge[edgeI] = 3;
+                    }
                 }
             }
         }

From 0a0fee88a045787988cbc54e0572e3595e67772c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 16 Oct 2018 23:03:38 +0200
Subject: [PATCH 39/43] STYLE: update fileName docs and minor code cleanup

---
 applications/test/fileName/Test-fileName.C    | 111 +++++++++++++++++-
 src/OpenFOAM/global/argList/argList.C         |   7 +-
 .../primitives/strings/fileName/fileName.C    |  27 +++--
 .../primitives/strings/fileName/fileName.H    |  58 +++++----
 .../primitives/strings/fileName/fileNameI.H   |   2 +-
 .../primitives/strings/string/string.C        |  25 ++--
 6 files changed, 177 insertions(+), 53 deletions(-)

diff --git a/applications/test/fileName/Test-fileName.C b/applications/test/fileName/Test-fileName.C
index 8d97b9f1f5..0300c5f8a7 100644
--- a/applications/test/fileName/Test-fileName.C
+++ b/applications/test/fileName/Test-fileName.C
@@ -47,6 +47,38 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+unsigned testClean(std::initializer_list<Pair<std::string>> tests)
+{
+    unsigned nFail = 0;
+
+    for (const Pair<std::string>& test : tests)
+    {
+        const std::string& input = test.first();
+        const std::string& expected = test.second();
+
+        fileName cleaned(test.first());
+        cleaned.clean();
+
+        if (cleaned == expected)
+        {
+            Info<< "(pass)"
+                << "  clean " << input << " -> " << cleaned << nl;
+        }
+        else
+        {
+            Info<< "(fail)"
+                << "  clean " << input << " -> " << cleaned
+                << "  expected=" << expected
+                << nl;
+
+            ++nFail;
+        }
+    }
+
+    return nFail;
+}
+
+
 unsigned testStrip
 (
     const bool doClean,
@@ -184,6 +216,16 @@ unsigned testRelative(std::initializer_list<Pair<std::string>> tests)
 }
 
 
+void testDirname(const fileName& input)
+{
+    Info<< "input:" << input
+        << "   path:" << input.path()
+        << "   name:\"" << input.name() << '"'
+        << "   ext:\"" << input.ext()  << '"'
+        << "   components: " << flatOutput(input.components()) << nl;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
@@ -196,6 +238,8 @@ int main(int argc, char *argv[])
     argList::addBoolOption("relative", "test relative operations");
     argList::addBoolOption("system", "test filesystem operations");
     argList::addBoolOption("default", "reinstate default tests");
+    argList::addBoolOption("clean", "clean()");
+    argList::addBoolOption("dirname", "basename/dirname tables");
     argList::addNote("runs default tests or specified ones only");
 
     #include "setRootCase.H"
@@ -254,6 +298,20 @@ int main(int argc, char *argv[])
         Info<< "All ==> " << file4 << nl;
     }
 
+    if (args.found("dirname"))
+    {
+        testDirname("");
+        testDirname(".");
+        testDirname("abc");
+        testDirname("/");
+        testDirname("/abc");
+        testDirname("abc/def");
+        testDirname("/abc/def");
+        testDirname("/abc/def/");
+        testDirname("/abc///def///");
+        testDirname("/abc/../def");
+    }
+
 
     // Test various ext() methods
     if (args.found("ext"))
@@ -381,6 +439,35 @@ int main(int argc, char *argv[])
     }
 
 
+    if (args.found("clean"))
+    {
+        Info<< nl << "Test fileName::clean()" << nl << nl;
+
+        unsigned nFail = testClean
+        ({
+            { "/", "/" },
+            { "/abc/", "/abc" },
+            { "/abc////def", "/abc/def" },
+            { "/abc/def/./ghi/.", "/abc/def/ghi" },
+            { "abc/def/./",   "abc/def" },
+            { "./abc/", "./abc" },
+            { "/abc/def/../ghi/jkl/nmo/..", "/abc/ghi/jkl" },
+            { "abc/../def/ghi/../jkl", "abc/../def/jkl" },
+        });
+
+        Info<< nl;
+        if (nFail)
+        {
+            Info<< "failed " << nFail;
+        }
+        else
+        {
+            Info<< "passed all";
+        }
+        Info<< " fileName::clean tests" << nl;
+    }
+
+
     if (args.found("validate"))
     {
         unsigned nFail = 0;
@@ -677,9 +764,27 @@ int main(int argc, char *argv[])
         << " controlDict => " << findEtcFile("controlDict") << nl
         << " badName => " << findEtcFile("badName") << endl;
 
-    Info<< "This should emit a fatal error:" << endl;
-    Info<< " badName(die) => " << findEtcFile("badName", true) << nl
-        << endl;
+    {
+
+        Info<< nl << "Expect a FatalError for findEtcFile() with a bad name:"
+            << nl;
+
+        const bool throwingError = FatalError.throwExceptions();
+
+        try
+        {
+            Info<< " badName(die) => " << flush
+                << findEtcFile("<very-badName>", true) << nl
+                << endl;
+        }
+        catch (Foam::error& err)
+        {
+            Info<< nl << "findEtcFile() Caught FatalError "
+                << err << nl << endl;
+        }
+        FatalError.throwExceptions(throwingError);
+    }
+
 
     Info<< "\nEnd\n" << endl;
     return 0;
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index aa7f6fe8ec..69fc40ccb4 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -735,10 +735,9 @@ void Foam::argList::setCasePaths()
             caseDir = cwd();
             options_.erase("case");
         }
-        else if (!caseDir.isAbsolute())
+        else
         {
-            caseDir = cwd()/caseDir;
-            caseDir.clean();
+            caseDir.toAbsolute();
         }
     }
     else
@@ -1126,7 +1125,7 @@ void Foam::argList::parse
                 source = options_["decomposeParDict"];
                 if (isDir(source))
                 {
-                    source = source/"decomposeParDict";
+                    source /= "decomposeParDict";
                     adjustOpt = true;
                 }
 
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index 6fda7a5c8f..e1e6a5ba30 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -209,15 +209,14 @@ Foam::fileName::Type Foam::fileName::type(const bool followLink) const
 
 Foam::fileName& Foam::fileName::toAbsolute()
 {
-    fileName& f = *this;
-
-    if (!f.isAbsolute())
+    if (!isAbsolute(*this))
     {
+        fileName& f = *this;
         f = cwd()/f;
         f.clean();
     }
 
-    return f;
+    return *this;
 }
 
 
@@ -482,9 +481,12 @@ Foam::fileName Foam::operator/(const string& a, const string& b)
 
 Foam::fileName Foam::search(const word& file, const fileName& directory)
 {
-    // Search the current directory for the file
-    fileNameList files(fileHandler().readDir(directory, fileName::FILE));
-    for (const fileName& item : files)
+    // Search current directory for the file
+    for
+    (
+        const fileName& item
+      : fileHandler().readDir(directory, fileName::FILE)
+    )
     {
         if (item == file)
         {
@@ -493,17 +495,20 @@ Foam::fileName Foam::search(const word& file, const fileName& directory)
     }
 
     // If not found search each of the sub-directories
-    fileNameList dirs(fileHandler().readDir(directory, fileName::DIRECTORY));
-    for (const fileName& item : dirs)
+    for
+    (
+        const fileName& item
+      : fileHandler().readDir(directory, fileName::DIRECTORY)
+    )
     {
         fileName path = search(file, directory/item);
-        if (path != fileName::null)
+        if (!path.empty())
         {
             return path;
         }
     }
 
-    return fileName::null;
+    return fileName();
 }
 
 
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.H b/src/OpenFOAM/primitives/strings/fileName/fileName.H
index 385c91c92e..78892c584b 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.H
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.H
@@ -157,7 +157,7 @@ public:
         );
 
         //- This is a specialized (possibly slower) version of compare()
-        //  that ignores duplicate or trailing slashes.
+        //- that ignores duplicate or trailing slashes.
         static bool equals(const std::string& s1, const std::string& s2);
 
 
@@ -229,14 +229,16 @@ public:
         //
         // Behaviour compared to /usr/bin/basename:
         // \verbatim
-        //    input           name()    basename
-        //    -----           ------    --------
-        //    "foo"           "foo"     "foo"
-        //    "/"             ""        "/"
-        //    "/foo"          "foo"     "foo"
-        //    "foo/bar"       "bar"     "bar"
-        //    "/foo/bar"      "bar"     "bar"
-        //    "/foo/bar/"     ""        "bar"
+        //    input           name()          basename
+        //    -----           ------          --------
+        //    ""              ""              ""
+        //    "abc"           "abc"           "abc"
+        //    "/"             ""              "/"
+        //    "/abc"          "abc"           "abc"
+        //    "abc/def"       "def"           "def"
+        //    "/abc/def"      "def"           "def"
+        //    "/abc/def/"     ""              "def"
+        //    "/abc/../def"   "def"           "def"
         // \endverbatim
         inline static std::string name(const std::string& str);
 
@@ -261,16 +263,18 @@ public:
         //- Return directory path name (part before last /)
         //  The result normally coresponds to a Foam::fileName
         //
-        //  Behaviour compared to /usr/bin/dirname:
-        //  \verbatim
+        // Behaviour compared to /usr/bin/dirname:
+        // \verbatim
         //    input           path()          dirname
         //    -----           ------          -------
-        //    "foo"           "."             "."
+        //    ""              "."             "."
+        //    "abc"           "."             "."
         //    "/"             "/"             "/"
-        //    "/foo"          "/"             "foo"
-        //    "foo/bar"       "foo"           "foo"
-        //    "/foo/bar"      "/foo"          "/foo"
-        //    "/foo/bar/"     "/foo/bar/"     "/foo"
+        //    "/abc"          "/"             "/"
+        //    "abc/def"       "abc"           "abc"
+        //    "/abc/def"      "/abc"          "/abc"
+        //    "/abc/def/"     "/abc/def"      "/abc"
+        //    "/abc/../def"   "/abc/.."       "/abc/.."
         // \endverbatim
         inline static std::string path(const std::string& str);
 
@@ -312,16 +316,18 @@ public:
 
         //- Return path components as wordList
         //
-        //  Behaviour:
-        //  \verbatim
-        //    Input           components()
-        //    -----           ------
-        //    "foo"           ("foo")
-        //    "/foo"          ("foo")
-        //    "foo/bar"       ("foo", "bar")
-        //    "/foo/bar"      ("foo", "bar")
-        //    "/foo/bar/"     ("foo", "bar")
-        //  \endverbatim
+        // Behaviour:
+        // \verbatim
+        //    input           components()
+        //    -----           ------------
+        //    ""              ()
+        //    "."             (".")
+        //    "abc"           ("abc")
+        //    "/abc"          ("abc")
+        //    "abc/def"       ("abc", "def")
+        //    "/abc/def"      ("abc", "def")
+        //    "/abc/def/"     ("abc", "def")
+        // \endverbatim
         wordList components(const char delimiter = '/') const;
 
         //- Return a single component of the path
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileNameI.H b/src/OpenFOAM/primitives/strings/fileName/fileNameI.H
index b135a69ede..cf8a96dcdc 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileNameI.H
+++ b/src/OpenFOAM/primitives/strings/fileName/fileNameI.H
@@ -140,7 +140,7 @@ inline bool Foam::fileName::isAbsolute(const std::string& str)
 
 inline bool Foam::fileName::isAbsolute() const
 {
-    return !empty() && operator[](0) == '/';
+    return isAbsolute(*this);
 }
 
 
diff --git a/src/OpenFOAM/primitives/strings/string/string.C b/src/OpenFOAM/primitives/strings/string/string.C
index b95a000862..29ab150c04 100644
--- a/src/OpenFOAM/primitives/strings/string/string.C
+++ b/src/OpenFOAM/primitives/strings/string/string.C
@@ -46,21 +46,30 @@ Foam::word Foam::string::ext() const
         return word::null;
     }
 
-    return substr(i+1, npos);
+    return substr(i+1);
 }
 
 
-bool Foam::string::ext(const Foam::word& ending)
+bool Foam::string::ext(const word& ending)
 {
-    if (!ending.empty() && !empty() && operator[](size()-1) != '/')
+    if (ending.empty() || empty() || back() == '/')
+    {
+        return false;
+    }
+    else if (ending[0] == '.')
+    {
+        if (ending.size() == 1)
+        {
+            return false;
+        }
+    }
+    else
     {
         append(1u, '.');
-        append(ending);
-
-        return true;
     }
+    append(ending);
 
-    return false;
+    return true;
 }
 
 
@@ -90,7 +99,7 @@ bool Foam::string::hasExt(const wordRe& ending) const
         return false;
     }
 
-    const std::string end = substr(i+1, npos);  // Compare *after* the dot
+    const std::string end = substr(i+1);  // Compare *after* the dot
     return ending.match(end);
 }
 

From 8b569b16d125637a6c2c7e2b463f6b9f1c19d6e5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 Oct 2018 07:59:26 +0200
Subject: [PATCH 40/43] STYLE: logical ops return bool (issue #1043)

- these currently only with bool parameters, but the return value should
  nonetheless always be a bool value:

      andOp(), orOp(), lessOp(), lessEqOp(), greaterOp(), greaterEqOp()

- renamed the unused eqEqOp() to equalOp() for naming consistency with
  the equal() global function.

ENH: equalOp() specialization for scalars

- function object version of the equal() function.
  The default constructor uses the same tolerance (VSMALL),
  but can also supply an alternative tolerance on construction.
---
 applications/test/hexRef8/Test-hexRef8.C | 14 ++----
 src/OpenFOAM/primitives/Scalar/Scalar.H  | 48 +++++++++++++++++-
 src/OpenFOAM/primitives/ops/ops.H        | 63 ++++++++++++++++--------
 3 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C
index a9459148a7..cb74d8fb29 100644
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@@ -48,12 +48,6 @@ using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-bool notEqual(const scalar s1, const scalar s2, const scalar tol)
-{
-    return mag(s1-s2) > tol;
-}
-
-
 // Main program:
 int main(int argc, char *argv[])
 {
@@ -180,6 +174,8 @@ int main(int argc, char *argv[])
     // Construct refiner. Read initial cell and point levels.
     hexRef8 meshCutter(mesh);
 
+    // Comparison for inequality
+    const auto isNotEqual = notEqualOp<scalar>(1e-10);
 
     while (runTime.loop())
     {
@@ -345,7 +341,7 @@ int main(int argc, char *argv[])
             Info<< "Uniform one field min = " << min
                 << "  max = " << max << endl;
 
-            if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
+            if (isNotEqual(min, 1) || isNotEqual(max, 1))
             {
                 FatalErrorInFunction
                     << "Uniform volVectorField not preserved."
@@ -369,7 +365,7 @@ int main(int argc, char *argv[])
             Info<< "Linear profile field min = " << min
                 << "  max = " << max << endl;
 
-            if (notEqual(max, 0.0, 1e-10) || notEqual(min, 0.0, 1e-10))
+            if (isNotEqual(min, 0) || isNotEqual(max, 0))
             {
                 Info<< "Linear profile not preserved."
                     << " Min and max should both be 0.0. min:" << min
@@ -390,7 +386,7 @@ int main(int argc, char *argv[])
             Info<< "Uniform surface field min = " << min
                 << "  max = " << max << endl;
 
-            if (notEqual(max, 1.0, 1e-10) || notEqual(min, 1.0, 1e-10))
+            if (isNotEqual(min, 1) || isNotEqual(max, 1))
             {
                 FatalErrorInFunction
                     << "Uniform surfaceScalarField not preserved."
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index 647d9ce923..ffb97436b8 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -39,7 +39,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// template specialisation for pTraits<Scalar>
+// Template specialisation for pTraits<Scalar>
 template<>
 class pTraits<Scalar>
 {
@@ -403,6 +403,52 @@ inline Scalar stabilise(const Scalar s, const Scalar tol)
 }
 
 
+// Specializations
+
+// Default definition in ops.H
+template<class T> struct equalOp;
+
+//- Compare scalar values for equality
+template<>
+struct equalOp<Scalar>
+{
+    const Scalar tolerance;
+
+    //- Construct with specified tolerance (non-negative value)
+    equalOp(Scalar tol = ScalarVSMALL)
+    :
+        tolerance(tol)
+    {}
+
+    bool operator()(const Scalar& a, const Scalar& b) const
+    {
+        return Foam::mag(a - b) <= tolerance;
+    }
+};
+
+
+// Default definition in ops.H
+template<class T> struct notEqualOp;
+
+//- Compare scalar values for inequality
+template<>
+struct notEqualOp<Scalar>
+{
+    const Scalar tolerance;
+
+    //- Construct with specified tolerance (non-negative value)
+    notEqualOp(Scalar tol = ScalarVSMALL)
+    :
+        tolerance(tol)
+    {}
+
+    bool operator()(const Scalar& a, const Scalar& b) const
+    {
+        return Foam::mag(a - b) > tolerance;
+    }
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
index 8f86cdd8d1..c179d716b9 100644
--- a/src/OpenFOAM/primitives/ops/ops.H
+++ b/src/OpenFOAM/primitives/ops/ops.H
@@ -25,12 +25,9 @@ InNamespace
     Foam
 
 Description
-    Various binary and unary operations, which can be used for example,
-    for parallel combine-reduce operations.
-
-    The information from all nodes is collected on the master node,
-    combined using the given combination function and the result is
-    broadcast to all nodes
+    Various function objects for unary and binary operations.
+    Can be used for parallel combine-reduce operations or other places
+    requiring a function object.
 
 \*---------------------------------------------------------------------------*/
 
@@ -79,10 +76,10 @@ EqOp(eqMag, x = mag(y))
 EqOp(plusEqMagSqr, x += magSqr(y))
 EqOp(maxEq, x = max(x, y))
 EqOp(minEq, x = min(x, y))
-EqOp(minMagSqrEq, x = (magSqr(x)<=magSqr(y) ? x : y))
-EqOp(maxMagSqrEq, x = (magSqr(x)>=magSqr(y) ? x : y))
+EqOp(minMagSqrEq, x = (magSqr(x) <= magSqr(y) ? x : y))
+EqOp(maxMagSqrEq, x = (magSqr(x) >= magSqr(y) ? x : y))
 EqOp(andEq, x = (x && y))
-EqOp(orEq, x  = (x || y))
+EqOp(orEq,  x = (x || y))
 
 EqOp(eqMinus, x = -y)
 
@@ -134,9 +131,32 @@ EqOp(nopEq, (void)x)
     };
 
 
-// ...
+// Operations taking two parameters (unaltered), returning bool
 
-#define weightedOp(opName, op)                                                 \
+#define BoolOp(opName, op)                                                     \
+                                                                               \
+    template<class T1, class T2>                                               \
+    struct opName##Op2                                                         \
+    {                                                                          \
+        bool operator()(const T1& x, const T2& y) const WARNRETURN             \
+        {                                                                      \
+            return op;                                                         \
+        }                                                                      \
+    };                                                                         \
+                                                                               \
+    template<class T>                                                          \
+    struct opName##Op                                                          \
+    {                                                                          \
+        bool operator()(const T& x, const T& y) const WARNRETURN               \
+        {                                                                      \
+            return op;                                                         \
+        }                                                                      \
+    };
+
+
+// Weighting operations
+
+#define WeightedOp(opName, op)                                                 \
                                                                                \
     template<class T, class CombineOp>                                         \
     class opName##WeightedOp                                                   \
@@ -178,18 +198,21 @@ Op(min, min(x, y))
 Op(minMagSqr, (magSqr(x)<=magSqr(y) ? x : y))
 Op(maxMagSqr, (magSqr(x)>=magSqr(y) ? x : y))
 Op(minMod, minMod(x, y))
-Op(and, x && y)
-Op(or, x || y)
-Op(eqEq, x == y)
-Op(less, x < y)
-Op(lessEq, x <= y)
-Op(greater, x > y)
-Op(greaterEq, x >= y)
 
-weightedOp(multiply, (weight*y))
+BoolOp(and, x && y)
+BoolOp(or, x || y)
+BoolOp(equal, x == y)
+BoolOp(notEqual, x != y)
+BoolOp(less, x < y)
+BoolOp(lessEq, x <= y)
+BoolOp(greater, x > y)
+BoolOp(greaterEq, x >= y)
+
+WeightedOp(multiply, (weight*y))
 
 #undef Op
-#undef weightedOp
+#undef BoolOp
+#undef WeightedOp
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

From e0255cfff25dcf4a96a4460b158e6d452d68b3b3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 Oct 2018 09:29:28 +0200
Subject: [PATCH 41/43] ENH: add compareOp for three-way comparison

- similar to the \c <=> operator in C++20.
  Primarily for use when defining cascaded sort function objects.
---
 applications/test/Tuple2/Test-Tuple2.C  | 66 ++++++++++++++++++++++---
 src/OpenFOAM/primitives/Scalar/Scalar.H | 22 +++++++++
 src/OpenFOAM/primitives/ops/ops.H       | 15 ++++++
 3 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/applications/test/Tuple2/Test-Tuple2.C b/applications/test/Tuple2/Test-Tuple2.C
index f505554c79..31b6ab008d 100644
--- a/applications/test/Tuple2/Test-Tuple2.C
+++ b/applications/test/Tuple2/Test-Tuple2.C
@@ -32,9 +32,39 @@ Description
 #include "label.H"
 #include "scalar.H"
 #include "List.H"
+#include "ops.H"
+#include <functional>
 
 using namespace Foam;
 
+// Test for special comparison operation using compareOp
+// Normal sort on label, reverse sort on scalar
+struct special1
+{
+    typedef Tuple2<label, scalar> type;
+
+    bool operator()(const type& a, const type& b) const
+    {
+        int val = compareOp<label>()(a.first(), b.first());
+        return (val == 0) ? (b.second() < a.second()) : (val < 0);
+    }
+};
+
+
+// Test for special comparison operation using compareOp
+// Normal sort on scalar, reverse sort on label
+struct special2
+{
+    typedef Tuple2<label, scalar> type;
+
+    bool operator()(const type& a, const type& b) const
+    {
+        scalar val = compareOp<scalar>()(a.second(), b.second());
+        return (val == 0) ? (b.first() < a.first()) : (val < 0);
+    }
+};
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // Main program:
 
@@ -46,19 +76,39 @@ int main()
 
     Info<< "tuple: "
         << t2 << " "
-        << t2.first() << " " << t2.second() << endl;
+        << t2.first() << " " << t2.second() << nl;
 
-    List<indexedScalar> list1(10);
-    forAll(list1, i)
+    // As list. Generated so that we have duplicate indices
+    List<indexedScalar> list1(3*4);
+    for (label i = 0; i < 4; ++i)
     {
-        list1[i] = indexedScalar(-i, i*i);
+        const label j = (i+1);
+        const label idx = ((i % 2) ? -1 : 1) * (j);
+
+        list1[i]   = indexedScalar(idx, (j*j));
+        list1[i+4] = indexedScalar(idx, 2*j);    // duplicate index
+        list1[i+8] = indexedScalar(idx+12, 2*j); // duplicate value
     }
 
-    sort(list1);
+    Info<< "Unsorted tuples:" << nl << list1 << nl;
 
-    Info<< "tuples:" << nl
-        << list1
-        << endl;
+    Foam::sort(list1, std::less<indexedScalar>());
+
+    Info<< "sorted tuples:" << nl << list1 << nl;
+
+    Foam::sort(list1, std::greater<indexedScalar>());
+
+    Info<< "reverse sorted tuples:" << nl << list1 << nl;
+
+    Foam::sort(list1, special1());
+
+    Info<< "special sorted tuples - sort on index, reverse on value:"
+        << nl << list1 << nl;
+
+    Foam::sort(list1, special2());
+
+    Info<< "special sorted tuples - sort on value, reverse on index:"
+        << nl << list1 << nl;
 
     Info<< "End\n" << endl;
 
diff --git a/src/OpenFOAM/primitives/Scalar/Scalar.H b/src/OpenFOAM/primitives/Scalar/Scalar.H
index ffb97436b8..c21d99d543 100644
--- a/src/OpenFOAM/primitives/Scalar/Scalar.H
+++ b/src/OpenFOAM/primitives/Scalar/Scalar.H
@@ -405,6 +405,28 @@ inline Scalar stabilise(const Scalar s, const Scalar tol)
 
 // Specializations
 
+// Default definition in ops.H
+template<class T> struct compareOp;
+
+//- Compare scalar values
+template<>
+struct compareOp<Scalar>
+{
+    const Scalar tolerance;
+
+    //- Construct with specified tolerance (non-negative value)
+    compareOp(Scalar tol = ScalarVSMALL)
+    :
+        tolerance(tol)
+    {}
+
+    Scalar operator()(const Scalar& a, const Scalar& b) const
+    {
+        return (mag(a - b) <= tolerance) ? 0 : (a - b);
+    }
+};
+
+
 // Default definition in ops.H
 template<class T> struct equalOp;
 
diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H
index c179d716b9..fd069ad4b0 100644
--- a/src/OpenFOAM/primitives/ops/ops.H
+++ b/src/OpenFOAM/primitives/ops/ops.H
@@ -216,6 +216,21 @@ WeightedOp(multiply, (weight*y))
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+//- Three-way comparison operation of two parameters,
+//  similar to the \c <=> operator in C++20.
+//
+//  \return a negative value for less, a positive value for greater,
+//      and zero for equal value.
+template<class T>
+struct compareOp
+{
+    int operator()(const T& a, const T& b) const WARNRETURN
+    {
+        return (a < b) ? -1 : (b < a) ? 1 : 0;
+    }
+};
+
+
 //- General get operation to extract the 'name' from an object as a word.
 //  The default implementation uses the 'name()' method commonly used within
 //  OpenFOAM.

From 8fabc325395979f0dfddd3d4fff0de0d692bb06e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 Oct 2018 16:44:10 +0200
Subject: [PATCH 42/43] ENH: simplify objectRegistry access names (issue #322)

  New name:  findObject(), cfindObject()
  Old name:  lookupObjectPtr()

      Return a const pointer or nullptr on failure.

  New name:  findObject()
  Old name:  --

      Return a non-const pointer or nullptr on failure.

  New name:  getObjectPtr()
  Old name:  lookupObjectRefPtr()

      Return a non-const pointer or nullptr on failure.
      Can be called on a const object and it will perform a
      const_cast.

- use these updated names and functionality in more places

NB: The older methods names are deprecated, but continue to be defined.
---
 .../phasesSystem/phaseSystem/phaseSystem.H    |  13 +-
 .../ThermalPhaseChangePhaseSystem.C           |  34 ++-
 .../regionFunctionObject.C                    |  31 ++-
 .../regionFunctionObject.H                    |  62 ++++--
 .../regionFunctionObjectTemplates.C           |  63 ++++--
 .../db/objectRegistry/objectRegistry.H        | 122 ++++++++---
 .../objectRegistry/objectRegistryTemplates.C  | 111 +++++-----
 .../matrices/lduMatrix/lduMatrix/lduMatrix.C  |   4 +-
 ...tletMachNumberPressureFvPatchScalarField.C |   2 +-
 ...eratureRadCoupledMixedFvPatchScalarField.C |   4 +-
 .../epsilonWallFunctionFvPatchScalarField.C   |   6 +-
 .../dynamicInkJetFvMesh/dynamicInkJetFvMesh.C |   4 +-
 .../dynamicMotionSolverListFvMesh.C           |   7 +-
 .../dynamicMultiMotionSolverFvMesh.C          |   3 +-
 .../fvMotionSolverEngineMesh.C                |   3 +-
 .../layeredEngineMesh/layeredEngineMesh.C     |   3 +-
 ...IDControlInletVelocityFvPatchVectorField.C |  22 +-
 .../waveSurfacePressureFvPatchScalarField.C   |   6 +-
 .../CrankNicolsonDdtScheme.C                  |   5 +-
 .../gradSchemes/gradScheme/gradScheme.C       |  25 +--
 .../LimitedScheme/LimitedScheme.C             |   8 +-
 .../volPointInterpolate.C                     | 177 +++++++---------
 .../field/externalCoupled/externalCoupled.C   |   6 +-
 .../externalCoupledTemplates.C                |   6 +-
 .../fieldAverageItemTemplates.C               |   8 +-
 .../fieldAverage/fieldAverageTemplates.C      |   2 +-
 .../fieldExtents/fieldExtentsTemplates.C      |   2 +-
 .../field/fluxSummary/fluxSummary.C           |   4 +-
 .../field/readFields/readFieldsTemplates.C    |   6 +-
 .../field/reference/referenceTemplates.C      |   2 +-
 src/functionObjects/field/setFlow/setFlow.C   |  13 +-
 .../stabilityBlendingFactor.C                 |  17 +-
 .../surfaceInterpolate/surfaceInterpolate.C   |  10 +-
 .../field/turbulenceFields/turbulenceFields.C |  10 +-
 .../turbulenceFieldsTemplates.C               |   7 +-
 .../field/vorticity/vorticity.C               |   6 +-
 .../field/wallShearStress/wallShearStress.C   |  42 +++-
 .../field/zeroGradient/zeroGradient.C         |  11 +-
 .../lagrangian/vtkCloud/vtkCloud.C            |   4 +-
 .../lagrangian/vtkCloud/vtkCloudTemplates.C   |   2 +-
 .../solvers/energyTransport/energyTransport.C |   4 +-
 .../solvers/scalarTransport/scalarTransport.C |  62 +++---
 .../ensightWrite/ensightWriteTemplates.C      |  12 +-
 .../removeRegisteredObject.C                  |  22 +-
 .../utilities/residuals/residuals.C           |   3 +-
 .../writeDictionary/writeDictionary.C         |   8 +-
 ...polatedDisplacementPointPatchVectorField.C |  10 +-
 .../viscousDissipation/viscousDissipation.C   |   9 +-
 .../interRegionHeatTransferModel.C            |   8 +-
 .../ParticleForces/Interface/InterfaceForce.C |   6 +-
 .../ParticleForces/Lift/LiftForce/LiftForce.C |   6 +-
 .../PressureGradient/PressureGradientForce.C  |   6 +-
 .../DispersionRASModel/DispersionRASModel.C   |  16 +-
 .../BrownianMotion/BrownianMotionForce.C      |   8 +-
 src/lumpedPointMotion/lumpedPointIOMovement.C |   2 +-
 src/lumpedPointMotion/lumpedPointMovement.C   |   2 +-
 .../coordinate/systems/coordinateSystems.C    |   3 +-
 .../regionCoupledBaseGAMGInterface.C          |  15 +-
 .../regionCoupledBase.C                       |  16 +-
 .../searchableSurfaceCollection.C             |   6 +-
 .../searchableSurfaceWithGaps.C               |   2 +-
 .../triSurfaceMesh/triSurfaceMesh.C           |  15 +-
 .../refinementHistoryConstraint.C             |  55 ++---
 .../distributedTriSurfaceMesh.C               |  12 +-
 .../energyRegionCoupledFvPatchScalarField.C   |  12 +-
 ...ysisTemperatureCoupledFvPatchScalarField.C |  41 ++--
 ...rolysisVelocityCoupledFvPatchVectorField.C |  42 ++--
 .../regionModel/regionModel/regionModelI.H    |  19 +-
 .../regionModel/regionModelTemplates.C        |  20 +-
 ...alphatFilmWallFunctionFvPatchScalarField.C |  24 +--
 .../nutkFilmWallFunctionFvPatchScalarField.C  |  13 +-
 .../liquidFilmThermo/liquidFilmThermo.C       |  16 +-
 .../isoSurface/sampledIsoSurface.C            | 198 +++++++-----------
 .../isoSurface/sampledIsoSurfaceCell.C        |   2 +-
 .../sampledThresholdCellFaces.C               |   2 +-
 .../surfMeshSampleDistanceSurfaceTemplates.C  |   2 +-
 .../plane/surfMeshSamplePlaneTemplates.C      |   2 +-
 .../surfMeshSample/surfMeshSampleTemplates.C  |   2 +-
 .../surfMeshSamplers/surfMeshSamplers.C       |   4 +-
 .../surfMeshSampleDiscreteTemplates.C         |   2 +-
 .../triSurfaceMesh/discreteSurfaceTemplates.C |   8 +-
 ...gidBodyDisplacementPointPatchVectorField.C |   2 +-
 .../surfaceFormats/vtk/VTKsurfaceFormat.C     |   4 +-
 .../basic/basicThermo/basicThermo.C           |  73 +++----
 .../greyMeanAbsorptionEmission.C              |  54 +++--
 .../wideBandAbsorptionEmission.C              |  46 ++--
 .../moleFractions/moleFractions.C             |  10 +-
 ...emperatureCoupledMixedFvPatchScalarField.C |  33 ++-
 .../rawTopoChangerFvMesh.C                    |   7 +-
 .../rawTopoChangerFvMeshTemplates.C           |   5 +-
 .../viscosityModels/Arrhenius/Arrhenius.C     |   7 +-
 .../viscosityModels/Arrhenius/Arrhenius.H     |   7 +-
 src/waveModels/waveModel/waveModelNew.C       |  13 +-
 .../rutlandVortex2D/system/preProcess         |  19 +-
 94 files changed, 918 insertions(+), 952 deletions(-)

diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
index 031587beeb..932b3a3f8e 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
@@ -260,13 +260,7 @@ public:
         virtual volScalarField& he()
         {
             NotImplemented;
-            return
-            (
-                const_cast<volScalarField&>
-                (
-                    volScalarField::null()
-                )
-            );
+            return const_cast<volScalarField&>(volScalarField::null());
         }
 
         //- Return access to the inernal energy field [J/Kg]
@@ -274,10 +268,7 @@ public:
         virtual const volScalarField& he() const
         {
            NotImplemented;
-           return
-           (
-                volScalarField::null()
-           );
+           return volScalarField::null();
         }
 
         //- Enthalpy/Internal energy
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index 0a2377b2f3..dfd3a346cc 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -131,19 +131,15 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::heatTransfer() const
             dimensionedScalar(dimensionSet(1,-1,-3,0,0), Zero)
         );
 
-        if
-        (
-            otherPhase.mesh().foundObject<volScalarField>
+        const volScalarField* alphatPtr =
+            otherPhase.mesh().findObject<volScalarField>
             (
                 "alphat." +  otherPhase.name()
-            )
-        )
+            );
+
+        if (alphatPtr)
         {
-            const volScalarField& alphat =
-                otherPhase.mesh().lookupObject<volScalarField>
-                (
-                    "alphat." +  otherPhase.name()
-                );
+            const volScalarField& alphat = *alphatPtr;
 
             const fvPatchList& patches = this->mesh().boundary();
             forAll(patches, patchi)
@@ -427,19 +423,15 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
             dimensionedScalar(dimDensity/dimTime, Zero)
         );
 
-        if
-        (
-            phase2.mesh().foundObject<volScalarField>
+        const volScalarField* alphatPtr =
+            phase2.mesh().findObject<volScalarField>
             (
-                "alphat." +  phase2.name()
-            )
-        )
+                "alphat." + phase2.name()
+            );
+
+        if (alphatPtr)
         {
-            const volScalarField& alphat =
-                phase2.mesh().lookupObject<volScalarField>
-                (
-                    "alphat." +  phase2.name()
-                );
+            const volScalarField& alphat = *alphatPtr;
 
             const fvPatchList& patches = this->mesh().boundary();
             forAll(patches, patchi)
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C
index 21508c38bf..90bdee1e34 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C
@@ -52,10 +52,8 @@ Foam::functionObjects::regionFunctionObject::whichSubRegistry
     {
         return obr.lookupObject<objectRegistry>(subName);
     }
-    else
-    {
-        return obr;
-    }
+
+    return obr;
 }
 
 
@@ -71,22 +69,19 @@ bool Foam::functionObjects::regionFunctionObject::writeObject
     const word& fieldName
 )
 {
-    const regIOobject* objPtr =
-        this->lookupObjectPtr<regIOobject>(fieldName);
+    const regIOobject* obj = this->findObject<regIOobject>(fieldName);
 
-    if (objPtr)
+    if (obj)
     {
         Log << "    functionObjects::" << type() << " " << name()
-            << " writing field: " << objPtr->name() << endl;
+            << " writing field: " << obj->name() << endl;
 
-        objPtr->write();
+        obj->write();
 
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 
@@ -95,12 +90,14 @@ bool Foam::functionObjects::regionFunctionObject::clearObject
     const word& fieldName
 )
 {
-    regIOobject* objPtr = lookupObjectRefPtr<regIOobject>(fieldName);
-    if (objPtr)
+    // Same as getObjectPtr, since the object is already non-const
+    regIOobject* obj = this->findObject<regIOobject>(fieldName);
+
+    if (obj)
     {
-        if (objPtr->ownedByRegistry())
+        if (obj->ownedByRegistry())
         {
-            return objPtr->checkOut();
+            return obj->checkOut();
         }
         else
         {
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
index 8ce0f95b86..f8a83ee5bf 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -94,6 +94,35 @@ protected:
         template<class ObjectType>
         bool foundObject(const word& fieldName) const;
 
+        //- Return const pointer to the object (eg, a field) in the
+        //- (sub) objectRegistry.
+        //
+        //  \return nullptr if the object was not found or had incorrect type.
+        template<class ObjectType>
+        const ObjectType* cfindObject(const word& fieldName) const;
+
+        //- Return const pointer to the object (eg, a field) in the
+        //- (sub) objectRegistry.
+        //
+        //  \return nullptr if the object was not found or had incorrect type.
+        template<class ObjectType>
+        const ObjectType* findObject(const word& fieldName) const;
+
+        //- Return non-const pointer to the object of the given Type,
+        //- (sub) objectRegistry.
+        //
+        //  \return nullptr if the object was not found or had incorrect type.
+        template<class ObjectType>
+        ObjectType* findObject(const word& fieldName);
+
+        //- Return non-const pointer to the object of the given Type,
+        //- using a const-cast to have it behave like a mutable.
+        //  Exercise caution when using.
+        //
+        //  \return nullptr if the object was not found or had incorrect type.
+        template<class ObjectType>
+        ObjectType* getObjectPtr(const word& fieldName) const;
+
         //- Lookup and return object (eg, a field) from the (sub) objectRegistry
         template<class ObjectType>
         const ObjectType& lookupObject(const word& fieldName) const;
@@ -102,18 +131,6 @@ protected:
         template<class ObjectType>
         ObjectType& lookupObjectRef(const word& fieldName) const;
 
-        //- Lookup and return pointer to the object,
-        //  otherwise nullptr if the object was not found,
-        //  or had the incorrect type.
-        template<class ObjectType>
-        const ObjectType* lookupObjectPtr(const word& fieldName) const;
-
-        //- Lookup and return non-const pointer to the object,
-        //  otherwise nullptr if the object was not found,
-        //  or had the incorrect type.
-        template<class ObjectType>
-        ObjectType* lookupObjectRefPtr(const word& fieldName) const;
-
         //- Store the field in the (sub) objectRegistry under the given name
         //  Note: sets the fieldName to tfield().name() if not already set
         template<class ObjectType>
@@ -177,6 +194,25 @@ public:
 
         //- Read optional controls
         virtual bool read(const dictionary& dict);
+
+
+    // Housekeeping
+
+        //- Same as findObject
+        //  \deprecated use findObject (OCT-2018)
+        template<class ObjectType>
+        const ObjectType* lookupObjectPtr(const word& fieldName) const
+        {
+            return this->cfindObject<ObjectType>(fieldName);
+        }
+
+        //- Same as getObjectPtr
+        //  \deprecated use getObjectPtr (OCT-2018)
+        template<class ObjectType>
+        ObjectType* lookupObjectRefPtr(const word& fieldName) const
+        {
+            return this->getObjectPtr<ObjectType>(fieldName);
+        }
 };
 
 
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
index a18bff7070..fee651ea89 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,6 +38,47 @@ bool Foam::functionObjects::regionFunctionObject::foundObject
 }
 
 
+template<class ObjectType>
+const ObjectType* Foam::functionObjects::regionFunctionObject::cfindObject
+(
+    const word& fieldName
+) const
+{
+    return obr().cfindObject<ObjectType>(fieldName);
+}
+
+
+template<class ObjectType>
+const ObjectType* Foam::functionObjects::regionFunctionObject::findObject
+(
+    const word& fieldName
+) const
+{
+    return obr().findObject<ObjectType>(fieldName);
+}
+
+
+template<class ObjectType>
+ObjectType* Foam::functionObjects::regionFunctionObject::findObject
+(
+    const word& fieldName
+)
+{
+    // Need getObjectPtr to bypass const access on the objectRegistry
+    return obr().getObjectPtr<ObjectType>(fieldName);
+}
+
+
+template<class ObjectType>
+ObjectType* Foam::functionObjects::regionFunctionObject::getObjectPtr
+(
+    const word& fieldName
+) const
+{
+    return obr().getObjectPtr<ObjectType>(fieldName);
+}
+
+
 template<class ObjectType>
 const ObjectType& Foam::functionObjects::regionFunctionObject::lookupObject
 (
@@ -58,26 +99,6 @@ ObjectType& Foam::functionObjects::regionFunctionObject::lookupObjectRef
 }
 
 
-template<class ObjectType>
-const ObjectType* Foam::functionObjects::regionFunctionObject::lookupObjectPtr
-(
-    const word& fieldName
-) const
-{
-    return obr().lookupObjectPtr<ObjectType>(fieldName);
-}
-
-
-template<class ObjectType>
-ObjectType* Foam::functionObjects::regionFunctionObject::lookupObjectRefPtr
-(
-    const word& fieldName
-) const
-{
-    return obr().lookupObjectRefPtr<ObjectType>(fieldName);
-}
-
-
 template<class ObjectType>
 bool Foam::functionObjects::regionFunctionObject::store
 (
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index c4a021308f..042eef2448 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -231,8 +231,9 @@ public:
     // Lookup
 
         //- Lookup and return a const sub-objectRegistry.
-        //  Optionally create it if it does not exist.
-        //  If recursive, search parent registries.
+        //
+        //  \param forceCreate create it if it does not exist.
+        //  \param recursive search parent registries.
         const objectRegistry& subRegistry
         (
             const word& name,
@@ -250,7 +251,8 @@ public:
         HashTable<Type*> lookupClass(const bool strict = false);
 
         //- Is the named Type found?
-        //  If recursive, search parent registries.
+        //
+        //  \param recursive search parent registries
         template<class Type>
         bool foundObject
         (
@@ -258,8 +260,60 @@ public:
             const bool recursive = false
         ) const;
 
-        //- Lookup and return the object of the given Type.
-        //  If recursive, search parent registries.
+        //- Find const pointer to the object of the given Type.
+        //
+        //  \param recursive search parent registries
+        //
+        //  \return nullptr if the object was not found or had incorrect type.
+        template<class Type>
+        const Type* cfindObject
+        (
+            const word& name,
+            const bool recursive = false
+        ) const;
+
+        //- Return const pointer to the object of the given Type.
+        //
+        //  \param recursive search parent registries
+        //
+        //  \return nullptr if the object was not found or had incorrect type.
+        template<class Type>
+        const Type* findObject
+        (
+            const word& name,
+            const bool recursive = false
+        ) const;
+
+        //- Return non-const pointer to the object of the given Type.
+        //
+        //  \param recursive search parent registries
+        //
+        //  \return nullptr if the object was not found or had incorrect type.
+        template<class Type>
+        Type* findObject
+        (
+            const word& name,
+            const bool recursive = false
+        );
+
+        //- Return non-const pointer to the object of the given Type,
+        //- using a const-cast to have it behave like a mutable.
+        //  Exercise caution when using.
+        //
+        //  \param recursive search parent registries.
+        //
+        //  \return nullptr if the object was not found or had incorrect type.
+        template<class Type>
+        Type* getObjectPtr
+        (
+            const word& name,
+            const bool recursive = false
+        ) const;
+
+        //- Lookup and return const reference to the object
+        //- of the given Type. Fatal if not found or the wrong type.
+        //
+        //  \param recursive search parent registries.
         template<class Type>
         const Type& lookupObject
         (
@@ -267,8 +321,10 @@ public:
             const bool recursive = false
         ) const;
 
-        //- Lookup and return the object of the given Type.
-        //  If recursive, search parent registries.
+        //- Lookup and return non-const reference to the object
+        //- of the given Type. Fatal if not found or the wrong type.
+        //
+        //  \param recursive search parent registries.
         template<class Type>
         Type& lookupObjectRef
         (
@@ -276,30 +332,6 @@ public:
             const bool recursive = false
         ) const;
 
-        //- Lookup and return pointer to the object of the given Type,
-        //  otherwise nullptr if the object was not found,
-        //  or had the incorrect type.
-        //  If recursive, search parent registries.
-        template<class Type>
-        const Type* lookupObjectPtr
-        (
-            const word& name,
-            const bool recursive = false
-        ) const;
-
-
-        //- Lookup and return non-const pointer to the object
-        //  of the given Type,
-        //  otherwise nullptr if the object was not found,
-        //  or had the incorrect type.
-        //  If recursive, search parent registries.
-        template<class Type>
-        Type* lookupObjectRefPtr
-        (
-            const word& name,
-            const bool recursive = false
-        ) const;
-
 
     // Events
 
@@ -349,6 +381,34 @@ public:
             IOstream::compressionType cmp,
             const bool valid
         ) const;
+
+
+    // Housekeeping
+
+        //- Same as findObject
+        //  \deprecated use findObject (OCT-2018)
+        template<class Type>
+        const Type* lookupObjectPtr
+        (
+            const word& name,
+            bool recursive = false
+        ) const
+        {
+            return this->cfindObject<Type>(name, recursive);
+        }
+
+        //- Same as getObjectPtr
+        //
+        //  \deprecated use getObjectPtr (OCT-2018)
+        template<class Type>
+        Type* lookupObjectRefPtr
+        (
+            const word& name,
+            bool recursive = false
+        ) const
+        {
+            return this->getObjectPtr<Type>(name, recursive);
+        }
 };
 
 
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index 551f4055be..6cc9eba56a 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -156,7 +156,7 @@ Foam::HashTable<const Type*> Foam::objectRegistry::lookupClass
 
     forAllConstIters(*this, iter)
     {
-        if (strict ? isType<Type>(*iter()) : isA<Type>(*iter()))
+        if (strict ? isType<Type>(*iter()) : bool(isA<Type>(*iter())))
         {
             objectsOfClass.insert
             (
@@ -180,7 +180,7 @@ Foam::HashTable<Type*> Foam::objectRegistry::lookupClass
 
     forAllIters(*this, iter)
     {
-        if (strict ? isType<Type>(*iter()) : isA<Type>(*iter()))
+        if (strict ? isType<Type>(*iter()) : bool(isA<Type>(*iter())))
         {
             objectsOfClass.insert
             (
@@ -201,14 +201,71 @@ bool Foam::objectRegistry::foundObject
     const bool recursive
 ) const
 {
-    const Type* ptr = this->lookupObjectPtr<Type>(name, recursive);
+    return this->cfindObject<Type>(name, recursive);
+}
 
-    if (ptr)
+
+template<class Type>
+const Type* Foam::objectRegistry::cfindObject
+(
+    const word& name,
+    const bool recursive
+) const
+{
+    const_iterator iter = cfind(name);
+
+    if (iter.found())
     {
-        return true;
+        const Type* ptr = dynamic_cast<const Type*>(iter());
+
+        if (ptr)
+        {
+            return ptr;
+        }
+    }
+    else if (recursive && this->parentNotTime())
+    {
+        return parent_.cfindObject<Type>(name, recursive);
     }
 
-    return false;
+    return nullptr;
+}
+
+
+template<class Type>
+const Type* Foam::objectRegistry::findObject
+(
+    const word& name,
+    const bool recursive
+) const
+{
+    return this->cfindObject<Type>(name, recursive);
+}
+
+
+template<class Type>
+Type* Foam::objectRegistry::findObject
+(
+    const word& name,
+    const bool recursive
+)
+{
+    const Type* ptr = this->cfindObject<Type>(name, recursive);
+
+    return const_cast<Type*>(ptr);
+}
+
+
+template<class Type>
+Type* Foam::objectRegistry::getObjectPtr
+(
+    const word& name,
+    const bool recursive
+) const
+{
+    const Type* ptr = this->cfindObject<Type>(name, recursive);
+
+    return const_cast<Type*>(ptr);
 }
 
 
@@ -219,7 +276,7 @@ const Type& Foam::objectRegistry::lookupObject
     const bool recursive
 ) const
 {
-    const_iterator iter = find(name);
+    const_iterator iter = cfind(name);
 
     if (iter.found())
     {
@@ -270,44 +327,4 @@ Type& Foam::objectRegistry::lookupObjectRef
 }
 
 
-template<class Type>
-const Type* Foam::objectRegistry::lookupObjectPtr
-(
-    const word& name,
-    const bool recursive
-) const
-{
-    const_iterator iter = find(name);
-
-    if (iter.found())
-    {
-        const Type* ptr = dynamic_cast<const Type*>(iter());
-
-        if (ptr)
-        {
-            return ptr;
-        }
-    }
-    else if (recursive && this->parentNotTime())
-    {
-        return parent_.lookupObjectPtr<Type>(name, recursive);
-    }
-
-    return nullptr;
-}
-
-
-template<class Type>
-Type* Foam::objectRegistry::lookupObjectRefPtr
-(
-    const word& name,
-    const bool recursive
-) const
-{
-    const Type* ptr = this->lookupObjectPtr<Type>(name, recursive);
-
-    return const_cast<Type*>(ptr);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index e7a7beb6b4..63f51c4d31 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -338,12 +338,12 @@ void Foam::lduMatrix::setResidualField
     }
 
     IOField<scalar>* residualPtr =
-        lduMesh_.thisDb().lookupObjectRefPtr<IOField<scalar>>(lookupName);
+        lduMesh_.thisDb().getObjectPtr<IOField<scalar>>(lookupName);
 
     if (residualPtr)
     {
         const IOdictionary* dataPtr =
-            lduMesh_.thisDb().lookupObjectPtr<IOdictionary>("data");
+            lduMesh_.thisDb().findObject<IOdictionary>("data");
 
         if (dataPtr)
         {
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
index 0e4f3e24a3..a870da6462 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
@@ -165,7 +165,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::updateCoeffs()
     }
 
     const fluidThermo* thermoPtr =
-        db().lookupObjectPtr<fluidThermo>(basicThermo::dictName);
+        db().findObject<fluidThermo>(basicThermo::dictName);
 
     const volVectorField& U = db().lookupObject<volVectorField>(UName_);
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 2a761d2a49..2fa1e33b81 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -240,7 +240,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
 
         {
             const basicThermo* thermo =
-                nbrMesh.lookupObjectPtr<basicThermo>(basicThermo::dictName);
+                nbrMesh.findObject<basicThermo>(basicThermo::dictName);
 
             if (thermo)
             {
@@ -269,7 +269,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
         // Local inertia therm
         {
             const basicThermo* thermo =
-                mesh.lookupObjectPtr<basicThermo>(basicThermo::dictName);
+                mesh.findObject<basicThermo>(basicThermo::dictName);
 
             if (thermo)
             {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index c50aab9cb4..f5ccaf54f0 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -448,11 +448,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs()
 
     typedef DimensionedField<scalar, volMesh> FieldType;
 
-    FieldType& G =
-        const_cast<FieldType&>
-        (
-            db().lookupObject<FieldType>(turbModel.GName())
-        );
+    FieldType& G = db().lookupObjectRef<FieldType>(turbModel.GName());
 
     FieldType& epsilon = const_cast<FieldType&>(internalField());
 
diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
index a25277ed9c..440d170728 100644
--- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
+++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
@@ -117,9 +117,7 @@ bool Foam::dynamicInkJetFvMesh::update()
 
     fvMesh::movePoints(newPoints);
 
-    volVectorField& U =
-        const_cast<volVectorField&>(lookupObject<volVectorField>("U"));
-    U.correctBoundaryConditions();
+    lookupObjectRef<volVectorField>("U").correctBoundaryConditions();
 
     return true;
 }
diff --git a/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C b/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
index 2b75caa5fc..5874a32a17 100644
--- a/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
+++ b/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
@@ -91,10 +91,11 @@ bool Foam::dynamicMotionSolverListFvMesh::update()
 
         fvMesh::movePoints(points() + disp);
 
-        if (foundObject<volVectorField>("U"))
+        volVectorField* Uptr = getObjectPtr<volVectorField>("U");
+
+        if (Uptr)
         {
-            const_cast<volVectorField&>(lookupObject<volVectorField>("U"))
-            .correctBoundaryConditions();
+            Uptr->correctBoundaryConditions();
         }
     }
 
diff --git a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
index 1309e0e99e..2f93ca2fb2 100644
--- a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
+++ b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
@@ -182,8 +182,7 @@ bool Foam::dynamicMultiMotionSolverFvMesh::update()
 
     if (foundObject<volVectorField>("U"))
     {
-        const_cast<volVectorField&>(lookupObject<volVectorField>("U"))
-            .correctBoundaryConditions();
+        lookupObjectRef<volVectorField>("U").correctBoundaryConditions();
     }
     else if (!hasWarned)
     {
diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
index 583ddde324..7a9100e3cc 100644
--- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
+++ b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
@@ -91,8 +91,7 @@ void Foam::fvMotionSolverEngineMesh::move()
     if (engineDB_.foundObject<surfaceScalarField>("phi"))
     {
         surfaceScalarField& phi =
-            const_cast<surfaceScalarField&>
-            (engineDB_.lookupObject<surfaceScalarField>("phi"));
+            engineDB_.lookupObjectRef<surfaceScalarField>("phi");
 
         const volScalarField& rho =
             engineDB_.lookupObject<volScalarField>("rho");
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
index 390994257c..cd09b47d42 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
@@ -86,8 +86,7 @@ void Foam::layeredEngineMesh::move()
     if (engineDB_.foundObject<surfaceScalarField>("phi"))
     {
         surfaceScalarField& phi =
-            const_cast<surfaceScalarField&>
-            (engineDB_.lookupObject<surfaceScalarField>("phi"));
+            engineDB_.lookupObjectRef<surfaceScalarField>("phi");
 
         const volScalarField& rho =
             engineDB_.lookupObject<volScalarField>("rho");
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
index 0db2d9b520..246e4b5185 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -37,27 +37,19 @@ License
 const Foam::surfaceScalarField&
 Foam::pressurePIDControlInletVelocityFvPatchVectorField::facePressure() const
 {
-    const volScalarField& p(db().lookupObject<volScalarField>(pName_));
-
     const word pfName(pName_ + "f");
 
-    if (!db().foundObject<surfaceScalarField>(pfName))
-    {
-        surfaceScalarField* pfPtr
-        (
-            new surfaceScalarField(pfName, linearInterpolate(p))
-        );
+    const volScalarField& p = db().lookupObject<volScalarField>(pName_);
 
+    surfaceScalarField* pfPtr = db().getObjectPtr<surfaceScalarField>(pfName);
+
+    if (!pfPtr)
+    {
+        pfPtr = new surfaceScalarField(pfName, linearInterpolate(p));
         pfPtr->store();
     }
 
-    surfaceScalarField& pf
-    (
-        const_cast<surfaceScalarField&>
-        (
-            db().lookupObject<surfaceScalarField>(pfName)
-        )
-    );
+    surfaceScalarField& pf = *pfPtr;
 
     if (!pf.upToDate(p))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 440c1e2859..65985dab41 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -144,11 +144,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
     const scalar dt = db().time().deltaTValue();
 
     // retrieve non-const access to zeta field from the database
-    volVectorField& zeta =
-        const_cast<volVectorField&>
-        (
-            db().lookupObject<volVectorField>(zetaName_)
-        );
+    volVectorField& zeta = db().lookupObjectRef<volVectorField>(zetaName_);
     vectorField& zetap = zeta.boundaryFieldRef()[patchi];
 
     // lookup d/dt scheme from database for zeta
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 6d6f2061b5..8331fad013 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -171,10 +171,7 @@ CrankNicolsonDdtScheme<Type>::ddt0_
 
     DDt0Field<GeoField>& ddt0 = static_cast<DDt0Field<GeoField>&>
     (
-        const_cast<GeoField&>
-        (
-            mesh().objectRegistry::template lookupObject<GeoField>(name)
-        )
+        mesh().objectRegistry::template lookupObjectRef<GeoField>(name)
     );
 
     return ddt0;
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 414fe7b8ce..cb7207785c 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -103,10 +103,11 @@ Foam::fv::gradScheme<Type>::grad
         }
 
         solution::cachePrintMessage("Retrieving", name, vsf);
-        GradFieldType& gGrad = const_cast<GradFieldType&>
-        (
-            mesh().objectRegistry::template lookupObject<GradFieldType>(name)
-        );
+        GradFieldType& gGrad =
+            mesh().objectRegistry::template lookupObjectRef<GradFieldType>
+            (
+                name
+            );
 
         if (gGrad.upToDate(vsf))
         {
@@ -123,13 +124,11 @@ Foam::fv::gradScheme<Type>::grad
 
             solution::cachePrintMessage("Storing", name, vsf);
             regIOobject::store(tgGrad.ptr());
-            GradFieldType& gGrad = const_cast<GradFieldType&>
-            (
-                mesh().objectRegistry::template lookupObject<GradFieldType>
+            GradFieldType& gGrad =
+                mesh().objectRegistry::template lookupObjectRef<GradFieldType>
                 (
                     name
-                )
-            );
+                );
 
             return gGrad;
         }
@@ -138,13 +137,11 @@ Foam::fv::gradScheme<Type>::grad
     {
         if (mesh().objectRegistry::template foundObject<GradFieldType>(name))
         {
-            GradFieldType& gGrad = const_cast<GradFieldType&>
-            (
-                mesh().objectRegistry::template lookupObject<GradFieldType>
+            GradFieldType& gGrad =
+                mesh().objectRegistry::template lookupObjectRef<GradFieldType>
                 (
                     name
-                )
-            );
+                );
 
             if (gGrad.ownedByRegistry())
             {
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 9c19472a1f..22fa5d698c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -171,13 +171,7 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
         }
 
         surfaceScalarField& limiterField =
-            const_cast<surfaceScalarField&>
-            (
-                mesh.lookupObject<surfaceScalarField>
-                (
-                    limiterFieldName
-                )
-            );
+            mesh.lookupObjectRef<surfaceScalarField>(limiterFieldName);
 
         calcLimiter(phi, limiterField);
 
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 3a2c6e12a6..0139613742 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -372,20 +372,17 @@ Foam::volPointInterpolation::interpolate
     const pointMesh& pm = pointMesh::New(vf.mesh());
 
     // Construct tmp<pointField>
-    tmp<GeometricField<Type, pointPatchField, pointMesh>> tpf
+    auto tpf = tmp<GeometricField<Type, pointPatchField, pointMesh>>::New
     (
-        new GeometricField<Type, pointPatchField, pointMesh>
+        IOobject
         (
-            IOobject
-            (
-                "volPointInterpolate(" + vf.name() + ')',
-                vf.instance(),
-                pm.thisDb()
-            ),
-            pm,
-            vf.dimensions(),
-            patchFieldTypes
-        )
+            "volPointInterpolate(" + vf.name() + ')',
+            vf.instance(),
+            pm.thisDb()
+        ),
+        pm,
+        vf.dimensions(),
+        patchFieldTypes
     );
 
     interpolateInternalField(vf, tpf.ref());
@@ -427,73 +424,60 @@ Foam::volPointInterpolation::interpolate
     const pointMesh& pm = pointMesh::New(vf.mesh());
     const objectRegistry& db = pm.thisDb();
 
+    PointFieldType* pfPtr =
+        db.objectRegistry::template getObjectPtr<PointFieldType>(name);
+
     if (!cache || vf.mesh().changing())
     {
         // Delete any old occurrences to avoid double registration
-        if (db.objectRegistry::template foundObject<PointFieldType>(name))
+        if (pfPtr && pfPtr->ownedByRegistry())
         {
-            PointFieldType& pf = const_cast<PointFieldType&>
-            (
-                db.objectRegistry::template lookupObject<PointFieldType>(name)
-            );
-
-            if (pf.ownedByRegistry())
-            {
-                solution::cachePrintMessage("Deleting", name, vf);
-                pf.release();
-                delete &pf;
-            }
+            solution::cachePrintMessage("Deleting", name, vf);
+            pfPtr->release();
+            delete pfPtr;
         }
 
-
-        tmp<GeometricField<Type, pointPatchField, pointMesh>> tpf
+        auto tpf = tmp<GeometricField<Type, pointPatchField, pointMesh>>::New
         (
-            new GeometricField<Type, pointPatchField, pointMesh>
+            IOobject
             (
-                IOobject
-                (
-                    name,
-                    vf.instance(),
-                    pm.thisDb()
-                ),
-                pm,
-                vf.dimensions()
-            )
+                name,
+                vf.instance(),
+                pm.thisDb()
+            ),
+            pm,
+            vf.dimensions()
         );
 
         interpolate(vf, tpf.ref());
 
         return tpf;
     }
+
+
+    if (!pfPtr)
+    {
+        solution::cachePrintMessage("Calculating and caching", name, vf);
+
+        pfPtr = interpolate(vf, name, false).ptr();
+        regIOobject::store(pfPtr);
+    }
     else
     {
-        if (!db.objectRegistry::template foundObject<PointFieldType>(name))
+        PointFieldType& pf = *pfPtr;
+
+        if (pf.upToDate(vf))    //TBD: , vf.mesh().points()))
         {
-            solution::cachePrintMessage("Calculating and caching", name, vf);
-            tmp<PointFieldType> tpf = interpolate(vf, name, false);
-            PointFieldType* pfPtr = tpf.ptr();
-            regIOobject::store(pfPtr);
-            return *pfPtr;
+            solution::cachePrintMessage("Reusing", name, vf);
         }
         else
         {
-            PointFieldType& pf = const_cast<PointFieldType&>
-            (
-                db.objectRegistry::template lookupObject<PointFieldType>(name)
-            );
-
-            if (pf.upToDate(vf))    //TBD: , vf.mesh().points()))
-            {
-                solution::cachePrintMessage("Reusing", name, vf);
-            }
-            else
-            {
-                solution::cachePrintMessage("Updating", name, vf);
-                interpolate(vf, pf);
-            }
-            return pf;
+            solution::cachePrintMessage("Updating", name, vf);
+            interpolate(vf, pf);
         }
     }
+
+    return *pfPtr;
 }
 
 
@@ -537,74 +521,61 @@ Foam::volPointInterpolation::interpolate
     const pointMesh& pm = pointMesh::New(vf.mesh());
     const objectRegistry& db = pm.thisDb();
 
+
+    PointFieldType* pfPtr =
+        db.objectRegistry::template getObjectPtr<PointFieldType>(name);
+
     if (!cache || vf.mesh().changing())
     {
         // Delete any old occurrences to avoid double registration
-        if (db.objectRegistry::template foundObject<PointFieldType>(name))
+        if (pfPtr && pfPtr->ownedByRegistry())
         {
-            PointFieldType& pf = const_cast<PointFieldType&>
-            (
-                db.objectRegistry::template lookupObject<PointFieldType>(name)
-            );
-
-            if (pf.ownedByRegistry())
-            {
-                solution::cachePrintMessage("Deleting", name, vf);
-                pf.release();
-                delete &pf;
-            }
+            solution::cachePrintMessage("Deleting", name, vf);
+            pfPtr->release();
+            delete pfPtr;
         }
 
-
-        tmp<DimensionedField<Type, pointMesh>> tpf
+        auto tpf = tmp<DimensionedField<Type, pointMesh>>::New
         (
-            new DimensionedField<Type, pointMesh>
+            IOobject
             (
-                IOobject
-                (
-                    name,
-                    vf.instance(),
-                    pm.thisDb()
-                ),
-                pm,
-                vf.dimensions()
-            )
+                name,
+                vf.instance(),
+                pm.thisDb()
+            ),
+            pm,
+            vf.dimensions()
         );
 
         interpolateDimensionedInternalField(vf, tpf.ref());
 
         return tpf;
     }
+
+
+    if (!pfPtr)
+    {
+        solution::cachePrintMessage("Calculating and caching", name, vf);
+        pfPtr = interpolate(vf, name, false).ptr();
+
+        regIOobject::store(pfPtr);
+    }
     else
     {
-        if (!db.objectRegistry::template foundObject<PointFieldType>(name))
+        PointFieldType& pf = *pfPtr;
+
+        if (pf.upToDate(vf))    //TBD: , vf.mesh().points()))
         {
-            solution::cachePrintMessage("Calculating and caching", name, vf);
-            tmp<PointFieldType> tpf = interpolate(vf, name, false);
-            PointFieldType* pfPtr = tpf.ptr();
-            regIOobject::store(pfPtr);
-            return *pfPtr;
+            solution::cachePrintMessage("Reusing", name, vf);
         }
         else
         {
-            PointFieldType& pf = const_cast<PointFieldType&>
-            (
-                db.objectRegistry::template lookupObject<PointFieldType>(name)
-            );
-
-            if (pf.upToDate(vf))    //TBD: , vf.mesh().points()))
-            {
-                solution::cachePrintMessage("Reusing", name, vf);
-            }
-            else
-            {
-                solution::cachePrintMessage("Updating", name, vf);
-                interpolateDimensionedInternalField(vf, pf);
-            }
-
-            return pf;
+            solution::cachePrintMessage("Updating", name, vf);
+            interpolateDimensionedInternalField(vf, pf);
         }
     }
+
+    return *pfPtr;
 }
 
 
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 91450209a9..0c49fd20ef 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -415,7 +415,7 @@ void Foam::functionObjects::externalCoupled::initCoupling()
         UPtrList<const fvMesh> meshes(regionNames.size());
         forAll(regionNames, regi)
         {
-            meshes.set(regi, time_.lookupObjectPtr<fvMesh>(regionNames[regi]));
+            meshes.set(regi, time_.findObject<fvMesh>(regionNames[regi]));
         }
 
         const labelList& groups = regionToGroups_[compName];
@@ -692,7 +692,7 @@ void Foam::functionObjects::externalCoupled::readDataMaster()
         UPtrList<const fvMesh> meshes(regionNames.size());
         forAll(regionNames, regi)
         {
-            meshes.set(regi, time_.lookupObjectPtr<fvMesh>(regionNames[regi]));
+            meshes.set(regi, time_.findObject<fvMesh>(regionNames[regi]));
         }
 
         const labelList& groups = regionToGroups_[compName];
@@ -736,7 +736,7 @@ void Foam::functionObjects::externalCoupled::writeDataMaster() const
         UPtrList<const fvMesh> meshes(regionNames.size());
         forAll(regionNames, regi)
         {
-            meshes.set(regi, time_.lookupObjectPtr<fvMesh>(regionNames[regi]));
+            meshes.set(regi, time_.findObject<fvMesh>(regionNames[regi]));
         }
 
         const labelList& groups = regionToGroups_[compName];
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
index cd78f475f9..6b2f8ddc71 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
@@ -82,8 +82,7 @@ bool Foam::functionObjects::externalCoupled::readData
     label nFound = 0;
     for (const fvMesh& mesh : meshes)
     {
-        const volFieldType* vfptr =
-            mesh.lookupObjectPtr<volFieldType>(fieldName);
+        const volFieldType* vfptr = mesh.findObject<volFieldType>(fieldName);
 
         if (!vfptr)
         {
@@ -358,8 +357,7 @@ bool Foam::functionObjects::externalCoupled::writeData
 
     for (const fvMesh& mesh : meshes)
     {
-        const volFieldType* vfptr =
-            mesh.lookupObjectPtr<volFieldType>(fieldName);
+        const volFieldType* vfptr = mesh.findObject<volFieldType>(fieldName);
 
         if (!vfptr)
         {
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemTemplates.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemTemplates.C
index f7a752b993..354b7e9440 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemTemplates.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemTemplates.C
@@ -37,7 +37,7 @@ bool Foam::functionObjects::fieldAverageItem::calculateMeanField
         return false;
     }
 
-    const Type* baseFieldPtr = obr.lookupObjectPtr<Type>(fieldName_);
+    const Type* baseFieldPtr = obr.findObject<Type>(fieldName_);
 
     if (!baseFieldPtr)
     {
@@ -122,7 +122,7 @@ bool Foam::functionObjects::fieldAverageItem::calculateMeanField
                     {
                         const word& fieldName = nameIter();
                         const scalar dt = timeIter();
-                        const Type* w = obr.lookupObjectPtr<Type>(fieldName);
+                        const Type* w = obr.findObject<Type>(fieldName);
 
                         meanField += dt*(*w);
 
@@ -173,7 +173,7 @@ bool Foam::functionObjects::fieldAverageItem::calculatePrime2MeanField
         return false;
     }
 
-    const Type1* baseFieldPtr = obr.lookupObjectPtr<Type1>(fieldName_);
+    const Type1* baseFieldPtr = obr.findObject<Type1>(fieldName_);
 
     if (!baseFieldPtr)
     {
@@ -258,7 +258,7 @@ bool Foam::functionObjects::fieldAverageItem::calculatePrime2MeanField
             {
                 const word& fieldName = nameIter();
                 const scalar dt = timeIter();
-                const Type1* w = obr.lookupObjectPtr<Type1>(fieldName);
+                const Type1* w = obr.findObject<Type1>(fieldName);
 
                 prime2MeanField += dt*(sqr((*w) - meanField));
 
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
index 5f34c9de2a..c994a764e5 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
@@ -119,7 +119,7 @@ void Foam::functionObjects::fieldAverage::restoreWindowFieldsType
 
     const word& fieldName = item.fieldName();
 
-    const Type* fieldPtr = lookupObjectPtr<Type>(fieldName);
+    const Type* fieldPtr = findObject<Type>(fieldName);
 
     if (!fieldPtr)
     {
diff --git a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
index 9ea87aef7d..f478f2eaca 100644
--- a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
+++ b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
@@ -54,7 +54,7 @@ void Foam::functionObjects::fieldExtents::calcFieldExtents
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
     const VolFieldType* fieldPtr =
-        obr_.lookupObjectPtr<VolFieldType>(fieldName);
+        obr_.findObject<VolFieldType>(fieldName);
 
     if (!fieldPtr)
     {
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 529c2d48d0..a001f9b2b7 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -129,7 +129,7 @@ void Foam::functionObjects::fluxSummary::initialiseSurface
     DynamicList<boolList>& faceFlip
 ) const
 {
-    const surfMesh* sPtr = mesh_.lookupObjectPtr<surfMesh>(surfName);
+    const surfMesh* sPtr = mesh_.findObject<surfMesh>(surfName);
     if (!sPtr)
     {
         FatalErrorInFunction
@@ -154,7 +154,7 @@ void Foam::functionObjects::fluxSummary::initialiseSurfaceAndDirection
     DynamicList<boolList>& faceFlip
 ) const
 {
-    const surfMesh* sPtr = mesh_.lookupObjectPtr<surfMesh>(surfName);
+    const surfMesh* sPtr = mesh_.findObject<surfMesh>(surfName);
     if (!sPtr)
     {
         FatalErrorInFunction
diff --git a/src/functionObjects/field/readFields/readFieldsTemplates.C b/src/functionObjects/field/readFields/readFieldsTemplates.C
index fa44cd4a4e..cdce885932 100644
--- a/src/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/functionObjects/field/readFields/readFieldsTemplates.C
@@ -47,13 +47,15 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
     }
     else if (foundObject<SurfaceFieldType>(fieldName))
     {
-        DebugInfo<< "readFields: " << SurfaceFieldType::typeName
+        DebugInfo
+            << "readFields: " << SurfaceFieldType::typeName
             << " " << fieldName << " already exists in database"
             << " already in database" << endl;
     }
     else if (foundObject<SurfFieldType>(fieldName))
     {
-        DebugInfo<< "readFields: " << SurfFieldType::typeName
+        DebugInfo
+            << "readFields: " << SurfFieldType::typeName
             << " " << fieldName << " already exists in database"
             << " already in database" << endl;
     }
diff --git a/src/functionObjects/field/reference/referenceTemplates.C b/src/functionObjects/field/reference/referenceTemplates.C
index f32150d233..e09713337d 100644
--- a/src/functionObjects/field/reference/referenceTemplates.C
+++ b/src/functionObjects/field/reference/referenceTemplates.C
@@ -30,7 +30,7 @@ bool Foam::functionObjects::reference::calcType()
 {
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
-    const VolFieldType* vfPtr = lookupObjectPtr<VolFieldType>(fieldName_);
+    const VolFieldType* vfPtr = findObject<VolFieldType>(fieldName_);
 
     if (vfPtr)
     {
diff --git a/src/functionObjects/field/setFlow/setFlow.C b/src/functionObjects/field/setFlow/setFlow.C
index 329e2e6b5d..2f89e687f6 100644
--- a/src/functionObjects/field/setFlow/setFlow.C
+++ b/src/functionObjects/field/setFlow/setFlow.C
@@ -66,7 +66,7 @@ Foam::functionObjects::setFlow::modeTypeNames
 void Foam::functionObjects::setFlow::setPhi(const volVectorField& U)
 {
     surfaceScalarField* phiptr =
-        mesh_.lookupObjectRefPtr<surfaceScalarField>(phiName_);
+        mesh_.getObjectPtr<surfaceScalarField>(phiName_);
 
     if (!phiptr)
     {
@@ -76,7 +76,7 @@ void Foam::functionObjects::setFlow::setPhi(const volVectorField& U)
     if (rhoName_ != "none")
     {
         const volScalarField* rhoptr =
-            mesh_.lookupObjectPtr<volScalarField>(rhoName_);
+            mesh_.findObject<volScalarField>(rhoName_);
 
         if (rhoptr)
         {
@@ -207,10 +207,11 @@ bool Foam::functionObjects::setFlow::read(const dictionary& dict)
 
 bool Foam::functionObjects::setFlow::execute()
 {
-    volVectorField* Uptr = mesh_.lookupObjectRefPtr<volVectorField>(UName_);
+    volVectorField* Uptr =
+        mesh_.getObjectPtr<volVectorField>(UName_);
 
     surfaceScalarField* phiptr =
-        mesh_.lookupObjectRefPtr<surfaceScalarField>(phiName_);
+        mesh_.getObjectPtr<surfaceScalarField>(phiName_);
 
     Log << nl << name() << ":" << nl;
 
@@ -431,13 +432,13 @@ bool Foam::functionObjects::setFlow::execute()
 
 bool Foam::functionObjects::setFlow::write()
 {
-    const auto& Uptr = mesh_.lookupObjectRefPtr<volVectorField>(UName_);
+    const auto* Uptr = mesh_.findObject<volVectorField>(UName_);
     if (Uptr)
     {
         Uptr->write();
     }
 
-    const auto& phiptr = mesh_.lookupObjectRefPtr<surfaceScalarField>(phiName_);
+    const auto* phiptr = mesh_.findObject<surfaceScalarField>(phiName_);
     if (phiptr)
     {
         phiptr->write();
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index 4e6045f8c1..1e0967cdb1 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -102,8 +102,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::calc()
 
 bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
 {
-    const IOField<scalar>* residualPtr =
-        mesh_.lookupObjectPtr<IOField<scalar>>(residualName_);
+    const auto* residualPtr = mesh_.findObject<IOField<scalar>>(residualName_);
 
     if (residuals_)
     {
@@ -164,7 +163,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
     }
 
     const volScalarField* nonOrthPtr =
-        mesh_.lookupObjectPtr<volScalarField>(nonOrthogonalityName_);
+        mesh_.findObject<volScalarField>(nonOrthogonalityName_);
 
     if (nonOrthogonality_)
     {
@@ -200,7 +199,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
     }
 
     const volScalarField* skewnessPtr =
-        mesh_.lookupObjectPtr<volScalarField>(skewnessName_);
+        mesh_.findObject<volScalarField>(skewnessName_);
 
     if (skewness_)
     {
@@ -235,7 +234,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
     }
 
     const volScalarField* faceWeightsPtr =
-        mesh_.lookupObjectPtr<volScalarField>(faceWeightName_);
+        mesh_.findObject<volScalarField>(faceWeightName_);
 
     if (faceWeight_)
     {
@@ -342,7 +341,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
 
 
     const volVectorField* UNamePtr =
-        mesh_.lookupObjectPtr<volVectorField>(UName_);
+        mesh_.findObject<volVectorField>(UName_);
 
     if (Co_)
     {
@@ -520,7 +519,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
     store(resultName_, faceBlendedPtr);
 
     const volScalarField* nonOrthPtr =
-        mesh_.lookupObjectPtr<volScalarField>(nonOrthogonalityName_);
+        mesh_.findObject<volScalarField>(nonOrthogonalityName_);
 
     if (nonOrthogonality_)
     {
@@ -552,7 +551,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
 
 
     const volScalarField* faceWeightsPtr =
-        mesh_.lookupObjectPtr<volScalarField>(faceWeightName_);
+        mesh_.findObject<volScalarField>(faceWeightName_);
 
     if (faceWeight_)
     {
@@ -583,7 +582,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
     }
 
     const volScalarField* skewnessPtr =
-        mesh_.lookupObjectPtr<volScalarField>(skewnessName_);
+        mesh_.findObject<volScalarField>(skewnessName_);
 
     if (skewness_)
     {
diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C
index 513cce3118..35ebcc203d 100644
--- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C
+++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C
@@ -107,14 +107,12 @@ bool Foam::functionObjects::surfaceInterpolate::write()
     {
         const word& fieldName = fieldSet_[i].second();
 
-        if (mesh_.foundObject<regIOobject>(fieldName))
+        const regIOobject* ioptr = obr_.findObject<regIOobject>(fieldName);
+
+        if (ioptr)
         {
             Log << "        " << fieldName << nl;
-
-            const regIOobject& field =
-                obr_.lookupObject<regIOobject>(fieldName);
-
-            field.write();
+            ioptr->write();
         }
         else
         {
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
index 559237b84a..3a257d5da6 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -103,12 +103,10 @@ bool Foam::functionObjects::turbulenceFields::compressible()
     {
         return false;
     }
-    else
-    {
-        FatalErrorInFunction
-            << "Turbulence model not found in database, deactivating"
-            << exit(FatalError);
-    }
+
+    FatalErrorInFunction
+        << "Turbulence model not found in database, deactivating"
+        << exit(FatalError);
 
     return false;
 }
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
index 98613fbc28..3bbbea07e2 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
@@ -38,10 +38,11 @@ void Foam::functionObjects::turbulenceFields::processField
 
     const word scopedName = modelName + ':' + fieldName;
 
-    if (obr_.foundObject<FieldType>(scopedName))
+    FieldType* fldPtr = obr_.getObjectPtr<FieldType>(scopedName);
+
+    if (fldPtr)
     {
-        FieldType& fld = obr_.lookupObjectRef<FieldType>(scopedName);
-        fld == tvalue();
+        (*fldPtr) == tvalue();
     }
     else if (obr_.found(scopedName))
     {
diff --git a/src/functionObjects/field/vorticity/vorticity.C b/src/functionObjects/field/vorticity/vorticity.C
index 6fd1d38bba..51849e356f 100644
--- a/src/functionObjects/field/vorticity/vorticity.C
+++ b/src/functionObjects/field/vorticity/vorticity.C
@@ -57,12 +57,8 @@ bool Foam::functionObjects::vorticity::calc()
             fvc::curl(lookupObject<volVectorField>(fieldName_))
         );
     }
-    else
-    {
-        return false;
-    }
 
-    return true;
+    return false;
 }
 
 
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index bbf4a3f394..0019687c56 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -183,28 +183,48 @@ bool Foam::functionObjects::wallShearStress::execute()
     volVectorField& wallShearStress =
         mesh_.lookupObjectRef<volVectorField>(type());
 
-    const word& turbModelName = turbulenceModel::propertiesName;
-    auto cmpModelPtr =
-        mesh_.lookupObjectPtr<compressible::turbulenceModel>(turbModelName);
-    auto icoModelPtr =
-        mesh_.lookupObjectPtr<incompressible::turbulenceModel>(turbModelName);
+    bool ok = false;
 
-    if (cmpModelPtr)
+    // compressible
+    if (!ok)
     {
-        calcShearStress(cmpModelPtr->devRhoReff(), wallShearStress);
+        typedef compressible::turbulenceModel turbType;
+
+        const turbType* modelPtr =
+            findObject<turbType>(turbulenceModel::propertiesName);
+
+        ok = modelPtr;
+
+        if (ok)
+        {
+            calcShearStress(modelPtr->devRhoReff(), wallShearStress);
+        }
     }
-    else if (icoModelPtr)
+
+    // incompressible
+    if (!ok)
     {
-        calcShearStress(icoModelPtr->devReff(), wallShearStress);
+        typedef incompressible::turbulenceModel turbType;
+
+        const turbType* modelPtr =
+            findObject<turbType>(turbulenceModel::propertiesName);
+
+        ok = modelPtr;
+
+        if (ok)
+        {
+            calcShearStress(modelPtr->devReff(), wallShearStress);
+        }
     }
-    else
+
+    if (!ok)
     {
         FatalErrorInFunction
             << "Unable to find turbulence model in the "
             << "database" << exit(FatalError);
     }
 
-    return true;
+    return ok;
 }
 
 
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.C b/src/functionObjects/field/zeroGradient/zeroGradient.C
index f5b36b79a7..719b38d900 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.C
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.C
@@ -176,16 +176,15 @@ bool Foam::functionObjects::zeroGradient::write()
     }
 
     // Consistent output order
-    const wordList outputList = results_.sortedToc();
-    for (const word& fieldName : outputList)
+    for (const word& fieldName : results_.sortedToc())
     {
-        if (foundObject<regIOobject>(fieldName))
-        {
-            const regIOobject& io = lookupObject<regIOobject>(fieldName);
+        const regIOobject* ioptr = findObject<regIOobject>(fieldName);
 
+        if (ioptr)
+        {
             Log << "    " << fieldName << endl;
 
-            io.write();
+            ioptr->write();
         }
     }
 
diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
index dbcbd464cd..07500761ac 100644
--- a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
+++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
@@ -106,7 +106,7 @@ bool Foam::functionObjects::vtkCloud::writeCloud
     const word& cloudName
 )
 {
-    const auto* objPtr = mesh_.lookupObjectPtr<cloud>(cloudName);
+    const auto* objPtr = mesh_.findObject<cloud>(cloudName);
     if (!objPtr)
     {
         return false;
@@ -127,7 +127,7 @@ bool Foam::functionObjects::vtkCloud::writeCloud
 
     objPtr->writeObjects(obrTmp);
 
-    const auto* pointsPtr = obrTmp.lookupObjectPtr<vectorField>("position");
+    const auto* pointsPtr = obrTmp.findObject<vectorField>("position");
 
     if (!pointsPtr)
     {
diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
index 16c07da5d5..b55d4d315c 100644
--- a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
+++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
@@ -52,7 +52,7 @@ Foam::wordList Foam::functionObjects::vtkCloud::writeFields
 
     for (const word& fieldName : fieldNames)
     {
-        const auto* fldPtr = obrTmp.lookupObjectPtr<IOField<Type>>(fieldName);
+        const auto* fldPtr = obrTmp.findObject<IOField<Type>>(fieldName);
 
         if (Pstream::master())
         {
diff --git a/src/functionObjects/solvers/energyTransport/energyTransport.C b/src/functionObjects/solvers/energyTransport/energyTransport.C
index 5fcb5c668e..931d15e77b 100644
--- a/src/functionObjects/solvers/energyTransport/energyTransport.C
+++ b/src/functionObjects/solvers/energyTransport/energyTransport.C
@@ -83,7 +83,7 @@ Foam::functionObjects::energyTransport::kappaEff() const
     {
         typedef incompressible::turbulenceModel turbType;
 
-        const turbType* turbPtr = lookupObjectPtr<turbType>
+        const turbType* turbPtr = findObject<turbType>
         (
             turbulenceModel::propertiesName
         );
@@ -305,7 +305,7 @@ Foam::functionObjects::energyTransport::energyTransport
             phases_.set
             (
                 i,
-                mesh_.lookupObjectRefPtr<volScalarField>(phaseNames_[i])
+                mesh_.getObjectPtr<volScalarField>(phaseNames_[i])
             );
         }
 
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index 7b89363a81..650a8a7723 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -88,10 +88,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
     const surfaceScalarField& phi
 ) const
 {
-    typedef incompressible::turbulenceModel icoModel;
-    typedef compressible::turbulenceModel cmpModel;
-
-    word Dname("D" + s.name());
+    const word Dname("D" + s.name());
 
     if (constantD_)
     {
@@ -109,38 +106,49 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
             dimensionedScalar(Dname, phi.dimensions()/dimLength, D_)
         );
     }
-    else if (nutName_ != "none")
+
+    if (nutName_ != "none")
     {
         const volScalarField& nutMean =
             mesh_.lookupObject<volScalarField>(nutName_);
 
         return tmp<volScalarField>::New(Dname, nutMean);
     }
-    else if (foundObject<icoModel>(turbulenceModel::propertiesName))
-    {
-        const icoModel& model = lookupObject<icoModel>
-        (
-            turbulenceModel::propertiesName
-        );
 
-        return tmp<volScalarField>::New
-        (
-            Dname,
-            alphaD_*model.nu() + alphaDt_*model.nut()
-        );
+    // Incompressible
+    {
+        const auto* turb =
+            findObject<incompressible::turbulenceModel>
+            (
+                turbulenceModel::propertiesName
+            );
+
+        if (turb)
+        {
+            return tmp<volScalarField>::New
+            (
+                Dname,
+                alphaD_ * turb->nu() + alphaDt_ * turb->nut()
+            );
+        }
     }
-    else if (foundObject<cmpModel>(turbulenceModel::propertiesName))
-    {
-        const cmpModel& model = lookupObject<cmpModel>
-        (
-            turbulenceModel::propertiesName
-        );
 
-        return tmp<volScalarField>::New
-        (
-            Dname,
-            alphaD_*model.mu() + alphaDt_*model.mut()
-        );
+    // Compressible
+    {
+        const auto* turb =
+            findObject<compressible::turbulenceModel>
+            (
+                turbulenceModel::propertiesName
+            );
+
+        if (turb)
+        {
+            return tmp<volScalarField>::New
+            (
+                Dname,
+                alphaD_ * turb->mu() + alphaDt_ * turb->mut()
+            );
+        }
     }
 
 
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C b/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
index a1da699b44..6958cc7f14 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
+++ b/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
@@ -38,10 +38,16 @@ int Foam::functionObjects::ensightWrite::writeVolField
     // State: return 0 (not-processed), -1 (skip), +1 ok
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
-    const VolFieldType* fldPtr;
+    // Already done
+    if (state)
+    {
+        return state;
+    }
 
-    // Already done, or not available
-    if (state || !(fldPtr = lookupObjectPtr<VolFieldType>(inputName)))
+    const VolFieldType* fldPtr = findObject<VolFieldType>(inputName);
+
+    // Not available
+    if (!fldPtr)
     {
         return state;
     }
diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
index 2441d6ab48..be038b55c5 100644
--- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
+++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
@@ -82,22 +82,18 @@ bool Foam::functionObjects::removeRegisteredObject::read(const dictionary& dict)
 
 bool Foam::functionObjects::removeRegisteredObject::execute()
 {
-    forAll(objectNames_, i)
+    for (const word& objName : objectNames_)
     {
-        if (foundObject<regIOobject>(objectNames_[i]))
+        regIOobject* ptr = getObjectPtr<regIOobject>(objName);
+
+        if (ptr && ptr->ownedByRegistry())
         {
-            const regIOobject& obj =
-                lookupObject<regIOobject>(objectNames_[i]);
+            Log << type() << " " << name() << " output:" << nl
+                << "    removing object " << ptr->name() << nl
+                << endl;
 
-            if (obj.ownedByRegistry())
-            {
-                Log << type() << " " << name() << " output:" << nl
-                    << "    removing object " << obj.name() << nl
-                    << endl;
-
-                const_cast<regIOobject&>(obj).release();
-                delete &obj;
-            }
+            ptr->release();
+            delete ptr;
         }
     }
 
diff --git a/src/functionObjects/utilities/residuals/residuals.C b/src/functionObjects/utilities/residuals/residuals.C
index 907fcdd205..a4aa02c51e 100644
--- a/src/functionObjects/utilities/residuals/residuals.C
+++ b/src/functionObjects/utilities/residuals/residuals.C
@@ -113,8 +113,7 @@ void Foam::functionObjects::residuals::writeField(const word& fieldName) const
 {
     const word residualName("initialResidual:" + fieldName);
 
-    const IOField<scalar>* residualPtr =
-        mesh_.lookupObjectPtr<IOField<scalar>>(residualName);
+    const auto* residualPtr = mesh_.findObject<IOField<scalar>>(residualName);
 
     if (residualPtr)
     {
diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.C b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
index a81e5a718b..1dc642d4fb 100644
--- a/src/functionObjects/utilities/writeDictionary/writeDictionary.C
+++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
@@ -160,10 +160,12 @@ bool Foam::functionObjects::writeDictionary::write()
     bool firstDict = true;
     forAll(dictNames_, i)
     {
-        if (obr_.foundObject<dictionary>(dictNames_[i]))
+        const dictionary* dictptr =
+            obr_.findObject<dictionary>(dictNames_[i]);
+
+        if (dictptr)
         {
-            const dictionary& dict =
-                obr_.lookupObject<dictionary>(dictNames_[i]);
+            const dictionary& dict = *dictptr;
 
             if (dict.digest() != digests_[i])
             {
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index ba7320d68f..5e927a434c 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -211,13 +211,9 @@ void uniformInterpolatedDisplacementPointPatchVectorField::updateCoeffs()
                 >(*fieldsCacheIter());
 
 
-                pointVectorField& d = const_cast<pointVectorField&>
-                (
-                    timeCache.lookupObject<pointVectorField>
-                    (
-                        fieldName_
-                    )
-                );
+                pointVectorField& d =
+                    timeCache.lookupObjectRef<pointVectorField>(fieldName_);
+
                 d.correctBoundaryConditions();
             }
         }
diff --git a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
index 6c0f0b0950..811eab1e62 100644
--- a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
+++ b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
@@ -106,7 +106,7 @@ Foam::fv::viscousDissipation::viscousDissipation
     )
 {
     const basicThermo* thermoPtr =
-        mesh_.lookupObjectPtr<basicThermo>(basicThermo::dictName);
+        mesh_.findObject<basicThermo>(basicThermo::dictName);
 
     if (thermoPtr)
     {
@@ -136,7 +136,7 @@ Foam::fv::viscousDissipation::devRhoReff() const
     // Incompressible
     {
         const auto* turbPtr =
-            mesh_.lookupObjectPtr<incompressible::turbulenceModel>
+            mesh_.findObject<incompressible::turbulenceModel>
             (
                 turbulenceModel::propertiesName
             );
@@ -150,7 +150,7 @@ Foam::fv::viscousDissipation::devRhoReff() const
     // Compressible
     {
         const auto* turbPtr =
-            mesh_.lookupObjectPtr<compressible::turbulenceModel>
+            mesh_.findObject<compressible::turbulenceModel>
             (
                 turbulenceModel::propertiesName
             );
@@ -196,8 +196,7 @@ void Foam::fv::viscousDissipation::addSup
     );
 
     // Cached?
-    const GradFieldType* gradUPtr =
-        mesh_.lookupObjectPtr<GradFieldType>(gradUName);
+    const GradFieldType* gradUPtr = mesh_.findObject<GradFieldType>(gradUName);
 
     if (gradUPtr)
     {
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index 0c0ee7252d..fe3ad19a9f 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -206,10 +206,12 @@ void Foam::fv::interRegionHeatTransferModel::addSup
     {
         if (he.dimensions() == dimEnergy/dimMass)
         {
-            if (mesh_.foundObject<basicThermo>(basicThermo::dictName))
+            const basicThermo* thermoPtr =
+                mesh_.findObject<basicThermo>(basicThermo::dictName);
+
+            if (thermoPtr)
             {
-                const basicThermo& thermo =
-                   mesh_.lookupObject<basicThermo>(basicThermo::dictName);
+                const basicThermo& thermo = *thermoPtr;
 
                 volScalarField htcByCpv(htc_/thermo.Cpv());
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index cbba2eb698..64bf5dcfb8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -101,10 +101,10 @@ void Foam::InterfaceForce<CloudType>::cacheFields(const bool store)
 
         if (fieldExists)
         {
-            const volVectorField& gradInterForce = this->mesh().template
-                lookupObject<volVectorField>(fName);
+            volVectorField& gradInterForce =
+                this->mesh().template lookupObjectRef<volVectorField>(fName);
 
-            const_cast<volVectorField&>(gradInterForce).checkOut();
+            gradInterForce.checkOut();
         }
     }
 }
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 cc45ca417d..ed757e32d6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
@@ -116,10 +116,10 @@ void Foam::LiftForce<CloudType>::cacheFields(const bool store)
 
         if (fieldExists)
         {
-            const volVectorField& curlUc = this->mesh().template
-                lookupObject<volVectorField>(fName);
+            volVectorField& curlUc =
+                this->mesh().template lookupObjectRef<volVectorField>(fName);
 
-            const_cast<volVectorField&>(curlUc).checkOut();
+            curlUc.checkOut();
         }
     }
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
index 2d1b322950..b84811e98e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
@@ -106,10 +106,10 @@ void Foam::PressureGradientForce<CloudType>::cacheFields(const bool store)
 
         if (fieldExists)
         {
-            const volVectorField& DUcDt = this->mesh().template
-                lookupObject<volVectorField>(fName);
+            volVectorField& DUcDt =
+                this->mesh().template lookupObjectRef<volVectorField>(fName);
 
-            const_cast<volVectorField&>(DUcDt).checkOut();
+            DUcDt.checkOut();
         }
     }
 }
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index b1116d76ce..82bbd3702e 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -41,11 +41,11 @@ Foam::DispersionRASModel<CloudType>::kModel() const
             this->owner().U().group()
         );
 
-    if (obr.foundObject<turbulenceModel>(turbName))
+    const turbulenceModel* turb = obr.findObject<turbulenceModel>(turbName);
+
+    if (turb)
     {
-        const turbulenceModel& model =
-            obr.lookupObject<turbulenceModel>(turbName);
-        return model.k();
+        return turb->k();
     }
 
     FatalErrorInFunction
@@ -69,11 +69,11 @@ Foam::DispersionRASModel<CloudType>::epsilonModel() const
             this->owner().U().group()
         );
 
-    if (obr.foundObject<turbulenceModel>(turbName))
+    const turbulenceModel* turb = obr.findObject<turbulenceModel>(turbName);
+
+    if (turb)
     {
-        const turbulenceModel& model =
-            obr.lookupObject<turbulenceModel>(turbName);
-        return model.epsilon();
+        return turb->epsilon();
     }
 
     FatalErrorInFunction
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index c2f42a8c10..2718f36e0e 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -64,11 +64,11 @@ Foam::BrownianMotionForce<CloudType>::kModel() const
             this->owner().U().group()
         );
 
-    if (obr.foundObject<turbulenceModel>(turbName))
+    const turbulenceModel* turb = obr.findObject<turbulenceModel>(turbName);
+
+    if (turb)
     {
-        const turbulenceModel& model =
-            obr.lookupObject<turbulenceModel>(turbName);
-        return model.k();
+        return turb->k();
     }
 
     FatalErrorInFunction
diff --git a/src/lumpedPointMotion/lumpedPointIOMovement.C b/src/lumpedPointMotion/lumpedPointIOMovement.C
index 81cc4073bb..2f9d02fba4 100644
--- a/src/lumpedPointMotion/lumpedPointIOMovement.C
+++ b/src/lumpedPointMotion/lumpedPointIOMovement.C
@@ -39,7 +39,7 @@ namespace Foam
 const Foam::lumpedPointIOMovement*
 Foam::lumpedPointIOMovement::lookupInRegistry(const objectRegistry& obr)
 {
-    return obr.lookupObjectPtr<lumpedPointIOMovement>
+    return obr.findObject<lumpedPointIOMovement>
     (
         lumpedPointMovement::canonicalName
     );
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index 3ef592ba70..8ecbe7e3c8 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -495,7 +495,7 @@ bool Foam::lumpedPointMovement::forcesAndMoments
     // Calculated force per patch - cache
     PtrMap<vectorField> forceOnPatches;
 
-    const volScalarField* pPtr = pmesh.lookupObjectPtr<volScalarField>(pName);
+    const volScalarField* pPtr = pmesh.findObject<volScalarField>(pName);
 
     // fvMesh and has pressure field
     if (isA<fvMesh>(pmesh) && pPtr)
diff --git a/src/meshTools/coordinate/systems/coordinateSystems.C b/src/meshTools/coordinate/systems/coordinateSystems.C
index 5fcb359ad5..0da9cb0c8b 100644
--- a/src/meshTools/coordinate/systems/coordinateSystems.C
+++ b/src/meshTools/coordinate/systems/coordinateSystems.C
@@ -240,8 +240,7 @@ const Foam::coordinateSystems& Foam::coordinateSystems::New
 {
     // Previously registered?
 
-    const coordinateSystems* ptr =
-        obr.lookupObjectPtr<coordinateSystems>(typeName);
+    const coordinateSystems* ptr = obr.findObject<coordinateSystems>(typeName);
 
     if (ptr)
     {
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
index 0dba392624..5bc947e6ef 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
@@ -100,19 +100,16 @@ Foam::regionCoupledBaseGAMGInterface::regionCoupledBaseGAMGInterface
         const polyMesh& nbrMesh =
             fineRegionCoupledLduInterface_.nbrMesh();
 
-        if
-        (
-            nbrMesh.foundObject<GAMGAgglomeration>(GAMGAgglomeration::typeName)
-        )
-        {
-            const GAMGAgglomeration& nbrAgg = nbrMesh.thisDb().lookupObject
-            <
-                GAMGAgglomeration
-            >
+        const GAMGAgglomeration* nbrAggPtr = nbrMesh.thisDb().findObject
+            <GAMGAgglomeration>
             (
                 GAMGAgglomeration::typeName
             );
 
+        if (nbrAggPtr)
+        {
+            const GAMGAgglomeration& nbrAgg = *nbrAggPtr;
+
             label nbrLevel(-1);
             if (nbrAgg.size() > fineLevelIndex)
             {
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
index bd64b8238d..37fc5171a7 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
@@ -187,19 +187,15 @@ Foam::label Foam::regionCoupledBase::neighbPatchID() const
 {
     if (nbrPatchID_ == -1)
     {
-        if
-        (
-            patch_.boundaryMesh().mesh().time().foundObject<polyMesh>
+        const polyMesh* meshPtr =
+            patch_.boundaryMesh().mesh().time().findObject<polyMesh>
             (
                 nbrRegionName_
-            )
-        )
+            );
+
+        if (meshPtr)
         {
-            const polyMesh& mesh =
-                patch_.boundaryMesh().mesh().time().lookupObject<polyMesh>
-                (
-                    nbrRegionName_
-                );
+            const polyMesh& mesh = *meshPtr;
 
             nbrPatchID_ = mesh.boundaryMesh().findPatchID(nbrPatchName_);
 
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
index a55e2c37ff..6f84dd7e7d 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
@@ -205,8 +205,8 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
             const word subGeomName(subDict.get<word>("surface"));
             //Pout<< "Trying to find " << subGeomName << endl;
 
-            const searchableSurface& s =
-                io.db().lookupObject<searchableSurface>(subGeomName);
+            searchableSurface& s =
+                io.db().lookupObjectRef<searchableSurface>(subGeomName);
 
             // I don't know yet how to handle the globalSize combined with
             // regionOffset. Would cause non-consecutive indices locally
@@ -218,7 +218,7 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
                     << exit(FatalError);
             }
 
-            subGeom_.set(surfI, &(const_cast<searchableSurface&>(s)));
+            subGeom_.set(surfI, &s);
 
             indexOffset_[surfI] = startIndex;
             startIndex += subGeom_[surfI].size();
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C
index 6721a4bb5a..d610601933 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C
@@ -189,7 +189,7 @@ Foam::searchableSurfaceWithGaps::searchableSurfaceWithGaps
     subGeom_.set
     (
         0,
-        io.db().lookupObjectRefPtr<searchableSurface>(subGeomName)
+        io.db().getObjectPtr<searchableSurface>(subGeomName)
     );
 
     bounds() = subGeom_[0].bounds();
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index 791c8d993b..74cafc8fc3 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -803,14 +803,15 @@ void Foam::triSurfaceMesh::getNormal
 
 void Foam::triSurfaceMesh::setField(const labelList& values)
 {
+    auto* fldPtr = getObjectPtr<triSurfaceLabelField>("values");
 
-    if (foundObject<triSurfaceLabelField>("values"))
+    if (fldPtr)
     {
-        lookupObjectRef<triSurfaceLabelField>("values").field() = values;
+        (*fldPtr).field() = values;
     }
     else
     {
-        auto fldPtr = autoPtr<triSurfaceLabelField>::New
+        fldPtr = new triSurfaceLabelField
         (
             IOobject
             (
@@ -827,7 +828,7 @@ void Foam::triSurfaceMesh::setField(const labelList& values)
         );
 
         // Store field on triMesh
-        fldPtr.ptr()->store();
+        fldPtr->store();
     }
 }
 
@@ -838,9 +839,11 @@ void Foam::triSurfaceMesh::getField
     labelList& values
 ) const
 {
-    if (foundObject<triSurfaceLabelField>("values"))
+    const auto* fldPtr = getObjectPtr<triSurfaceLabelField>("values");
+
+    if (fldPtr)
     {
-        const auto& fld = lookupObject<triSurfaceLabelField>("values");
+        const auto& fld = *fldPtr;
 
         values.setSize(info.size());
 
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C
index c1af450d7f..ebdb9f641d 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C
@@ -84,24 +84,13 @@ void Foam::refinementHistoryConstraint::add
     List<labelPair>& explicitConnections
 ) const
 {
-    autoPtr<const refinementHistory> storagePtr;
-    refinementHistory const* refPtr = nullptr;
+    const refinementHistory* refPtr =
+        mesh.findObject<refinementHistory>("refinementHistory");
 
-    if (mesh.foundObject<refinementHistory>("refinementHistory"))
+    autoPtr<const refinementHistory> storagePtr;
+
+    if (!refPtr)
     {
-        if (decompositionConstraint::debug)
-        {
-            Info<< type() << " : found refinementHistory" << endl;
-        }
-        refPtr = &mesh.lookupObject<refinementHistory>("refinementHistory");
-    }
-    else
-    {
-        if (decompositionConstraint::debug)
-        {
-            Info<< type() << " : reading refinementHistory from time "
-                << mesh.facesInstance() << endl;
-        }
         storagePtr.reset
         (
             new refinementHistory
@@ -120,6 +109,19 @@ void Foam::refinementHistoryConstraint::add
         );
     }
 
+    if (decompositionConstraint::debug)
+    {
+        if (refPtr)
+        {
+            Info<< type() << " : found refinementHistory" << nl;
+        }
+        else
+        {
+            Info<< type() << " : reading refinementHistory from time "
+                << mesh.facesInstance() << nl;
+        }
+    }
+
     const refinementHistory& history =
     (
         storagePtr.valid()
@@ -151,24 +153,13 @@ void Foam::refinementHistoryConstraint::apply
     labelList& decomposition
 ) const
 {
-    autoPtr<const refinementHistory> storagePtr;
-    refinementHistory const* refPtr = nullptr;
+    const refinementHistory* refPtr =
+        mesh.findObject<refinementHistory>("refinementHistory");
 
-    if (mesh.foundObject<refinementHistory>("refinementHistory"))
+    autoPtr<const refinementHistory> storagePtr;
+
+    if (!refPtr)
     {
-        //if (decompositionConstraint::debug)
-        //{
-        //    Info<< type() << " : found refinementHistory" << endl;
-        //}
-        refPtr = &mesh.lookupObject<refinementHistory>("refinementHistory");
-    }
-    else
-    {
-        //if (decompositionConstraint::debug)
-        //{
-        //    Info<< type() << " : reading refinementHistory from time "
-        //        << mesh.facesInstance() << endl;
-        //}
         storagePtr.reset
         (
             new refinementHistory
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 25686ebb72..7da8ce27f4 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -808,7 +808,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
         // here since we've only got Time and not a mesh.
 
         const auto* dictPtr =
-            searchableSurface::time().lookupObjectPtr<IOdictionary>
+            searchableSurface::time().findObject<IOdictionary>
             (
                 // == decompositionModel::canonicalName
                 "decomposeParDict"
@@ -1914,13 +1914,11 @@ void Foam::distributedTriSurfaceMesh::getField
         return;
     }
 
-    if (foundObject<triSurfaceLabelField>("values"))
-    {
-        const triSurfaceLabelField& fld = lookupObject<triSurfaceLabelField>
-        (
-            "values"
-        );
+    const auto* fldPtr = findObject<triSurfaceLabelField>("values");
 
+    if (fldPtr)
+    {
+        const triSurfaceLabelField& fld = *fldPtr;
 
         // Get query data (= local index of triangle)
         // ~~~~~~~~~~~~~~
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 53ba2236c5..0c751ec61e 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -67,23 +67,19 @@ void Foam::energyRegionCoupledFvPatchScalarField::setMethod() const
     if (!nbrThermoPtr_)
     {
         nbrThermoPtr_ =
-        (
-            &regionCoupledPatch_.nbrMesh().lookupObject<basicThermo>
+            regionCoupledPatch_.nbrMesh().findObject<basicThermo>
             (
                 basicThermo::dictName
-            )
-        );
+            );
     }
 
     if (!thermoPtr_)
     {
         thermoPtr_ =
-        (
-            &this->db().lookupObject<basicThermo>
+            this->db().findObject<basicThermo>
             (
                 basicThermo::dictName
-            )
-        );
+            );
     }
 }
 
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index 6b1aee1745..a0badb5c87 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
@@ -123,35 +123,37 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel
-        filmModelType;
+    // Film model
+    const auto* filmModelPtr = db().time().findObject
+        <regionModels::surfaceFilmModels::surfaceFilmRegionModel>
+        (filmRegionName_);
+
+    // Pyrolysis model
+    const auto* pyrModelPtr = db().time().findObject
+        <regionModels::pyrolysisModels::pyrolysisModel>
+        (pyrolysisRegionName_);
+
+    if (!filmModelPtr || !pyrModelPtr)
+    {
+        // Do nothing on construction - film model doesn't exist yet
+        return;
+    }
+
+    const auto& filmModel = *filmModelPtr;
+    const auto& pyrModel = *pyrModelPtr;
 
-    typedef regionModels::pyrolysisModels::pyrolysisModel pyrModelType;
 
     // Since we're inside initEvaluate/evaluate there might be processor
     // comms underway. Change the tag we use.
     int oldTag = UPstream::msgType();
     UPstream::msgType() = oldTag+1;
 
-    bool filmOk = db().time().foundObject<filmModelType>(filmRegionName_);
-
-
-    bool pyrOk = db().time().foundObject<pyrModelType>(pyrolysisRegionName_);
-
-    if (!filmOk || !pyrOk)
-    {
-        // Do nothing on construction - film model doesn't exist yet
-        return;
-    }
 
     scalarField& Tp = *this;
 
     const label patchi = patch().index();
 
-    // Retrieve film model
-    const filmModelType& filmModel =
-        db().time().lookupObject<filmModelType>(filmRegionName_);
-
+    // The film model
     const label filmPatchi = filmModel.regionPatchID(patchi);
 
     scalarField alphaFilm = filmModel.alpha().boundaryField()[filmPatchi];
@@ -160,10 +162,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
     scalarField TFilm = filmModel.Ts().boundaryField()[filmPatchi];
     filmModel.toPrimary(filmPatchi, TFilm);
 
-    // Retrieve pyrolysis model
-    const pyrModelType& pyrModel =
-        db().time().lookupObject<pyrModelType>(pyrolysisRegionName_);
-
+    // The pyrolysis model
     const label pyrPatchi = pyrModel.regionPatchID(patchi);
 
     scalarField TPyr = pyrModel.T().boundaryField()[pyrPatchi];
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index f4b4d44555..34c22f9e28 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -123,35 +123,38 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
         return;
     }
 
-    typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel
-        filmModelType;
+    // Film model
+    const auto* filmModelPtr = db().time().findObject
+        <regionModels::surfaceFilmModels::surfaceFilmRegionModel>
+        (filmRegionName_);
+
+    // Pyrolysis model
+    const auto* pyrModelPtr = db().time().findObject
+        <regionModels::pyrolysisModels::pyrolysisModel>
+        (pyrolysisRegionName_);
+
+
+    if (!filmModelPtr || !pyrModelPtr)
+    {
+        // Do nothing on construction - film model doesn't exist yet
+        return;
+    }
+
+    const auto& filmModel = *filmModelPtr;
+    const auto& pyrModel = *pyrModelPtr;
 
-    typedef regionModels::pyrolysisModels::pyrolysisModel pyrModelType;
 
     // Since we're inside initEvaluate/evaluate there might be processor
     // comms underway. Change the tag we use.
     int oldTag = UPstream::msgType();
     UPstream::msgType() = oldTag+1;
 
-    bool foundFilm = db().time().foundObject<filmModelType>(filmRegionName_);
-
-    bool foundPyrolysis =
-        db().time().foundObject<pyrModelType>(pyrolysisRegionName_);
-
-    if (!foundFilm || !foundPyrolysis)
-    {
-        // Do nothing on construction - film model doesn't exist yet
-        return;
-    }
 
     vectorField& Up = *this;
 
     const label patchi = patch().index();
 
-    // Retrieve film model
-    const filmModelType& filmModel =
-        db().time().lookupObject<filmModelType>(filmRegionName_);
-
+    // The film model
     const label filmPatchi = filmModel.regionPatchID(patchi);
 
     scalarField alphaFilm = filmModel.alpha().boundaryField()[filmPatchi];
@@ -160,10 +163,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
     vectorField UFilm = filmModel.Us().boundaryField()[filmPatchi];
     filmModel.toPrimary(filmPatchi, UFilm);
 
-    // Retrieve pyrolysis model
-    const pyrModelType& pyrModel =
-        db().time().lookupObject<pyrModelType>(pyrolysisRegionName_);
-
+    // The pyrolysis model
     const label pyrPatchi = pyrModel.regionPatchID(patchi);
 
     scalarField phiPyr = pyrModel.phiGas().boundaryField()[pyrPatchi];
diff --git a/src/regionModels/regionModel/regionModel/regionModelI.H b/src/regionModels/regionModel/regionModel/regionModelI.H
index b841f0165f..39c0c11b5b 100644
--- a/src/regionModels/regionModel/regionModel/regionModelI.H
+++ b/src/regionModels/regionModel/regionModel/regionModelI.H
@@ -60,14 +60,16 @@ inline const Foam::word& Foam::regionModels::regionModel::modelName() const
 
 inline const Foam::fvMesh& Foam::regionModels::regionModel::regionMesh() const
 {
-    if (time_.foundObject<fvMesh>(regionName_))
+    const fvMesh* regionPtr = time_.findObject<fvMesh>(regionName_);
+
+    if (regionPtr)
     {
-        return time_.lookupObject<fvMesh>(regionName_);
+        return *regionPtr;
     }
     else if (!regionMeshPtr_.valid())
     {
         FatalErrorInFunction
-         << "Region mesh not available" << abort(FatalError);
+            << "Region mesh not available" << abort(FatalError);
     }
 
     return *regionMeshPtr_;
@@ -76,17 +78,16 @@ inline const Foam::fvMesh& Foam::regionModels::regionModel::regionMesh() const
 
 inline Foam::fvMesh& Foam::regionModels::regionModel::regionMesh()
 {
-    if (time_.foundObject<fvMesh>(regionName_))
+    fvMesh* regionPtr = time_.getObjectPtr<fvMesh>(regionName_);
+
+    if (regionPtr)
     {
-        return const_cast<fvMesh&>
-        (
-            time_.lookupObject<fvMesh>(regionName_)
-        );
+        return *regionPtr;
     }
     else if (!regionMeshPtr_.valid())
     {
         FatalErrorInFunction
-         << "Region mesh not available" << abort(FatalError);
+            << "Region mesh not available" << abort(FatalError);
     }
 
     return *regionMeshPtr_;
diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
index a1ef447e49..9813f9f8e3 100644
--- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C
+++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
@@ -87,15 +87,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
     {
         const polyPatch& p = regionMesh().boundaryMesh()[regionPatchi];
 
-        return
-            tmp<Field<Type>>
-            (
-                new Field<Type>
-                (
-                    p.size(),
-                    Zero
-                )
-            );
+        return tmp<Field<Type>>::New(p.size(), Zero);
     }
 }
 
@@ -143,15 +135,7 @@ Foam::regionModels::regionModel::mapRegionPatchInternalField
     {
         const polyPatch& p = regionMesh().boundaryMesh()[regionPatchi];
 
-        return
-            tmp<Field<Type>>
-            (
-                new Field<Type>
-                (
-                    p.size(),
-                    Zero
-                )
-            );
+        return tmp<Field<Type>>::New(p.size(), Zero);
     }
 }
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index f468aff4c6..3d417419e4 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -142,27 +142,27 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
         return;
     }
 
-    typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel modelType;
+    const auto* filmModelPtr = db().time().findObject
+        <regionModels::surfaceFilmModels::surfaceFilmRegionModel>
+        (filmRegionName_);
+
+    if (!filmModelPtr)
+    {
+        // Do nothing on construction - film model doesn't exist yet
+        return;
+    }
+
+    const auto& filmModel = *filmModelPtr;
+
 
     // Since we're inside initEvaluate/evaluate there might be processor
     // comms underway. Change the tag we use.
     int oldTag = UPstream::msgType();
     UPstream::msgType() = oldTag+1;
 
-    bool foundFilm = db().time().foundObject<modelType>(filmRegionName_);
-
-    if (!foundFilm)
-    {
-        // Do nothing on construction - film model doesn't exist yet
-        return;
-    }
-
     const label patchi = patch().index();
 
     // Retrieve phase change mass from surface film model
-    const modelType& filmModel =
-        db().time().lookupObject<modelType>(filmRegionName_);
-
     const label filmPatchi = filmModel.regionPatchID(patchi);
 
     tmp<volScalarField> mDotFilm(filmModel.primaryMassTrans());
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
index 4b733d8268..b17d6a9ac8 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
@@ -48,14 +48,14 @@ tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::calcUTau
     const scalarField& magGradU
 ) const
 {
-    tmp<scalarField> tuTau(new scalarField(patch().size(), 0.0));
+    tmp<scalarField> tuTau(new scalarField(patch().size(), Zero));
     scalarField& uTau = tuTau.ref();
 
-    typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel modelType;
+    const auto* filmModelPtr = db().time().findObject
+        <regionModels::surfaceFilmModels::surfaceFilmRegionModel>
+        (filmRegionName_);
 
-    bool foundFilm = db().time().foundObject<modelType>(filmRegionName_);
-
-    if (!foundFilm)
+    if (!filmModelPtr)
     {
         // Do nothing on construction - film model doesn't exist yet
         return tuTau;
@@ -64,8 +64,7 @@ tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::calcUTau
     const label patchi = patch().index();
 
     // Retrieve phase change mass from surface film model
-    const modelType& filmModel =
-        db().time().lookupObject<modelType>(filmRegionName_);
+    const auto& filmModel = *filmModelPtr;
 
     const label filmPatchi = filmModel.regionPatchID(patchi);
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index b857ed3fae..0f20bdc9e0 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -78,19 +78,23 @@ void liquidFilmThermo::initLiquid(const dictionary& dict)
 
     dict.readEntry("liquid", name_);
 
-    if (filmModel_.primaryMesh().foundObject<SLGThermo>("SLGThermo"))
+    const SLGThermo* thermoPtr =
+        filmModel_.primaryMesh().findObject<SLGThermo>("SLGThermo");
+
+    if (thermoPtr)
     {
-        // retrieve from film thermo
+        // Retrieve from film thermo
         ownLiquid_ = false;
 
-        const SLGThermo& thermo =
-            filmModel_.primaryMesh().lookupObject<SLGThermo>("SLGThermo");
-        label id = thermo.liquidId(name_);
+        const SLGThermo& thermo = *thermoPtr;
+
+        const label id = thermo.liquidId(name_);
+
         liquidPtr_ = &thermo.liquids().properties()[id];
     }
     else
     {
-        // new liquid create
+        // New liquid create
         ownLiquid_ = true;
 
         liquidPtr_ =
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 69f971030e..87a847f247 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -52,27 +52,22 @@ void Foam::sampledIsoSurface::getIsoFields() const
     // Get volField
     // ~~~~~~~~~~~~
 
-    if (fvm.foundObject<volScalarField>(isoField_))
+    volFieldPtr_ = fvm.getObjectPtr<volScalarField>(isoField_);
+
+    if (volFieldPtr_)
     {
-        if (debug)
-        {
-            InfoInFunction
-                << "Lookup volField " << isoField_ << endl;
-        }
+        DebugInFunction
+            << "Lookup volField " << isoField_ << endl;
+
         storedVolFieldPtr_.clear();
-        volFieldPtr_ = &fvm.lookupObject<volScalarField>(isoField_);
     }
     else
     {
         // Bit of a hack. Read field and store.
 
-        if (debug)
-        {
-            InfoInFunction
-                << "Checking " << isoField_
-                << " for same time " << fvm.time().timeName()
-                << endl;
-        }
+        DebugInFunction
+            << "Checking " << isoField_
+            << " for same time " << fvm.time().timeName() << endl;
 
         if
         (
@@ -80,13 +75,9 @@ void Foam::sampledIsoSurface::getIsoFields() const
          || (fvm.time().timeName() != storedVolFieldPtr_().instance())
         )
         {
-            if (debug)
-            {
-                InfoInFunction
-                    << "Reading volField " << isoField_
-                    << " from time " << fvm.time().timeName()
-                    << endl;
-            }
+            DebugInFunction
+                << "Reading volField " << isoField_
+                << " from time " << fvm.time().timeName() << endl;
 
             IOobject vfHeader
             (
@@ -141,61 +132,45 @@ void Foam::sampledIsoSurface::getIsoFields() const
           + isoField_
           + ')';
 
-        if (fvm.foundObject<pointScalarField>(pointFldName))
-        {
-            if (debug)
-            {
-                InfoInFunction
-                    << "lookup pointField " << pointFldName << endl;
-            }
-            const pointScalarField& pfld = fvm.lookupObject<pointScalarField>
-            (
-                pointFldName
-            );
 
-            if (!pfld.upToDate(*volFieldPtr_))
+        pointFieldPtr_ = fvm.getObjectPtr<pointScalarField>(pointFldName);
+
+        if (pointFieldPtr_)
+        {
+            DebugInFunction
+                << "lookup pointField " << pointFldName << endl;
+
+            if (!pointFieldPtr_->upToDate(*volFieldPtr_))
             {
-                if (debug)
-                {
-                    InfoInFunction
-                        << "updating pointField "
-                        << pointFldName << endl;
-                }
+                DebugInFunction
+                    << "updating pointField " << pointFldName << endl;
+
                 // Update the interpolated value
                 volPointInterpolation::New(fvm).interpolate
                 (
                     *volFieldPtr_,
-                    const_cast<pointScalarField&>(pfld)
+                    const_cast<pointScalarField&>(*pointFieldPtr_)
                 );
             }
-
-            pointFieldPtr_ = &pfld;
         }
         else
         {
             // Not in registry. Interpolate.
 
-            if (debug)
-            {
-                InfoInFunction
-                    << "Checking pointField " << pointFldName
-                    << " for same time " << fvm.time().timeName()
-                    << endl;
-            }
+            DebugInFunction
+                << "creating pointField " << pointFldName << endl;
 
             // Interpolate without cache. Note that we're registering it
             // below so next time round it goes into the condition
             // above.
-            tmp<pointScalarField> tpfld
-            (
+            pointFieldPtr_ =
                 volPointInterpolation::New(fvm).interpolate
                 (
                     *volFieldPtr_,
                     pointFldName,
                     false
-                )
-            );
-            pointFieldPtr_ = tpfld.ptr();
+                ).ptr();
+
             const_cast<pointScalarField*>(pointFieldPtr_)->store();
         }
 
@@ -212,17 +187,13 @@ void Foam::sampledIsoSurface::getIsoFields() const
         }
 
 
-        if (debug)
-        {
-            InfoInFunction
-                << "volField " << volFieldPtr_->name()
-                << " min:" << min(*volFieldPtr_).value()
-                << " max:" << max(*volFieldPtr_).value() << endl;
-            InfoInFunction
-                << "pointField " << pointFieldPtr_->name()
-                << " min:" << gMin(pointFieldPtr_->primitiveField())
-                << " max:" << gMax(pointFieldPtr_->primitiveField()) << endl;
-        }
+        DebugInFunction
+            << "volField " << volFieldPtr_->name()
+            << " min:" << min(*volFieldPtr_).value()
+            << " max:" << max(*volFieldPtr_).value() << nl
+            << "pointField " << pointFieldPtr_->name()
+            << " min:" << gMin(pointFieldPtr_->primitiveField())
+            << " max:" << gMax(pointFieldPtr_->primitiveField()) << endl;
     }
     else
     {
@@ -231,24 +202,20 @@ void Foam::sampledIsoSurface::getIsoFields() const
 
         // Either lookup on the submesh or subset the whole-mesh volField
 
-        if (subFvm.foundObject<volScalarField>(isoField_))
+        volSubFieldPtr_ = subFvm.getObjectPtr<volScalarField>(isoField_);
+
+        if (volSubFieldPtr_)
         {
-            if (debug)
-            {
-                InfoInFunction
-                    << "Sub-mesh lookup volField "
-                    << isoField_ << endl;
-            }
+            DebugInFunction
+                << "Sub-mesh lookup volField " << isoField_ << endl;
+
             storedVolSubFieldPtr_.clear();
-            volSubFieldPtr_ = &subFvm.lookupObject<volScalarField>(isoField_);
         }
         else
         {
-            if (debug)
-            {
-                InfoInFunction
-                    << "Sub-setting volField " << isoField_ << endl;
-            }
+            DebugInFunction
+                << "Sub-setting volField " << isoField_ << endl;
+
             storedVolSubFieldPtr_.reset
             (
                 subMeshPtr_().interpolate
@@ -270,53 +237,40 @@ void Foam::sampledIsoSurface::getIsoFields() const
           + volSubFieldPtr_->name()
           + ')';
 
-        if (subFvm.foundObject<pointScalarField>(pointFldName))
-        {
-            if (debug)
-            {
-                InfoInFunction
-                    << "Sub-mesh lookup pointField " << pointFldName << endl;
-            }
-            const pointScalarField& pfld = subFvm.lookupObject<pointScalarField>
-            (
-                pointFldName
-            );
 
-            if (!pfld.upToDate(*volSubFieldPtr_))
+        pointFieldPtr_ = subFvm.getObjectPtr<pointScalarField>(pointFldName);
+
+        if (pointFieldPtr_)
+        {
+            DebugInFunction
+                << "Sub-mesh lookup pointField " << pointFldName << endl;
+
+            if (!pointFieldPtr_->upToDate(*volSubFieldPtr_))
             {
-                if (debug)
-                {
-                    Info<< "sampledIsoSurface::getIsoFields() :"
-                        << " updating submesh pointField "
-                        << pointFldName << endl;
-                }
+                DebugInFunction
+                    << "Updating submesh pointField " << pointFldName << endl;
+
                 // Update the interpolated value
                 volPointInterpolation::New(subFvm).interpolate
                 (
                     *volSubFieldPtr_,
-                    const_cast<pointScalarField&>(pfld)
+                    const_cast<pointScalarField&>(*pointFieldPtr_)
                 );
             }
-
-            pointFieldPtr_ = &pfld;
         }
         else
         {
-            if (debug)
-            {
-                InfoInFunction
-                    << "Interpolating submesh volField "
-                    << volSubFieldPtr_->name()
-                    << " to get submesh pointField " << pointFldName << endl;
-            }
-            tmp<pointScalarField> tpfld
-            (
+            DebugInFunction
+                << "Interpolating submesh volField "
+                << volSubFieldPtr_->name()
+                << " to get submesh pointField " << pointFldName << endl;
+
+            pointSubFieldPtr_ =
                 volPointInterpolation::New
                 (
                     subFvm
-                ).interpolate(*volSubFieldPtr_)
-            );
-            pointSubFieldPtr_ = tpfld.ptr();
+                ).interpolate(*volSubFieldPtr_).ptr();
+
             const_cast<pointScalarField*>(pointSubFieldPtr_)->store();
         }
 
@@ -333,19 +287,15 @@ void Foam::sampledIsoSurface::getIsoFields() const
         }
 
 
-        if (debug)
-        {
-            InfoInFunction
-                << "volSubField "
-                << volSubFieldPtr_->name()
-                << " min:" << min(*volSubFieldPtr_).value()
-                << " max:" << max(*volSubFieldPtr_).value() << endl;
-            InfoInFunction
-                << "pointSubField "
-                << pointSubFieldPtr_->name()
-                << " min:" << gMin(pointSubFieldPtr_->primitiveField())
-                << " max:" << gMax(pointSubFieldPtr_->primitiveField()) << endl;
-        }
+        DebugInFunction
+            << "volSubField "
+            << volSubFieldPtr_->name()
+            << " min:" << min(*volSubFieldPtr_).value()
+            << " max:" << max(*volSubFieldPtr_).value() << nl
+            << "pointSubField "
+            << pointSubFieldPtr_->name()
+            << " min:" << gMin(pointSubFieldPtr_->primitiveField())
+            << " max:" << gMax(pointSubFieldPtr_->primitiveField()) << endl;
     }
 }
 
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
index f51b7f1ccf..b5ba01ada1 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
@@ -64,7 +64,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
 
     // Use field from database, or try to read it in
 
-    const auto* cellFldPtr = fvm.lookupObjectPtr<volScalarField>(isoField_);
+    const auto* cellFldPtr = fvm.findObject<volScalarField>(isoField_);
 
     if (debug)
     {
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
index 82e158111b..a407945430 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
@@ -61,7 +61,7 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
 
     // Use volField from database, or try to read it in
 
-    const auto* cellFldPtr = fvm.lookupObjectPtr<volScalarField>(fieldName_);
+    const auto* cellFldPtr = fvm.findObject<volScalarField>(fieldName_);
 
     if (debug)
     {
diff --git a/src/sampling/surfMeshSample/distanceSurface/surfMeshSampleDistanceSurfaceTemplates.C b/src/sampling/surfMeshSample/distanceSurface/surfMeshSampleDistanceSurfaceTemplates.C
index 1a179a08d3..7e1834f5d5 100644
--- a/src/sampling/surfMeshSample/distanceSurface/surfMeshSampleDistanceSurfaceTemplates.C
+++ b/src/sampling/surfMeshSample/distanceSurface/surfMeshSampleDistanceSurfaceTemplates.C
@@ -53,7 +53,7 @@ bool Foam::surfMeshSampleDistanceSurface::sampleType
 {
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
-    const auto* volFldPtr = mesh().lookupObjectPtr<VolFieldType>(fieldName);
+    const auto* volFldPtr = mesh().findObject<VolFieldType>(fieldName);
 
     if (!volFldPtr)
     {
diff --git a/src/sampling/surfMeshSample/plane/surfMeshSamplePlaneTemplates.C b/src/sampling/surfMeshSample/plane/surfMeshSamplePlaneTemplates.C
index 2158020021..fbcd7a6441 100644
--- a/src/sampling/surfMeshSample/plane/surfMeshSamplePlaneTemplates.C
+++ b/src/sampling/surfMeshSample/plane/surfMeshSamplePlaneTemplates.C
@@ -53,7 +53,7 @@ bool Foam::surfMeshSamplePlane::sampleType
 {
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
-    const auto* volFldPtr = mesh().lookupObjectPtr<VolFieldType>(fieldName);
+    const auto* volFldPtr = mesh().findObject<VolFieldType>(fieldName);
 
     if (!volFldPtr)
     {
diff --git a/src/sampling/surfMeshSample/surfMeshSample/surfMeshSampleTemplates.C b/src/sampling/surfMeshSample/surfMeshSample/surfMeshSampleTemplates.C
index 316d3384d1..95d969da54 100644
--- a/src/sampling/surfMeshSample/surfMeshSample/surfMeshSampleTemplates.C
+++ b/src/sampling/surfMeshSample/surfMeshSample/surfMeshSampleTemplates.C
@@ -76,7 +76,7 @@ Foam::surfMeshSample::getOrCreateSurfField
     const surfMesh& surf  = surface();
     const word& fieldName = vField.name();
 
-    SurfFieldType* ptr = surf.lookupObjectRefPtr<SurfFieldType>(fieldName);
+    SurfFieldType* ptr = surf.getObjectPtr<SurfFieldType>(fieldName);
     if (!ptr)
     {
         ptr = new SurfFieldType
diff --git a/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C b/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
index 62ff7b3530..f51801ae77 100644
--- a/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
+++ b/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
@@ -109,7 +109,7 @@ bool Foam::surfMeshSamplers::add_rhoU(const word& derivedName)
 
     // rhoU = rho * U
 
-    const auto* rhoPtr = mesh_.lookupObjectPtr<volScalarField>("rho");
+    const auto* rhoPtr = mesh_.findObject<volScalarField>("rho");
     const volVectorField& U = mesh_.lookupObject<volVectorField>("U");
 
     tmp<volVectorField> tresult;
@@ -152,7 +152,7 @@ bool Foam::surfMeshSamplers::add_pTotal(const word& derivedName)
 
     // pTotal = p + rho * U^2 / 2
 
-    const auto* rhoPtr = mesh_.lookupObjectPtr<volScalarField>("rho");
+    const auto* rhoPtr = mesh_.findObject<volScalarField>("rho");
     const volScalarField& p = mesh_.lookupObject<volScalarField>("p");
     const volVectorField& U = mesh_.lookupObject<volVectorField>("U");
 
diff --git a/src/sampling/surfMeshSample/triSurfaceMesh/surfMeshSampleDiscreteTemplates.C b/src/sampling/surfMeshSample/triSurfaceMesh/surfMeshSampleDiscreteTemplates.C
index 78cf386c52..d3f120cac4 100644
--- a/src/sampling/surfMeshSample/triSurfaceMesh/surfMeshSampleDiscreteTemplates.C
+++ b/src/sampling/surfMeshSample/triSurfaceMesh/surfMeshSampleDiscreteTemplates.C
@@ -60,7 +60,7 @@ bool Foam::surfMeshSampleDiscrete::sampleType
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
     const auto* volFldPtr =
-        SurfaceSource::mesh().lookupObjectPtr<VolFieldType>(fieldName);
+        SurfaceSource::mesh().findObject<VolFieldType>(fieldName);
 
     if (!volFldPtr)
     {
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurfaceTemplates.C b/src/sampling/surface/triSurfaceMesh/discreteSurfaceTemplates.C
index 3fce29d212..eba3ec1194 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurfaceTemplates.C
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurfaceTemplates.C
@@ -40,7 +40,7 @@ bool Foam::discreteSurface::sampleType
     typedef DimensionedField<Type, surfGeoMesh> SurfFieldType;
     typedef IOField<Type> TmpFieldType;
 
-    const auto* volFldPtr = mesh().lookupObjectPtr<VolFieldType>(fieldName);
+    const auto* volFldPtr = mesh().findObject<VolFieldType>(fieldName);
 
     if (!volFldPtr)
     {
@@ -57,7 +57,7 @@ bool Foam::discreteSurface::sampleType
     {
         const surfMesh& surf = dynamicCast<const surfMesh>(obr);
 
-        SurfFieldType* ptr = surf.lookupObjectRefPtr<SurfFieldType>(fieldName);
+        SurfFieldType* ptr = surf.getObjectPtr<SurfFieldType>(fieldName);
         if (!ptr)
         {
             // Doesn't exist or the wrong type
@@ -83,7 +83,7 @@ bool Foam::discreteSurface::sampleType
     }
     else
     {
-        TmpFieldType* ptr = obr.lookupObjectRefPtr<TmpFieldType>(fieldName);
+        TmpFieldType* ptr = obr.getObjectPtr<TmpFieldType>(fieldName);
         if (!ptr)
         {
             // Doesn't exist or the wrong type
@@ -121,7 +121,7 @@ Foam::discreteSurface::sampleType
 {
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
-    const auto* volFldPtr = mesh().lookupObjectPtr<VolFieldType>(fieldName);
+    const auto* volFldPtr = mesh().findObject<VolFieldType>(fieldName);
 
     if (volFldPtr)
     {
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
index 123b128b92..4031fb2764 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -165,7 +165,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
     if (db().foundObject<uniformDimensionedVectorField>("g"))
     {
         uniformDimensionedVectorField g =
-        db().lookupObject<uniformDimensionedVectorField>("g");
+            db().lookupObject<uniformDimensionedVectorField>("g");
 
         gravity = g.value();
     }
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index 7e376b2f14..c5ccced0e0 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -147,7 +147,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
     for (auto fieldName : { "region", "STLSolidLabeling" })
     {
         const labelIOField* lptr =
-            reader.cellData().lookupObjectPtr<labelIOField>(fieldName);
+            reader.cellData().findObject<labelIOField>(fieldName);
 
         if (lptr)
         {
@@ -160,7 +160,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
         }
 
         const scalarIOField* sptr =
-            reader.cellData().lookupObjectPtr<scalarIOField>(fieldName);
+            reader.cellData().findObject<scalarIOField>(fieldName);
 
         if (sptr)
         {
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index daf961381f..6b29193690 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -130,37 +130,31 @@ Foam::volScalarField& Foam::basicThermo::lookupOrConstruct
     bool& isOwner
 )
 {
-    const volScalarField* p =
-        mesh.objectRegistry::lookupObjectPtr<volScalarField>(name);
+    volScalarField* ptr =
+        mesh.objectRegistry::getObjectPtr<volScalarField>(name);
 
-    isOwner = !p;
+    isOwner = !ptr;
 
-    if (!p)
+    if (!ptr)
     {
-        volScalarField* fPtr
+        ptr = new volScalarField
         (
-            new volScalarField
+            IOobject
             (
-                IOobject
-                (
-                    name,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::MUST_READ,
-                    IOobject::AUTO_WRITE
-                ),
-                mesh
-            )
+                name,
+                mesh.time().timeName(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh
         );
 
         // Transfer ownership of this object to the objectRegistry
-        fPtr->store(fPtr);
-        return *fPtr;
-    }
-    else
-    {
-        return const_cast<volScalarField&>(*p);
+        ptr->store(ptr);
     }
+
+    return *ptr;
 }
 
 
@@ -341,30 +335,25 @@ const Foam::basicThermo& Foam::basicThermo::lookupThermo
     const fvPatchScalarField& pf
 )
 {
-    if (pf.db().foundObject<basicThermo>(dictName))
-    {
-        return pf.db().lookupObject<basicThermo>(dictName);
-    }
-    else
-    {
-        HashTable<const basicThermo*> thermos =
-            pf.db().lookupClass<basicThermo>();
+    const basicThermo* thermo = pf.db().findObject<basicThermo>(dictName);
 
-        for
+    if (thermo)
+    {
+        return *thermo;
+    }
+
+    HashTable<const basicThermo*> thermos =
+        pf.db().lookupClass<basicThermo>();
+
+    forAllConstIters(thermos, iter)
+    {
+        if
         (
-            HashTable<const basicThermo*>::iterator iter = thermos.begin();
-            iter != thermos.end();
-            ++iter
+            &(iter()->he().internalField())
+         == &(pf.internalField())
         )
         {
-            if
-            (
-                &(iter()->he().internalField())
-              == &(pf.internalField())
-            )
-            {
-                return *iter();
-            }
+            return *iter();
         }
     }
 
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index c5a782b23c..2a414eec94 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -118,58 +118,53 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
     // look-up table and save the corresponding indices of the look-up table
 
     label j = 0;
-    forAllConstIter(HashTable<label>, speciesNames_, iter)
+    forAllConstIters(speciesNames_, iter)
     {
+        const word& specieName = iter.key();
+        const label index = iter.object();
+
+        volScalarField* fldPtr = mesh.getObjectPtr<volScalarField>(specieName);
+
         if (!lookUpTablePtr_.empty())
         {
-            if (lookUpTablePtr_().found(iter.key()))
+            if (lookUpTablePtr_().found(specieName))
             {
-                label index = lookUpTablePtr_().findFieldIndex(iter.key());
+                const label fieldIndex =
+                    lookUpTablePtr_().findFieldIndex(specieName);
 
-                Info<< "specie: " << iter.key() << " found on look-up table "
-                    << " with index: " << index << endl;
+                Info<< "specie: " << specieName << " found on look-up table "
+                    << " with index: " << fieldIndex << endl;
 
-                specieIndex_[iter()] = index;
+                specieIndex_[index] = fieldIndex;
             }
-            else if (mesh.foundObject<volScalarField>(iter.key()))
+            else if (fldPtr)
             {
-                volScalarField& Y =
-                    const_cast<volScalarField&>
-                    (
-                        mesh.lookupObject<volScalarField>(iter.key())
-                    );
-                Yj_.set(j, &Y);
-                specieIndex_[iter()] = 0;
+                Yj_.set(j, fldPtr);
+                specieIndex_[index] = 0;
                 j++;
                 Info<< "specie: " << iter.key() << " is being solved" << endl;
             }
             else
             {
                 FatalErrorInFunction
-                    << "specie: " << iter.key()
+                    << "specie: " << specieName
                     << " is neither in look-up table: "
                     << lookUpTablePtr_().tableName()
                     << " nor is being solved" << nl
                     << exit(FatalError);
             }
         }
-        else if (mesh.foundObject<volScalarField>(iter.key()))
+        else if (fldPtr)
         {
-            volScalarField& Y =
-                const_cast<volScalarField&>
-                (
-                    mesh.lookupObject<volScalarField>(iter.key())
-                );
-
-            Yj_.set(j, &Y);
-            specieIndex_[iter()] = 0;
+            Yj_.set(j, fldPtr);
+            specieIndex_[index] = 0;
             j++;
         }
         else
         {
             FatalErrorInFunction
-                << " there is not lookup table and the specie" << nl
-                << iter.key() << nl
+                << "There is no lookup table and the specie" << nl
+                << specieName << nl
                 << " is not found " << nl
                 << exit(FatalError);
         }
@@ -292,10 +287,11 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
         )
     );
 
-    if (mesh_.foundObject<volScalarField>("Qdot"))
+    const volScalarField* QdotPtr = mesh_.findObject<volScalarField>("Qdot");
+
+    if (QdotPtr)
     {
-        const volScalarField& Qdot =
-            mesh_.lookupObject<volScalarField>("Qdot");
+        const volScalarField& Qdot = *QdotPtr;
 
         if (Qdot.dimensions() == dimEnergy/dimTime)
         {
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index 1d7dfddf78..353f3cd973 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -132,48 +132,53 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
     // look-up table and save the corresponding indices of the look-up table
 
     label j = 0;
-    forAllConstIter(HashTable<label>, speciesNames_, iter)
+    forAllConstIters(speciesNames_, iter)
     {
+        const word& specieName = iter.key();
+        const label index = iter.object();
+
+        volScalarField* fldPtr = mesh.getObjectPtr<volScalarField>(specieName);
+
         if (!lookUpTablePtr_.empty())
         {
-            if (lookUpTablePtr_().found(iter.key()))
+            if (lookUpTablePtr_().found(specieName))
             {
-                const label index =
-                    lookUpTablePtr_().findFieldIndex(iter.key());
+                const label fieldIndex =
+                    lookUpTablePtr_().findFieldIndex(specieName);
 
-                Info<< "specie: " << iter.key() << " found on look-up table "
-                    << " with index: " << index << endl;
+                Info<< "specie: " << specieName << " found on look-up table "
+                    << " with index: " << fieldIndex << endl;
 
-                specieIndex_[iter()] = index;
+                specieIndex_[index] = fieldIndex;
             }
-            else if (mesh.foundObject<volScalarField>(iter.key()))
+            else if (fldPtr)
             {
-                Yj_.set(j, &mesh.lookupObjectRef<volScalarField>(iter.key()));
-                specieIndex_[iter()] = 0;
+                Yj_.set(j, fldPtr);
+                specieIndex_[index] = 0;
                 j++;
-                Info<< "specie: " << iter.key() << " is being solved" << endl;
+                Info<< "specie: " << specieName << " is being solved" << endl;
             }
             else
             {
                 FatalErrorInFunction
-                    << "specie: " << iter.key()
+                    << "specie: " << specieName
                     << " is neither in look-up table: "
                     << lookUpTablePtr_().tableName()
                     << " nor is being solved" << nl
                     << exit(FatalError);
             }
         }
-        else if (mesh.foundObject<volScalarField>(iter.key()))
+        else if (fldPtr)
         {
-            Yj_.set(j, &mesh.lookupObjectRef<volScalarField>(iter.key()));
-            specieIndex_[iter()] = 0;
+            Yj_.set(j, fldPtr);
+            specieIndex_[index] = 0;
             j++;
         }
         else
         {
             FatalErrorInFunction
-                << " there is no lookup table and the specie" << nl
-                << iter.key() << nl
+                << "There is no lookup table and the specie" << nl
+                << specieName << nl
                 << " is not found " << nl
                 << exit(FatalError);
 
@@ -300,10 +305,11 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandi) const
         )
     );
 
-    if (mesh().foundObject<volScalarField>("Qdot"))
+    const volScalarField* QdotPtr = mesh().findObject<volScalarField>("Qdot");
+
+    if (QdotPtr)
     {
-        const volScalarField& Qdot =
-            mesh().lookupObject<volScalarField>("Qdot");
+        const volScalarField& Qdot = *QdotPtr;
 
         if (Qdot.dimensions() == dimEnergy/dimTime)
         {
diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
index 4339e23243..3c645f48e1 100644
--- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
+++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
@@ -64,12 +64,12 @@ Foam::moleFractions<ThermoType>::moleFractions
 :
     fvMeshFunctionObject(name, runTime, dict)
 {
-    if (mesh_.foundObject<ThermoType>(basicThermo::dictName))
-    {
-        const ThermoType& thermo =
-            mesh_.lookupObject<ThermoType>(basicThermo::dictName);
+    const ThermoType* thermo =
+        mesh_.findObject<ThermoType>(basicThermo::dictName);
 
-        const PtrList<volScalarField>& Y = thermo.composition().Y();
+    if (thermo)
+    {
+        const PtrList<volScalarField>& Y = thermo->composition().Y();
 
         X_.setSize(Y.size());
 
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index a0e5e284a6..316e1367e0 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -93,33 +93,28 @@ Foam::humidityTemperatureCoupledMixedFvPatchScalarField::thicknessField
     const fvMesh& mesh
 )
 {
-    if (!mesh.foundObject<volScalarField>(fieldName))
+    volScalarField* ptr = mesh.getObjectPtr<volScalarField>(fieldName);
+
+    if (!ptr)
     {
-        tmp<volScalarField> tField
+        ptr = new volScalarField
         (
-            new volScalarField
+            IOobject
             (
-                IOobject
-                (
-                    fieldName,
-                    mesh.time().timeName(),
-                    mesh,
-                    IOobject::NO_READ,
-                    IOobject::AUTO_WRITE
-                ),
+                fieldName,
+                mesh.time().timeName(),
                 mesh,
-                dimensionedScalar(dimLength, Zero)
-            )
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh,
+            dimensionedScalar(dimLength, Zero)
         );
 
-        tField.ptr()->store();
+        ptr->store();
     }
 
-    return
-        const_cast<volScalarField&>
-        (
-            mesh.lookupObject<volScalarField>(fieldName)
-        );
+    return *ptr;
 }
 
 
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
index fd8b9d8a34..5aad9163c9 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
@@ -141,11 +141,10 @@ bool Foam::rawTopoChangerFvMesh::update()
         // Special handling for phi: set unmapped faces to recreated phi
         Info<< "rawTopoChangerFvMesh :"
             << " recreating phi for unmapped boundary values." << endl;
+
         const volVectorField& U = lookupObject<volVectorField>("U");
-        surfaceScalarField& phi = const_cast<surfaceScalarField&>
-        (
-            lookupObject<surfaceScalarField>("phi")
-        );
+        surfaceScalarField& phi = lookupObjectRef<surfaceScalarField>("phi");
+
         setUnmappedValues
         (
             phi,
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
index bd52ee04ae..30a8a1c26d 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
@@ -75,10 +75,7 @@ void Foam::rawTopoChangerFvMesh::zeroUnmappedValues
     {
         //Pout<< "Checking field " << fldNames[i] << endl;
 
-        FieldType& fld = const_cast<FieldType&>
-        (
-            lookupObject<FieldType>(fldNames[i])
-        );
+        FieldType& fld = lookupObjectRef<FieldType>(fldNames[i]);
 
         setUnmappedValues
         (
diff --git a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
index 48f1373385..f3931ab606 100644
--- a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
+++ b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
@@ -60,12 +60,11 @@ Foam::viscosityModels::Arrhenius<ViscousModel>::Arrhenius
     fieldName_(ArrheniusCoeffs_.lookupOrDefault<word>("field","T")),
     mesh_(U.mesh())
 {
-    const volScalarField* fieldPtr =
-        mesh_.lookupObjectPtr<volScalarField>(fieldName_);
+    const auto* fldPtr = mesh_.findObject<volScalarField>(fieldName_);
 
-    if (fieldPtr)
+    if (fldPtr)
     {
-        this->nu_ *= calcNu(*fieldPtr);
+        this->nu_ *= calcNu(*fldPtr);
     }
 }
 
diff --git a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.H b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.H
index 57ed3f2a10..da6e7082a1 100644
--- a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.H
+++ b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.H
@@ -113,12 +113,11 @@ public:
         {
             ViscousModel::correct();
 
-            const volScalarField* fieldPtr =
-                mesh_.lookupObjectPtr<volScalarField>(fieldName_);
+            const auto* fldPtr = mesh_.findObject<volScalarField>(fieldName_);
 
-            if (fieldPtr)
+            if (fldPtr)
             {
-                this->nu_ *= calcNu(*fieldPtr);
+                this->nu_ *= calcNu(*fldPtr);
             }
         }
 
diff --git a/src/waveModels/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C
index e697104508..79ca31f1e3 100644
--- a/src/waveModels/waveModel/waveModelNew.C
+++ b/src/waveModels/waveModel/waveModelNew.C
@@ -87,15 +87,16 @@ Foam::tmp<Foam::waveModel> Foam::waveModel::lookupOrCreate
 {
     const word modelName = waveModel::modelName(patch.name());
 
-    if (!mesh.foundObject<waveModel>(modelName))
+    waveModel* modelPtr = mesh.getObjectPtr<waveModel>(modelName);
+
+    if (!modelPtr)
     {
-        autoPtr<waveModel> model(waveModel::New(waveDictName, mesh, patch));
-        waveModel* waveModelPtr = model.ptr();
-        waveModelPtr->store();
-        waveModelPtr->info(Info);
+        modelPtr = waveModel::New(waveDictName, mesh, patch).ptr();
+        modelPtr->store();
+        modelPtr->info(Info);
     }
 
-    return mesh.lookupObject<waveModel>(modelName);
+    return *modelPtr;
 }
 
 
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
index 58dceab3f1..aec89cfee6 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
@@ -38,8 +38,7 @@ functions
             scalar gamma = 1.4;
             scalar A = -0.3*D*UInf;
             const dimensionedScalar rhoRef("rhoRef", dimDensity, 1);
-            const volScalarField& rho =
-                mesh().lookupObject<volScalarField>("rho");
+            const auto& rho = mesh().lookupObject<volScalarField>("rho");
 
             const vectorField& C = mesh().C();
             const scalarField x(C.component(0));
@@ -47,19 +46,15 @@ functions
             const scalar r2 = sqr(0.5*D/(Foam::sqrt(Foam::log(10.0))));
             const scalarField Psi(A*exp(-0.5/r2*(sqr(x) + sqr(y))));
 
-            volVectorField* Uptr =
-                mesh().lookupObjectRefPtr<volVectorField>("U");
-            volScalarField* pPtr =
-                mesh().lookupObjectRefPtr<volScalarField>("p");
-            volScalarField* TPtr =
-                mesh().lookupObjectRefPtr<volScalarField>("T");
-
+            auto* Uptr = mesh().getObjectPtr<volVectorField>("U");
+            auto* pPtr = mesh().getObjectPtr<volScalarField>("p");
+            auto* TPtr = mesh().getObjectPtr<volScalarField>("T");
 
             if (Uptr && pPtr && TPtr)
             {
-                volVectorField& U = *Uptr;
-                volScalarField& p = *pPtr;
-                volScalarField& T = *TPtr;
+                auto& U = *Uptr;
+                auto& p = *pPtr;
+                auto& T = *TPtr;
 
                 vectorField& Uc = U.primitiveFieldRef();
                 Uc.replace(0, UInf - rhoRef/rho()*Psi/r2*y);

From 14a39405c22873036e5c11c8028c9d1a03173666 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 17 Oct 2018 17:37:23 +0200
Subject: [PATCH 43/43] ENH: simple dataCloud function object (issue #1044)

- writes positions and a single field (eg, diameter) in plain ASCII files,
  suitable for importing in a spreadsheet or manipulation with
  scripting tools.

- code integrated from
  https://develop.openfoam.com/Community/OpenFOAM-addOns
---
 src/functionObjects/lagrangian/Make/files     |   1 +
 .../lagrangian/dataCloud/dataCloud.C          | 227 ++++++++++++++++++
 .../lagrangian/dataCloud/dataCloud.H          | 180 ++++++++++++++
 .../lagrangian/dataCloud/dataCloudTemplates.C | 130 ++++++++++
 .../simplifiedSiwek/system/controlDict        |   1 +
 .../simplifiedSiwek/system/dataCloud          |  13 +
 6 files changed, 552 insertions(+)
 create mode 100644 src/functionObjects/lagrangian/dataCloud/dataCloud.C
 create mode 100644 src/functionObjects/lagrangian/dataCloud/dataCloud.H
 create mode 100644 src/functionObjects/lagrangian/dataCloud/dataCloudTemplates.C
 create mode 100644 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud

diff --git a/src/functionObjects/lagrangian/Make/files b/src/functionObjects/lagrangian/Make/files
index 921ca2d707..c7feb02e33 100644
--- a/src/functionObjects/lagrangian/Make/files
+++ b/src/functionObjects/lagrangian/Make/files
@@ -1,3 +1,4 @@
+dataCloud/dataCloud.C
 cloudInfo/cloudInfo.C
 icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C
 dsmcFields/dsmcFields.C
diff --git a/src/functionObjects/lagrangian/dataCloud/dataCloud.C b/src/functionObjects/lagrangian/dataCloud/dataCloud.C
new file mode 100644
index 0000000000..53267ab025
--- /dev/null
+++ b/src/functionObjects/lagrangian/dataCloud/dataCloud.C
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "dataCloud.H"
+#include "Cloud.H"
+#include "dictionary.H"
+#include "fvMesh.H"
+#include "pointList.H"
+#include "OFstream.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+    defineTypeNameAndDebug(dataCloud, 0);
+    addToRunTimeSelectionTable(functionObject, dataCloud, dictionary);
+}
+}
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::functionObjects::dataCloud::writeCloud
+(
+    const fileName& outputName,
+    const word& cloudName
+)
+{
+    const auto* objPtr = mesh_.findObject<cloud>(cloudName);
+    if (!objPtr)
+    {
+        return false;
+    }
+
+    objectRegistry obrTmp
+    (
+        IOobject
+        (
+            "tmp::dataCloud::" + cloudName,
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    objPtr->writeObjects(obrTmp);
+
+    const auto* pointsPtr = obrTmp.findObject<vectorField>("position");
+
+    if (!pointsPtr)
+    {
+        // This should be impossible
+        return false;
+    }
+
+    // Total number of parcels on all processes
+    label nTotParcels = pointsPtr->size();
+    reduce(nTotParcels, sumOp<label>());
+
+    if (!nTotParcels)
+    {
+        return false;
+    }
+
+
+    if (Pstream::master())
+    {
+        mkDir(outputName.path());
+    }
+
+    return
+    (
+        writeField<label>(outputName, obrTmp)
+     || writeField<scalar>(outputName, obrTmp)
+     || writeField<vector>(outputName, obrTmp)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::dataCloud::dataCloud
+(
+    const word& name,
+    const Time& runTime,
+    const dictionary& dict
+)
+:
+    fvMeshFunctionObject(name, runTime, dict),
+    selectClouds_(),
+    fieldName_(),
+    directory_()
+{
+    read(dict);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::functionObjects::dataCloud::read(const dictionary& dict)
+{
+    fvMeshFunctionObject::read(dict);
+
+    const int padWidth = dict.lookupOrDefault<int>("width", 8);
+
+    // Appropriate printf format - Enforce min/max sanity limits
+    if (padWidth < 1 || padWidth > 31)
+    {
+        printf_.clear();
+    }
+    else
+    {
+        printf_ = "%0" + std::to_string(padWidth) + "d";
+    }
+
+
+    selectClouds_.clear();
+    dict.readIfPresent("clouds", selectClouds_);
+
+    if (selectClouds_.empty())
+    {
+        selectClouds_.resize(1);
+        selectClouds_.first() =
+            dict.lookupOrDefault<word>("cloud", cloud::defaultName);
+    }
+
+    dict.readEntry("field", fieldName_);
+
+    // Output directory
+
+    directory_.clear();
+    dict.readIfPresent("directory", directory_);
+
+    if (directory_.size())
+    {
+        // User-defined output directory
+        directory_.expand();
+        if (!directory_.isAbsolute())
+        {
+            directory_ = time_.globalPath()/directory_;
+        }
+    }
+    else
+    {
+        // Standard postProcessing/ naming
+        directory_ = time_.globalPath()/functionObject::outputPrefix/name();
+    }
+    directory_.clean();
+
+    return true;
+}
+
+
+bool Foam::functionObjects::dataCloud::execute()
+{
+    return true;
+}
+
+
+bool Foam::functionObjects::dataCloud::write()
+{
+    const wordList cloudNames(mesh_.sortedNames<cloud>(selectClouds_));
+
+    if (cloudNames.empty())
+    {
+        return true;  // skip - not available
+    }
+
+    const word timeDesc = "_" +
+    (
+        printf_.empty()
+      ? Foam::name(time_.timeIndex())
+      : word::printf(printf_, time_.timeIndex())
+    );
+
+    Log << name() << " output Time: " << time_.timeName() << nl;
+
+    // Each cloud separately
+    for (const word& cloudName : cloudNames)
+    {
+        // Legacy is not to be supported
+
+        const fileName outputName
+        (
+            directory_/cloudName + timeDesc + ".dat"
+        );
+
+        // writeCloud() includes mkDir (on master)
+
+        if (writeCloud(outputName, cloudName))
+        {
+            Log << "    cloud  : "
+                << outputName.relative(time_.globalPath()) << endl;
+        }
+    }
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/functionObjects/lagrangian/dataCloud/dataCloud.H b/src/functionObjects/lagrangian/dataCloud/dataCloud.H
new file mode 100644
index 0000000000..a1ef28b587
--- /dev/null
+++ b/src/functionObjects/lagrangian/dataCloud/dataCloud.H
@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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::functionObjects::dataCloud
+
+Group
+    grpLagrangianFunctionObjects
+
+Description
+    This functionObject writes a cloud position and in ASCII.
+
+    Example of function object specification:
+    \verbatim
+    cloudWrite1
+    {
+        type            dataCloud;
+        libs            ("liblagrangianFunctionObjects.so");
+        writeControl    writeTime;
+        writeInterval   1;
+        cloud           myCloud;
+        field           d;
+    }
+    \endverbatim
+
+Usage
+    \table
+        Property     | Description                      | Required | Default
+        type         | Type name: dataCloud             | yes   |
+        cloud        |                                  | no    | defaultCloud
+        clouds       | wordRe list of clouds            | no    |
+        field        | Name of the field                | yes   |
+        directory    | The output directory name     | no | postProcessing/NAME
+        width        | Padding width for file name      | no    | 8
+    \endtable
+
+See also
+    Foam::functionObjects::vtkCloud
+
+SourceFiles
+    dataCloud.C
+    dataCloudTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjects_dataCloud_H
+#define functionObjects_dataCloud_H
+
+#include "fvMeshFunctionObject.H"
+#include "vectorField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class dataCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class dataCloud
+:
+    public fvMeshFunctionObject
+{
+    // Private data
+
+        //- The printf format for zero-padding names
+        string printf_;
+
+        //- Requested names of clouds to process
+        wordRes selectClouds_;
+
+        //- Subset of cloud fields to process
+        word fieldName_;
+
+        //- Output directory
+        fileName directory_;
+
+
+    // Private Member Functions
+
+        template<class Type>
+        static void writeField
+        (
+            Ostream& os,
+            const vectorField& points,
+            const Field<Type>& field
+        );
+
+        //- Write to disk
+        bool writeCloud(const fileName& outputName, const word& cloudName);
+
+        //- Write from objectRegistry entry
+        template<class Type>
+        bool writeField
+        (
+            const fileName& outputName,
+            const objectRegistry& obrTmp
+        ) const;
+
+
+        //- No copy construct
+        dataCloud(const dataCloud&) = delete;
+
+        //- No copy assignment
+        void operator=(const dataCloud&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("dataCloud");
+
+
+    // Constructors
+
+        //- Construct from Time and dictionary
+        dataCloud
+        (
+            const word& name,
+            const Time& runTime,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~dataCloud() = default;
+
+
+    // Member Functions
+
+        //- Read the dataCloud specification
+        virtual bool read(const dictionary& dict);
+
+        //- Execute, currently does nothing
+        virtual bool execute();
+
+        //- Write fields
+        virtual bool write();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionObjects
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "dataCloudTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/functionObjects/lagrangian/dataCloud/dataCloudTemplates.C b/src/functionObjects/lagrangian/dataCloud/dataCloudTemplates.C
new file mode 100644
index 0000000000..c51033e9e5
--- /dev/null
+++ b/src/functionObjects/lagrangian/dataCloud/dataCloudTemplates.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2018 OpenCFD Ltd.
+     \\/     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 "IOField.H"
+#include "OFstream.H"
+#include "pointField.H"
+#include "vectorField.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void Foam::functionObjects::dataCloud::writeField
+(
+    Ostream& os,
+    const vectorField& points,
+    const Field<Type>& field
+)
+{
+    const label len = field.size();
+
+    for (label pointi=0; pointi<len; ++pointi)
+    {
+        const point& pt = points[pointi];
+        const Type& val = field[pointi];
+
+        os << pt.x() << ' ' << pt.y() << ' ' << pt.z();
+
+        for (direction cmpt=0; cmpt < pTraits<Type>::nComponents; ++cmpt)
+        {
+            os << ' ' << component(val, cmpt);
+        }
+        os << nl;
+    }
+}
+
+
+template<class Type>
+bool Foam::functionObjects::dataCloud::writeField
+(
+    const fileName& outputName,
+    const objectRegistry& obrTmp
+) const
+{
+    // Fields are not always on all processors (eg, multi-component parcels).
+    // Thus need to resolve between all processors.
+
+    const auto* fldPtr = obrTmp.findObject<IOField<Type>>(fieldName_);
+
+    if (!returnReduce((fldPtr != nullptr), orOp<bool>()))
+    {
+        return false;
+    }
+
+    const auto* pointsPtr = obrTmp.findObject<vectorField>("position");
+
+    if (!pointsPtr)
+    {
+        // This should be impossible
+        return false;
+    }
+
+    if (Pstream::master())
+    {
+        OFstream os(outputName);
+
+        os << "# x y z " << fieldName_ << nl;
+
+        // Master
+        if (fldPtr)
+        {
+            writeField(os, *pointsPtr, *fldPtr);
+        }
+
+        // Slaves - recv
+        for (int slave=1; slave<Pstream::nProcs(); ++slave)
+        {
+            IPstream fromSlave(Pstream::commsTypes::blocking, slave);
+            vectorField points(fromSlave);
+            Field<Type> fld(fromSlave);
+
+            writeField(os, points, fld);
+        }
+    }
+    else
+    {
+        // Slaves
+
+        OPstream toMaster(Pstream::commsTypes::blocking, Pstream::masterNo());
+
+        if (fldPtr)
+        {
+            toMaster
+                << *pointsPtr
+                << *fldPtr;
+        }
+        else
+        {
+            toMaster
+                << vectorField()
+                << Field<Type>();
+        }
+    }
+
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
index 20916ea29a..a2f5fcfc88 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict
@@ -54,6 +54,7 @@ maxDeltaT       1;
 functions
 {
     #include "vtkCloud"
+    // #include "dataCloud"
     #include "runTimePostProcessing"
 }
 
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud
new file mode 100644
index 0000000000..127d1ccf07
--- /dev/null
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud
@@ -0,0 +1,13 @@
+// -*- C++ -*-
+// Minimal example of using the dataCloud function object.
+dataCloud
+{
+    type    dataCloud;
+    libs    ("liblagrangianFunctionObjects.so");
+    log     true;
+
+    cloud   coalCloud1;
+    field   d;
+}
+
+// ************************************************************************* //