Merge branch 'master' into particleInteractions

applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H

@@ -13,7 +13,7 @@
     );
 
     volVectorField force =
-        U/dimensionedScalar("dt", dimTime, runTime.deltaT().value());
+        U/dimensionedScalar("dt", dimTime, runTime.deltaTValue());
 
     Kmesh K(mesh);
-    UOprocess forceGen(K, runTime.deltaT().value(), turbulenceProperties);
+    UOprocess forceGen(K, runTime.deltaTValue(), turbulenceProperties);

applications/solvers/combustion/PDRFoam/StCourantNo.H

@@ -41,11 +41,11 @@ Description
 
         StCoNum =
             max(SfUfbyDelta/mesh.magSf()).value()
-           *runTime.deltaT().value();
+           *runTime.deltaTValue();
 
         meanStCoNum =
             (sum(SfUfbyDelta)/sum(mesh.magSf())).value()
-        *runTime.deltaT().value();
+        *runTime.deltaTValue();
     }
 
     Info<< "St courant Number mean: " << meanStCoNum

applications/solvers/combustion/PDRFoam/setDeltaT.H

@@ -41,12 +41,12 @@ if (adjustTimeStep)
     (
         min
         (
-            deltaTFact*runTime.deltaT().value(),
+            deltaTFact*runTime.deltaTValue(),
             maxDeltaT
         )
     );
     
-    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
+    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
 }
 
 // ************************************************************************* //

applications/solvers/combustion/XiFoam/bEqn.H

@@ -40,7 +40,7 @@ if (ign.ignited())
     (
         mesh.surfaceInterpolation::deltaCoeffs()
        *mag(phiSt)/(fvc::interpolate(rho)*mesh.magSf())
-    ).value()*runTime.deltaT().value();
+    ).value()*runTime.deltaTValue();
 
     Info<< "Max St-Courant Number = " << StCoNum << endl;
 

applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C

@@ -89,8 +89,8 @@ int main(int argc, char *argv[])
 
         chemistry.solve
         (
-            runTime.value() - runTime.deltaT().value(),
+            runTime.value() - runTime.deltaTValue(),
-            runTime.deltaT().value()
+            runTime.deltaTValue()
         );
 
         // turbulent time scale

applications/solvers/combustion/dieselFoam/dieselFoam.C

@@ -80,8 +80,8 @@ int main(int argc, char *argv[])
 
         chemistry.solve
         (
-            runTime.value() - runTime.deltaT().value(),
+            runTime.value() - runTime.deltaTValue(),
-            runTime.deltaT().value()
+            runTime.deltaTValue()
         );
 
         // turbulent time scale

applications/solvers/combustion/reactingFoam/chemistry.H

@@ -3,8 +3,8 @@
 
     chemistry.solve
     (
-        runTime.value() - runTime.deltaT().value(),
+        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaT().value()
+        runTime.deltaTValue()
     );
 
     // turbulent time scale

applications/solvers/combustion/rhoReactingFoam/chemistry.H

@@ -3,8 +3,8 @@
 
     chemistry.solve
     (
-        runTime.value() - runTime.deltaT().value(),
+        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaT().value()
+        runTime.deltaTValue()
     );
 
     // turbulent time scale

applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H

@@ -38,11 +38,11 @@ if (mesh.nInternalFaces())
     surfaceScalarField amaxSfbyDelta =
         mesh.surfaceInterpolation::deltaCoeffs()*amaxSf;
 
-    CoNum = max(amaxSfbyDelta/mesh.magSf()).value()*runTime.deltaT().value();
+    CoNum = max(amaxSfbyDelta/mesh.magSf()).value()*runTime.deltaTValue();
 
     meanCoNum =
         (sum(amaxSfbyDelta)/sum(mesh.magSf())).value()
-       *runTime.deltaT().value();
+       *runTime.deltaTValue();
 }
 
 Info<< "Mean and max Courant Numbers = "

applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C

@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
         (
             mesh.surfaceInterpolation::deltaCoeffs()
            *mag(phiv)/mesh.magSf()
-        ).value()*runTime.deltaT().value();
+        ).value()*runTime.deltaTValue();
 
         Info<< "\nMax Courant Number = " << CoNum << endl;
 

applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C

@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
         (
             mesh.surfaceInterpolation::deltaCoeffs()
            *mag(phiv)/mesh.magSf()
-        ).value()*runTime.deltaT().value();
+        ).value()*runTime.deltaTValue();
 
         Info<< "Max Courant Number = " << CoNum << endl;
 

applications/solvers/electromagnetics/mhdFoam/magneticFieldErr.H

@@ -1,4 +1,4 @@
 Info<< "magnetic flux divergence error = "
-    << runTime.deltaT().value()
+    << runTime.deltaTValue()
       *mag(fvc::div(phiB))().weightedAverage(mesh.V()).value()
     << endl;

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C

@@ -47,10 +47,10 @@ Foam::scalar Foam::compressibleCourantNo
           / fvc::interpolate(rho);
 
         CoNum = max(SfUfbyDelta/mesh.magSf())
-            .value()*runTime.deltaT().value();
+            .value()*runTime.deltaTValue();
 
         meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-            .value()*runTime.deltaT().value();
+            .value()*runTime.deltaTValue();
     }
 
     Info<< "Region: " << mesh.name() << " Courant Number mean: " << meanCoNum

applications/solvers/incompressible/shallowWaterFoam/CourantNo.H

@@ -42,10 +42,10 @@ if (mesh.nInternalFaces())
        *mag(phi)/fvc::interpolate(h);
 
     CoNum = max(SfUfbyDelta/mesh.magSf())
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     // Gravity wave Courant number
     waveCoNum =
@@ -53,7 +53,7 @@ if (mesh.nInternalFaces())
         (
             mesh.surfaceInterpolation::deltaCoeffs()
            *sqrt(fvc::interpolate(h))
-        ).value()*sqrt(magg).value()*runTime.deltaT().value();
+        ).value()*sqrt(magg).value()*runTime.deltaTValue();
 }
 
 Info<< "Courant number mean: " << meanCoNum

applications/solvers/lagrangian/coalChemistryFoam/chemistry.H

@@ -3,8 +3,8 @@
 
     chemistry.solve
     (
-        runTime.value() - runTime.deltaT().value(),
+        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaT().value()
+        runTime.deltaTValue()
     );
 
     // turbulent time scale

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H

@@ -3,8 +3,8 @@
 
     chemistry.solve
     (
-        runTime.value() - runTime.deltaT().value(),
+        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaT().value()
+        runTime.deltaTValue()
     );
 
     // turbulent time scale

applications/solvers/lagrangian/reactingParcelFoam/chemistry.H

@@ -3,8 +3,8 @@
 
     chemistry.solve
     (
-        runTime.value() - runTime.deltaT().value(),
+        runTime.value() - runTime.deltaTValue(),
-        runTime.deltaT().value()
+        runTime.deltaTValue()
     );
 
     // turbulent time scale

applications/solvers/multiphase/cavitatingFoam/CourantNo.H

@@ -40,15 +40,15 @@ if (mesh.nInternalFaces())
         mesh.surfaceInterpolation::deltaCoeffs()*mag(phiv);
 
     CoNum = max(SfUfbyDelta/mesh.magSf())
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     acousticCoNum = max
     (
         mesh.surfaceInterpolation::deltaCoeffs()/sqrt(fvc::interpolate(psi))
-    ).value()*runTime.deltaT().value();
+    ).value()*runTime.deltaTValue();
 }
 
 Info<< "phiv Courant Number mean: " << meanCoNum

applications/solvers/multiphase/cavitatingFoam/setDeltaT.H

@@ -43,12 +43,12 @@ if (adjustTimeStep)
     (
         min
         (
-            deltaTFact*runTime.deltaT().value(),
+            deltaTFact*runTime.deltaTValue(),
             maxDeltaT
         )
     );
     
-    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
+    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
 }
 
 // ************************************************************************* //

applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H

@@ -44,7 +44,7 @@ if (adjustTimeStep)
         (
             min
             (
-                maxDeltaTFact*runTime.deltaT().value(),
+                maxDeltaTFact*runTime.deltaTValue(),
                 maxDeltaT
             )
         );

applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H

@@ -1,5 +1,5 @@
     scalar sumLocalContErr =
-        runTime.deltaT().value()*
+        runTime.deltaTValue()*
         mag
         (
             fvc::ddt(rho)
@@ -7,7 +7,7 @@
         )().weightedAverage(rho*mesh.V()).value();
 
     scalar globalContErr =
-          runTime.deltaT().value()*
+          runTime.deltaTValue()*
           (
               fvc::ddt(rho)
             + fvc::div(phi)

applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H

@@ -5,7 +5,7 @@
     (
         mesh.surfaceInterpolation::deltaCoeffs()*mag(phia - phib)
        /mesh.magSf()
-    ).value()*runTime.deltaT().value();
+    ).value()*runTime.deltaTValue();
 
     Info<< "Max Ur Courant Number = " << UrCoNum << endl;
 

applications/test/fieldDependency/fieldDependency.C

@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 
 
     Info<< "p.eventNo:" << p.eventNo() << endl;
-    Info<< "p.uptodate:" << p.upToDate("T")<< endl;
+    Info<< "p.uptodate:" << p.upToDate(T)<< endl;
 
     // Change T and mark as uptodate.
     Info<< "Changing T" << endl;
@@ -84,12 +84,12 @@ int main(int argc, char *argv[])
     Info<< "T.eventNo:" << T.eventNo() << endl;
 
     // Check p dependency:
-    Info<< "p.uptodate:" << p.upToDate("T")<< endl;
+    Info<< "p.uptodate:" << p.upToDate(T)<< endl;
 
     // Change p and mark as uptodate.
     Info<< "Changing p." << endl;
     p.setUpToDate();
-    Info<< "p.uptodate:" << p.upToDate("T")<< endl;
+    Info<< "p.uptodate:" << p.upToDate(T)<< endl;
     Info<< "p.eventNo:" << p.eventNo() << endl;
 
 

applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C

@@ -53,7 +53,7 @@ Description
 #include "removePoints.H"
 #include "polyMesh.H"
 #include "mapPolyMesh.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 using namespace Foam;
 

applications/utilities/mesh/advanced/splitCells/splitCells.C

@@ -49,7 +49,7 @@ Description
 #include "cellSet.H"
 #include "cellModeller.H"
 #include "meshCutter.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "geomCellLooper.H"
 #include "plane.H"
 #include "edgeVertex.H"

applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C

@@ -43,7 +43,7 @@ Description
 #include "symmetryPolyPatch.H"
 #include "wedgePolyPatch.H"
 #include "cyclicPolyPatch.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 using namespace Foam;
 

applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C

@@ -59,7 +59,7 @@ Usage
 #include "Time.H"
 #include "timeSelector.H"
 #include "fvMesh.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "polyTopoChange.H"
 #include "mapPolyMesh.H"
 #include "PackedBoolList.H"

applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C

@@ -33,7 +33,7 @@ Description
 #include "IOmanip.H"
 #include "boundBox.H"
 #include "Map.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.C

@@ -26,7 +26,7 @@ License
 
 #include "wedge.H"
 #include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/utilities/mesh/manipulation/autoPatch/autoPatch.C

@@ -33,7 +33,7 @@ Description
 #include "Time.H"
 #include "boundaryMesh.H"
 #include "repatchPolyTopoChanger.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "OFstream.H"
 #include "ListOps.H"
 

src/OpenFOAM/db/regIOobject/regIOobject.C

@@ -173,9 +173,9 @@ bool Foam::regIOobject::checkOut()
 }
 
 
-bool Foam::regIOobject::upToDate(const word& a) const
+bool Foam::regIOobject::upToDate(const regIOobject& a) const
 {
-    if (db().lookupObject<regIOobject>(a).eventNo() >= eventNo_)
+    if (a.eventNo() >= eventNo_)
     {
         return false;
     }
@@ -186,12 +186,16 @@ bool Foam::regIOobject::upToDate(const word& a) const
 }
 
 
-bool Foam::regIOobject::upToDate(const word& a, const word& b) const
+bool Foam::regIOobject::upToDate
+(
+    const regIOobject& a,
+    const regIOobject& b
+) const
 {
     if
     (
-        db().lookupObject<regIOobject>(a).eventNo() >= eventNo_
+        a.eventNo() >= eventNo_
-     || db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
+     || b.eventNo() >= eventNo_
     )
     {
         return false;
@@ -205,16 +209,16 @@ bool Foam::regIOobject::upToDate(const word& a, const word& b) const
 
 bool Foam::regIOobject::upToDate
 (
-    const word& a,
+    const regIOobject& a,
-    const word& b,
+    const regIOobject& b,
-    const word& c
+    const regIOobject& c
 ) const
 {
     if
     (
-        db().lookupObject<regIOobject>(a).eventNo() >= eventNo_
+        a.eventNo() >= eventNo_
-     || db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
+     || b.eventNo() >= eventNo_
-     || db().lookupObject<regIOobject>(c).eventNo() >= eventNo_
+     || c.eventNo() >= eventNo_
     )
     {
         return false;
@@ -228,18 +232,18 @@ bool Foam::regIOobject::upToDate
 
 bool Foam::regIOobject::upToDate
 (
-    const word& a,
+    const regIOobject& a,
-    const word& b,
+    const regIOobject& b,
-    const word& c,
+    const regIOobject& c,
-    const word& d
+    const regIOobject& d
 ) const
 {
     if
     (
-        db().lookupObject<regIOobject>(a).eventNo() >= eventNo_
+        a.eventNo() >= eventNo_
-     || db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
+     || b.eventNo() >= eventNo_
-     || db().lookupObject<regIOobject>(c).eventNo() >= eventNo_
+     || c.eventNo() >= eventNo_
-     || db().lookupObject<regIOobject>(d).eventNo() >= eventNo_
+     || d.eventNo() >= eventNo_
     )
     {
         return false;

src/OpenFOAM/db/regIOobject/regIOobject.H

@@ -154,19 +154,38 @@ public:
             //- Event number at last update.
             inline label& eventNo();
 
-            //- Am I uptodate with respect to other regIOobjects
+            //- Return true if up-to-date with respect to given object
-            bool upToDate(const word&) const;
+            //  otherwise false
-            bool upToDate(const word&, const word&) const;
+            bool upToDate(const regIOobject&) const;
-            bool upToDate(const word&, const word&, const word&) const;
+
+            //- Return true if up-to-date with respect to given objects
+            //  otherwise false
             bool upToDate
             (
-                const word&,
+                const regIOobject&,
-                const word&,
+                const regIOobject&
-                const word&,
-                const word&
             ) const;
 
-            //- Flag me as up to date
+            //- Return true if up-to-date with respect to given objects
+            //  otherwise false
+            bool upToDate
+            (
+                const regIOobject&,
+                const regIOobject&,
+                const regIOobject&
+            ) const;
+
+            //- Return true if up-to-date with respect to given objects
+            //  otherwise false
+            bool upToDate
+            (
+                const regIOobject&,
+                const regIOobject&,
+                const regIOobject&,
+                const regIOobject&
+            ) const;
+
+            //- Set up to date (obviously)
             void setUpToDate();
 
 

src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H

@@ -26,7 +26,7 @@ Namespace
     Foam::constant::mathematical
 
 Description
-    mathematical constants and conversion functions
+    mathematical constants.
 
 \*---------------------------------------------------------------------------*/
 
@@ -60,20 +60,6 @@ namespace mathematical
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Conversion from degrees to radians
-inline scalar degToRad(const scalar& deg)
-{
-    return (deg*constant::mathematical::pi/180.0);
-}
-
-//- Conversion from radians to degrees
-inline scalar radToDeg(const scalar& rad)
-{
-    return (rad*180.0/constant::mathematical::pi);
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/global/unitConversion/unitConversion.H

@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2009 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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Namespace
+    Foam
+
+Description
+    Unit conversion functions
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef unitConversion_H
+#define unitConversion_H
+
+#include "mathematicalConstants.H"
+
+using namespace Foam::constant::mathematical;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Conversion from degrees to radians
+inline scalar degToRad(const scalar& deg)
+{
+    return (deg*pi/180.0);
+}
+
+//- Conversion from radians to degrees
+inline scalar radToDeg(const scalar& rad)
+{
+    return (rad*180.0/pi);
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C

@@ -27,7 +27,7 @@ License
 #include "primitiveMesh.H"
 #include "pyramidPointFaceRef.H"
 #include "ListOps.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "SortableList.H"
 
 

src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C

@@ -31,10 +31,7 @@ Description
 #include "primitiveMesh.H"
 #include "pyramidPointFaceRef.H"
 #include "cell.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/dynamicFvMesh/include/meshCourantNo.H

@@ -39,10 +39,10 @@ if (mesh.nInternalFaces())
         mesh.surfaceInterpolation::deltaCoeffs()*mag(mesh.phi());
 
     meshCoNum = max(SfUfbyDelta/mesh.magSf())
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     meanMeshCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 }
 
 Info<< "Mesh Courant Number mean: " << meanMeshCoNum

src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C

@@ -27,7 +27,7 @@ License
 #include "topoCellLooper.H"
 #include "cellFeatures.H"
 #include "polyMesh.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "DynamicList.H"
 #include "ListOps.H"
 #include "meshTools.H"

src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C

@@ -32,7 +32,7 @@ License
 #include "cellCuts.H"
 #include "splitCell.H"
 #include "mapPolyMesh.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "meshTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C

@@ -27,7 +27,7 @@ License
 #include "polyMeshGeometry.H"
 #include "pyramidPointFaceRef.H"
 #include "syncTools.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 namespace Foam
 {

src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C

@@ -119,7 +119,7 @@ void fvMotionSolverEngineMesh::move()
 
 
     pistonPosition_.value() += deltaZ;
-    scalar pistonSpeed = deltaZ/engineDB_.deltaT().value();
+    scalar pistonSpeed = deltaZ/engineDB_.deltaTValue();
 
     Info<< "clearance: " << deckHeight_.value() - pistonPosition_.value() << nl
         << "Piston speed = " << pistonSpeed << " m/s" << endl;

src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C

@@ -121,7 +121,7 @@ void layeredEngineMesh::move()
     }
 
     pistonPosition_.value() += deltaZ;
-    scalar pistonSpeed = deltaZ/engineDB_.deltaT().value();
+    scalar pistonSpeed = deltaZ/engineDB_.deltaTValue();
 
     Info<< "clearance: " << deckHeight_.value() - pistonPosition_.value() << nl
         << "Piston speed = " << pistonSpeed << " m/s" << endl;

src/engine/engineTime/engineTime.C

@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "engineTime.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -165,7 +165,7 @@ Foam::scalar Foam::engineTime::thetaRevolution() const
 
 Foam::scalar Foam::engineTime::deltaTheta() const
 {
-    return timeToDeg(deltaT().value());
+    return timeToDeg(deltaTValue());
 }
 
 
@@ -216,7 +216,7 @@ Foam::dimensionedScalar Foam::engineTime::pistonSpeed() const
     (
         "pistonSpeed",
         dimVelocity,
-        pistonDisplacement().value()/(deltaT().value() + VSMALL)
+        pistonDisplacement().value()/(deltaTValue() + VSMALL)
     );
 }
 

src/engine/engineValve/engineValve.C

@@ -208,7 +208,7 @@ Foam::scalar Foam::engineValve::curVelocity() const
                  lift(engineDB_.theta() - engineDB_.deltaTheta()),
                  minLift_
              )
-        )/(engineDB_.deltaT().value() + VSMALL);
+        )/(engineDB_.deltaTValue() + VSMALL);
 }
 
 

src/engine/ignition/ignitionSite.C

@@ -106,7 +106,7 @@ const labelList& ignitionSite::cells() const
 bool ignitionSite::igniting() const
 {
     scalar curTime = db_.value();
-    scalar deltaT = db_.deltaT().value();
+    scalar deltaT = db_.deltaTValue();
 
     return
     (
@@ -120,7 +120,7 @@ bool ignitionSite::igniting() const
 bool ignitionSite::ignited() const
 {
     scalar curTime = db_.value();
-    scalar deltaT = db_.deltaT().value();
+    scalar deltaT = db_.deltaTValue();
 
     return(curTime - deltaT >= time_);
 }

src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H

@@ -39,10 +39,10 @@ if (mesh.nInternalFaces())
         mesh.surfaceInterpolation::deltaCoeffs()*mag(phi)/fvc::interpolate(rho);
 
     CoNum = max(SfUfbyDelta/mesh.magSf())
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 }
 
 Info<< "Courant Number mean: " << meanCoNum

src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.C

@@ -180,7 +180,7 @@ Foam::timeActivatedExplicitMulticomponentPointSource::Su
         DimensionedField<scalar, volMesh>& sourceField = tSource();
 
         const scalarField& V = mesh_.V();
-        const scalar dt = runTime_.deltaT().value();
+        const scalar dt = runTime_.deltaTValue();
 
         forAll(pointSources_, sourceI)
         {
@@ -240,7 +240,7 @@ Foam::timeActivatedExplicitMulticomponentPointSource::Su()
         DimensionedField<scalar, volMesh>& sourceField = tSource();
 
         const scalarField& V = mesh_.V();
-        const scalar dt = runTime_.deltaT().value();
+        const scalar dt = runTime_.deltaTValue();
 
         forAll(pointSources_, sourceI)
         {

src/finiteVolume/cfdTools/general/include/setDeltaT.H

@@ -41,12 +41,12 @@ if (adjustTimeStep)
     (
         min
         (
-            deltaTFact*runTime.deltaT().value(),
+            deltaTFact*runTime.deltaTValue(),
             maxDeltaT
         )
     );
 
-    Info<< "deltaT = " <<  runTime.deltaT().value() << endl;
+    Info<< "deltaT = " <<  runTime.deltaTValue() << endl;
 }
 
 // ************************************************************************* //

src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H

@@ -39,7 +39,7 @@ if (adjustTimeStep)
         (
             min
             (
-                maxCo*runTime.deltaT().value()/CoNum,
+                maxCo*runTime.deltaTValue()/CoNum,
                 maxDeltaT
             )
         );

src/finiteVolume/cfdTools/general/include/volContinuity.H

@@ -4,12 +4,12 @@
     // Backward Differencing in time.
 
     conserve.internalField() +=
-        (1.0 - mesh.V0()/mesh.V())/runTime.deltaT().value();
+        (1.0 - mesh.V0()/mesh.V())/runTime.deltaTValue();
 
-    scalar sumLocalContErr = runTime.deltaT().value()*
+    scalar sumLocalContErr = runTime.deltaTValue()*
         mag(conserve)().weightedAverage(mesh.V()).value();
 
-    scalar globalContErr = runTime.deltaT().value()*
+    scalar globalContErr = runTime.deltaTValue()*
         conserve.weightedAverage(mesh.V()).value();
 
     Info<< "volume continuity errors : sum local = " << sumLocalContErr

src/finiteVolume/cfdTools/incompressible/CourantNo.H

@@ -39,10 +39,10 @@ if (mesh.nInternalFaces())
         mesh.surfaceInterpolation::deltaCoeffs()*mag(phi);
 
     CoNum = max(SfUfbyDelta/mesh.magSf())
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 
     meanCoNum = (sum(SfUfbyDelta)/sum(mesh.magSf()))
-        .value()*runTime.deltaT().value();
+        .value()*runTime.deltaTValue();
 }
 
 Info<< "Courant Number mean: " << meanCoNum

src/finiteVolume/cfdTools/incompressible/continuityErrs.H

@@ -33,10 +33,10 @@ Description
 {
     volScalarField contErr = fvc::div(phi);
 
-    scalar sumLocalContErr = runTime.deltaT().value()*
+    scalar sumLocalContErr = runTime.deltaTValue()*
         mag(contErr)().weightedAverage(mesh.V()).value();
 
-    scalar globalContErr = runTime.deltaT().value()*
+    scalar globalContErr = runTime.deltaTValue()*
         contErr.weightedAverage(mesh.V()).value();
     cumulativeContErr += globalContErr;
 

src/finiteVolume/cfdTools/incompressible/movingMeshContinuityErrs.H

@@ -33,10 +33,10 @@ Description
 {
     volScalarField contErr = fvc::div(phi + fvc::meshPhi(U));
 
-    scalar sumLocalContErr = runTime.deltaT().value()*
+    scalar sumLocalContErr = runTime.deltaTValue()*
         mag(contErr)().weightedAverage(mesh.V()).value();
 
-    scalar globalContErr = runTime.deltaT().value()*
+    scalar globalContErr = runTime.deltaTValue()*
         contErr.weightedAverage(mesh.V()).value();
 
     cumulativeContErr += globalContErr;

src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H

@@ -32,11 +32,11 @@ Description
 
 if (mesh.moving())
 {
-    scalar sumLocalContErr = runTime.deltaT().value()*
+    scalar sumLocalContErr = runTime.deltaTValue()*
         mag(fvc::div(phi + fvc::meshPhi(rho, U)))()
        .weightedAverage(mesh.V()).value();
 
-    scalar globalContErr = runTime.deltaT().value()*
+    scalar globalContErr = runTime.deltaTValue()*
         fvc::div(phi + fvc::meshPhi(rho, U))()
        .weightedAverage(mesh.V()).value();
 

src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C

@@ -223,7 +223,7 @@ void Foam::activeBaffleVelocityFvPatchVectorField::updateCoeffs()
                 openFraction_
               + max
                 (
-                    this->db().time().deltaT().value()/openingTime_,
+                    this->db().time().deltaTValue()/openingTime_,
                     maxOpenFractionDelta_
                 )
                *(orientation_*sign(forceDiff)),

src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C

@@ -202,7 +202,7 @@ void advectiveFvPatchField<Type>::updateCoeffs()
         this->dimensionedInternalField().mesh()
        .ddtScheme(this->dimensionedInternalField().name())
     );
-    scalar deltaT = this->db().time().deltaT().value();
+    scalar deltaT = this->db().time().deltaTValue();
 
     const GeometricField<Type, fvPatchField, volMesh>& field =
         this->db().objectRegistry::

src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C

@@ -112,7 +112,7 @@ void movingWallVelocityFvPatchVectorField::updateCoeffs()
         oldFc[i] = pp[i].centre(oldPoints);
     }
 
-    vectorField Up = (pp.faceCentres() - oldFc)/mesh.time().deltaT().value();
+    vectorField Up = (pp.faceCentres() - oldFc)/mesh.time().deltaTValue();
 
     const volVectorField& U = db().lookupObject<volVectorField>("U");
     scalarField phip =

src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C

@@ -196,7 +196,7 @@ void syringePressureFvPatchScalarField::updateCoeffs()
     }
 
     scalar t = db().time().value();
-    scalar deltaT = db().time().deltaT().value();
+    scalar deltaT = db().time().deltaTValue();
 
     const surfaceScalarField& phi =
         db().lookupObject<surfaceScalarField>("phi");

src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C

@@ -59,8 +59,8 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
         IOobject::NO_WRITE
     );
 
-    scalar deltaT = mesh().time().deltaT().value();
+    scalar deltaT = mesh().time().deltaTValue();
-    scalar deltaT0 = mesh().time().deltaT0().value();
+    scalar deltaT0 = mesh().time().deltaT0Value();
 
     scalar coefft   = (deltaT + deltaT0)/(2*deltaT);
     scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@@ -137,8 +137,8 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
         IOobject::NO_WRITE
     );
 
-    scalar deltaT = mesh().time().deltaT().value();
+    scalar deltaT = mesh().time().deltaTValue();
-    scalar deltaT0 = mesh().time().deltaT0().value();
+    scalar deltaT0 = mesh().time().deltaT0Value();
 
     scalar coefft   = (deltaT + deltaT0)/(2*deltaT);
     scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@@ -246,8 +246,8 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
 
     fvMatrix<Type>& fvm = tfvm();
 
-    scalar deltaT = mesh().time().deltaT().value();
+    scalar deltaT = mesh().time().deltaTValue();
-    scalar deltaT0 = mesh().time().deltaT0().value();
+    scalar deltaT0 = mesh().time().deltaT0Value();
 
     scalar coefft   = (deltaT + deltaT0)/(2*deltaT);
     scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@@ -307,8 +307,8 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
 
     fvMatrix<Type>& fvm = tfvm();
 
-    scalar deltaT = mesh().time().deltaT().value();
+    scalar deltaT = mesh().time().deltaTValue();
-    scalar deltaT0 = mesh().time().deltaT0().value();
+    scalar deltaT0 = mesh().time().deltaT0Value();
 
     scalar coefft   = (deltaT + deltaT0)/(2*deltaT);
     scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@@ -368,8 +368,8 @@ EulerD2dt2Scheme<Type>::fvmD2dt2
 
     fvMatrix<Type>& fvm = tfvm();
 
-    scalar deltaT = mesh().time().deltaT().value();
+    scalar deltaT = mesh().time().deltaTValue();
-    scalar deltaT0 = mesh().time().deltaT0().value();
+    scalar deltaT0 = mesh().time().deltaT0Value();
 
     scalar coefft   = (deltaT + deltaT0)/(2*deltaT);
     scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);

src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C

@@ -276,7 +276,7 @@ EulerDdtScheme<Type>::fvmDdt
 
     fvMatrix<Type>& fvm = tfvm();
 
-    scalar rDeltaT = 1.0/mesh().time().deltaT().value();
+    scalar rDeltaT = 1.0/mesh().time().deltaTValue();
 
     fvm.diag() = rDeltaT*mesh().V();
 
@@ -311,7 +311,7 @@ EulerDdtScheme<Type>::fvmDdt
     );
     fvMatrix<Type>& fvm = tfvm();
 
-    scalar rDeltaT = 1.0/mesh().time().deltaT().value();
+    scalar rDeltaT = 1.0/mesh().time().deltaTValue();
 
     fvm.diag() = rDeltaT*rho.value()*mesh().V();
 
@@ -348,7 +348,7 @@ EulerDdtScheme<Type>::fvmDdt
     );
     fvMatrix<Type>& fvm = tfvm();
 
-    scalar rDeltaT = 1.0/mesh().time().deltaT().value();
+    scalar rDeltaT = 1.0/mesh().time().deltaTValue();
 
     fvm.diag() = rDeltaT*rho.internalField()*mesh().V();
 

src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C

@@ -44,14 +44,14 @@ namespace fv
 template<class Type>
 scalar backwardDdtScheme<Type>::deltaT_() const
 {
-    return mesh().time().deltaT().value();
+    return mesh().time().deltaTValue();
 }
 
 
 template<class Type>
 scalar backwardDdtScheme<Type>::deltaT0_() const
 {
-    return mesh().time().deltaT0().value();
+    return mesh().time().deltaT0Value();
 }
 
 

src/finiteVolume/finiteVolume/ddtSchemes/boundedBackwardDdtScheme/boundedBackwardDdtScheme.C

@@ -42,13 +42,13 @@ namespace fv
 
 scalar boundedBackwardDdtScheme::deltaT_() const
 {
-    return mesh().time().deltaT().value();
+    return mesh().time().deltaTValue();
 }
 
 
 scalar boundedBackwardDdtScheme::deltaT0_() const
 {
-    return mesh().time().deltaT0().value();
+    return mesh().time().deltaT0Value();
 }
 
 

src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C

@@ -52,7 +52,6 @@ void Foam::fvSchemes::clear()
     defaultLaplacianScheme_.clear();
     fluxRequired_.clear();
     defaultFluxRequired_ = false;
-    cacheFields_.clear();
 }
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -169,15 +168,7 @@ Foam::fvSchemes::fvSchemes(const objectRegistry& obr)
             tokenList()
         )()
     ),
-    defaultFluxRequired_(false),
+    defaultFluxRequired_(false)
-    cacheFields_
-    (
-        ITstream
-        (
-            objectPath() + "::cacheFields",
-            tokenList()
-        )()
-    )
 {
     read();
 }
@@ -381,11 +372,6 @@ bool Foam::fvSchemes::read()
             }
         }
 
-        if (dict.found("cacheFields"))
-        {
-            cacheFields_ = dict.subDict("cacheFields");
-        }
-
         return true;
     }
     else
@@ -563,22 +549,4 @@ bool Foam::fvSchemes::fluxRequired(const word& name) const
 }
 
 
-bool Foam::fvSchemes::cache(const word& name) const
-{
-    if (debug)
-    {
-        Info<< "Lookup cache for " << name << endl;
-    }
-
-    if (cacheFields_.found(name))
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
 // ************************************************************************* //

src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H

@@ -79,8 +79,6 @@ class fvSchemes
         dictionary fluxRequired_;
         bool defaultFluxRequired_;
 
-        dictionary cacheFields_;
-
 
     // Private Member Functions
 
@@ -128,8 +126,6 @@ public:
 
             bool fluxRequired(const word& name) const;
 
-            bool cache(const word& name) const;
-
 
         // Read
 

src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C

@@ -99,7 +99,7 @@ void Foam::MULES::explicitSolve
 
     scalarField& psiIf = psi;
     const scalarField& psi0 = psi.oldTime();
-    const scalar deltaT = mesh.time().deltaT().value();
+    const scalar deltaT = mesh.time().deltaTValue();
 
     psiIf = 0.0;
     fvc::surfaceIntegrate(psiIf, phiPsi);
@@ -328,7 +328,7 @@ void Foam::MULES::limiter
     const unallocLabelList& owner = mesh.owner();
     const unallocLabelList& neighb = mesh.neighbour();
     const scalarField& V = mesh.V();
-    const scalar deltaT = mesh.time().deltaT().value();
+    const scalar deltaT = mesh.time().deltaTValue();
 
     const scalarField& phiBDIf = phiBD;
     const surfaceScalarField::GeometricBoundaryField& phiBDBf =

src/finiteVolume/fvMesh/fvMesh.C

@@ -576,7 +576,7 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
 
     // Move the polyMesh and set the mesh motion fluxes to the swept-volumes
 
-    scalar rDeltaT = 1.0/time().deltaT().value();
+    scalar rDeltaT = 1.0/time().deltaTValue();
 
     tmp<scalarField> tsweptVols = polyMesh::movePoints(p);
     scalarField& sweptVols = tsweptVols();

src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C

@@ -32,7 +32,7 @@ Description
 #include "surfaceFields.H"
 #include "demandDrivenData.H"
 #include "coupledFvPatch.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C

@@ -142,7 +142,7 @@ Foam::velocityComponentLaplacianFvMotionSolver::curPoints() const
     (
         cmpt_,
         tcurPoints().component(cmpt_)
-      + fvMesh_.time().deltaT().value()*pointMotionU_.internalField()
+      + fvMesh_.time().deltaTValue()*pointMotionU_.internalField()
     );
 
     twoDCorrectPoints(tcurPoints());

src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C

@@ -112,7 +112,7 @@ Foam::velocityLaplacianFvMotionSolver::curPoints() const
     tmp<pointField> tcurPoints
     (
         fvMesh_.points()
-      + fvMesh_.time().deltaT().value()*pointMotionU_.internalField()
+      + fvMesh_.time().deltaTValue()*pointMotionU_.internalField()
     );
 
     twoDCorrectPoints(tcurPoints());

src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C

@@ -146,7 +146,7 @@ void angularOscillatingVelocityPointPatchVectorField::updateCoeffs()
           + (axisHat ^ p0Rel*sin(angle))
           + (axisHat & p0Rel)*(1 - cos(angle))*axisHat
           - p.localPoints()
-        )/t.deltaT().value()
+        )/t.deltaTValue()
     );
 
     fixedValuePointPatchField<vector>::updateCoeffs();

src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C

@@ -125,7 +125,7 @@ void oscillatingVelocityPointPatchVectorField::updateCoeffs()
     Field<vector>::operator=
     (
         (p0_ + amplitude_*sin(omega_*t.value()) - p.localPoints())
-       /t.deltaT().value()
+       /t.deltaTValue()
     );
 
     fixedValuePointPatchField<vector>::updateCoeffs();

src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C

@@ -129,7 +129,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
     // calculate the forces on the motion object from this data, then
     // update the positions
 
-    motion_.updatePosition(t.deltaT().value());
+    motion_.updatePosition(t.deltaTValue());
 
     dictionary forcesDict;
 
@@ -157,7 +157,7 @@ void sixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
     (
         fm.first().first() + fm.first().second() + gravity*motion_.mass(),
         fm.second().first() + fm.second().second(),
-        t.deltaT().value()
+        t.deltaTValue()
     );
 
     Field<vector>::operator=(motion_.generatePositions(p0_) - p0_);

src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C

@@ -64,7 +64,7 @@ void surfaceDisplacementPointPatchVectorField::calcProjection
     const pointField& localPoints = patch().localPoints();
     const labelList& meshPoints = patch().meshPoints();
 
-    //const scalar deltaT = mesh.time().deltaT().value();
+    //const scalar deltaT = mesh.time().deltaTValue();
 
     // Construct large enough vector in direction of projectDir so
     // we're guaranteed to hit something.
@@ -451,7 +451,7 @@ void surfaceDisplacementPointPatchVectorField::updateCoeffs()
 
     // Clip offset to maximum displacement possible: velocity*timestep
 
-    const scalar deltaT = mesh.time().deltaT().value();
+    const scalar deltaT = mesh.time().deltaTValue();
     const vector clipVelocity = velocity_*deltaT;
 
     forAll(displacement, i)

src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C

@@ -63,7 +63,7 @@ void surfaceSlipDisplacementPointPatchVectorField::calcProjection
     const pointField& localPoints = patch().localPoints();
     const labelList& meshPoints = patch().meshPoints();
 
-    //const scalar deltaT = mesh.time().deltaT().value();
+    //const scalar deltaT = mesh.time().deltaTValue();
 
     // Construct large enough vector in direction of projectDir so
     // we're guaranteed to hit something.

src/lagrangian/basic/Particle/ParticleI.H

@@ -374,7 +374,7 @@ inline Foam::scalar Foam::Particle<ParticleType>::currentTime() const
 {
     return
         cloud_.pMesh().time().value()
-      + stepFraction_*cloud_.pMesh().time().deltaT().value();
+      + stepFraction_*cloud_.pMesh().time().deltaTValue();
 }
 
 

src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C

@@ -27,7 +27,7 @@ License
 #include "multiHoleInjector.H"
 #include "addToRunTimeSelectionTable.H"
 #include "Random.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 namespace Foam

src/lagrangian/dieselSpray/parcel/parcel.C

@@ -100,7 +100,7 @@ bool Foam::parcel::move(spray& sDB)
 
     const liquidMixture& fuels = sDB.fuels();
 
-    scalar deltaT = sDB.runTime().deltaT().value();
+    scalar deltaT = sDB.runTime().deltaTValue();
     label Nf = fuels.components().size();
     label Ns = sDB.composition().Y().size();
 

src/lagrangian/dieselSpray/spray/spray.C

@@ -41,7 +41,7 @@ License
 #include "symmetryPolyPatch.H"
 #include "wedgePolyPatch.H"
 
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/lagrangian/dieselSpray/spray/sprayI.H

@@ -157,7 +157,7 @@ inline tmp<volVectorField> spray::momentumSource() const
         )
     );
 
-    tsource().internalField() = sms_/runTime_.deltaT().value()/mesh_.V();
+    tsource().internalField() = sms_/runTime_.deltaTValue()/mesh_.V();
 
     return tsource;
 }
@@ -185,7 +185,7 @@ inline tmp<volScalarField> spray::evaporationSource(const label si) const
     if (isLiquidFuel_[si])
     {
         label fi = gasToLiquidIndex_[si];
-        tsource().internalField() = srhos_[fi]/runTime_.deltaT().value()/mesh_.V();
+        tsource().internalField() = srhos_[fi]/runTime_.deltaTValue()/mesh_.V();
     }
     else
     {
@@ -216,7 +216,7 @@ inline tmp<volScalarField> spray::heatTransferSource() const
         )
     );
 
-    tsource().internalField() = shs_/runTime_.deltaT().value()/mesh_.V();
+    tsource().internalField() = shs_/runTime_.deltaTValue()/mesh_.V();
 
     return tsource;
 }

src/lagrangian/dieselSpray/spray/sprayInject.C

@@ -71,7 +71,7 @@ void spray::inject()
             // deltaT is the duration of injection during this timestep
             scalar deltaT = min
             (
-                runTime_.deltaT().value(),
+                runTime_.deltaTValue(),
                 min
                 (
                     time - it->tsoi(),
@@ -150,8 +150,8 @@ void spray::inject()
                         scalar dt = time - toi;
 
                         pPtr->stepFraction() =
-                            (runTime_.deltaT().value() - dt)
+                            (runTime_.deltaTValue() - dt)
-                           /runTime_.deltaT().value();
+                           /runTime_.deltaTValue();
 
                         bool keepParcel = pPtr->move(*this);
 

src/lagrangian/dieselSpray/spray/sprayOps.C

@@ -58,7 +58,7 @@ void spray::evolve()
 
     calculateAmbientPressure();
     calculateAmbientTemperature();
-    collisions().collideParcels(runTime_.deltaT().value());
+    collisions().collideParcels(runTime_.deltaTValue());
     move();
     dispersion().disperseParcels();
     inject();
@@ -103,7 +103,7 @@ void spray::breakupLoop()
             breakup().updateParcelProperties
             (
                 elmnt(),
-                runTime_.deltaT().value(),
+                runTime_.deltaTValue(),
                 velocity,
                 fuels_
             );
@@ -111,7 +111,7 @@ void spray::breakupLoop()
             breakup().breakupParcel
             (
                 elmnt(),
-                runTime_.deltaT().value(),
+                runTime_.deltaTValue(),
                 velocity,
                 fuels_
             );
@@ -137,7 +137,7 @@ void spray::atomizationLoop()
             atomization().atomizeParcel
             (
                 elmnt(),
-                runTime_.deltaT().value(),
+                runTime_.deltaTValue(),
                 velocity,
                 fuels_
             );

src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C

@@ -72,7 +72,7 @@ void gradientDispersionRAS::disperseParcels() const
 
     const scalar cps = 0.16432;
 
-    scalar dt = spray_.runTime().deltaT().value();
+    scalar dt = spray_.runTime().deltaTValue();
     const volScalarField& k = turbulence().k();
     volVectorField gradk = fvc::grad(k);
     const volScalarField& epsilon = turbulence().epsilon();

src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C

@@ -73,7 +73,7 @@ void stochasticDispersionRAS::disperseParcels() const
     const scalar cps = 0.16432;
     const vector one(1.0, 1.0, 1.0);
 
-    scalar dt = spray_.runTime().deltaT().value();
+    scalar dt = spray_.runTime().deltaTValue();
     const volScalarField& k = turbulence().k();
     //volVectorField gradk = fvc::grad(k);
     const volScalarField& epsilon = turbulence().epsilon();

src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C

@@ -26,7 +26,7 @@ License
 
 #include "blobsSwirlInjector.H"
 #include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C

@@ -104,7 +104,7 @@ bool reflectParcel::wallTreatment
             vector Ub1 = U_.boundaryField()[patchi][facei];
             vector Ub0 = U_.oldTime().boundaryField()[patchi][facei];
 
-            scalar dt = spray_.runTime().deltaT().value();
+            scalar dt = spray_.runTime().deltaTValue();
             const vectorField& oldPoints = mesh.oldPoints();
 
             const vector& Cf1 = mesh.faceCentres()[globalFacei];

src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H

@@ -128,7 +128,7 @@ inline Foam::Random& Foam::DsmcCloud<ParcelType>::rndGen()
 template<class ParcelType>
 inline void Foam::DsmcCloud<ParcelType>::storeDeltaT()
 {
-    cachedDeltaT_ = mesh().time().deltaT().value();
+    cachedDeltaT_ = mesh().time().deltaTValue();
 }
 
 

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C

@@ -167,7 +167,7 @@ void Foam::KinematicCloud<ParcelType>::checkParcelProperties
         parcel.rho() = constProps_.rho0();
     }
 
-    scalar carrierDt = this->db().time().deltaT().value();
+    scalar carrierDt = this->db().time().deltaTValue();
     parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
 }
 

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C

@@ -226,7 +226,7 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
     const polyMesh& mesh = td.cloud().pMesh();
     const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
 
-    const scalar deltaT = mesh.time().deltaT().value();
+    const scalar deltaT = mesh.time().deltaTValue();
     scalar tEnd = (1.0 - p.stepFraction())*deltaT;
     const scalar dtMax = tEnd;
 

src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C

@@ -351,7 +351,7 @@ void Foam::InjectionModel<CloudType>::inject(TrackData& td)
     }
 
     const scalar time = owner_.db().time().value();
-    const scalar carrierDt = owner_.db().time().deltaT().value();
+    const scalar carrierDt = owner_.db().time().deltaTValue();
     const polyMesh& mesh = owner_.mesh();
 
     // Prepare for next time step

src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C

@@ -41,9 +41,9 @@ void Foam::correlationFunction<Type>::setTimesAndSizes
     const label tZeroBufferSize
 )
 {
-    sampleSteps_  = ceil(sampleInterval_/mesh_.time().deltaT().value());
+    sampleSteps_  = ceil(sampleInterval_/mesh_.time().deltaTValue());
 
-    sampleInterval_ = sampleSteps_*mesh_.time().deltaT().value();
+    sampleInterval_ = sampleSteps_*mesh_.time().deltaTValue();
 
     label bufferLength(ceil(duration_/sampleInterval_));
 

src/lagrangian/molecularDynamics/molecule/molecule/molecule.C

@@ -88,7 +88,7 @@ bool Foam::molecule::move(molecule::trackData& td)
 
     const constantProperties& constProps(td.molCloud().constProps(id_));
 
-    scalar deltaT = cloud().pMesh().time().deltaT().value();
+    scalar deltaT = cloud().pMesh().time().deltaTValue();
 
     if (td.part() == 0)
     {

src/lagrangian/solidParticle/solidParticle.C

@@ -36,7 +36,7 @@ bool Foam::solidParticle::move(solidParticle::trackData& td)
     const polyMesh& mesh = cloud().pMesh();
     const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
 
-    scalar deltaT = mesh.time().deltaT().value();
+    scalar deltaT = mesh.time().deltaTValue();
     scalar tEnd = (1.0 - stepFraction())*deltaT;
     scalar dtMax = tEnd;
 

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C

@@ -34,7 +34,7 @@ Description
 #include "removePoints.H"
 #include "pointFields.H"
 #include "motionSmoother.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "pointSet.H"
 #include "faceSet.H"
 #include "cellSet.H"

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C

@@ -35,6 +35,7 @@ License
 #include "refinementSurfaces.H"
 #include "shellSurfaces.H"
 #include "mapDistributePolyMesh.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C

@@ -26,7 +26,7 @@ License
 
 #include "layerParameters.H"
 #include "polyBoundaryMesh.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "refinementSurfaces.H"
 #include "searchableSurfaces.H"
 #include "regExp.H"

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C

@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "refinementParameters.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "polyMesh.H"
 #include "globalIndex.H"
 

src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C

@@ -37,7 +37,7 @@ License
 #include "searchableSurfaces.H"
 #include "polyMeshGeometry.H"
 #include "IOmanip.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 

src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C

@@ -93,7 +93,7 @@ bool Foam::trackedParticle::move(trackedParticle::trackData& td)
     td.switchProcessor = false;
     td.keepParticle = true;
 
-    scalar deltaT = cloud().pMesh().time().deltaT().value();
+    scalar deltaT = cloud().pMesh().time().deltaTValue();
     scalar tEnd = (1.0 - stepFraction())*deltaT;
     scalar dtMax = tEnd;
 

src/mesh/blockMesh/curvedEdges/arcEdge.C

@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "arcEdge.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

src/meshTools/cellQuality/cellQuality.C

@@ -26,11 +26,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "cellQuality.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from mesh
 Foam::cellQuality::cellQuality(const polyMesh& mesh)
 :
     mesh_(mesh)