diff --git a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
index 9f4d8368a87a1c720bb184ad8ca83008575cdb70..20fd654ceffcfecacbf4a8dbcdb99e907eeaa02f 100644
--- a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H
+++ b/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);
diff --git a/applications/solvers/combustion/PDRFoam/StCourantNo.H b/applications/solvers/combustion/PDRFoam/StCourantNo.H
index 18d6e86a941045877155f7d01b3c844984c76965..5f3f3359fb8fb9891c92a86717af4a88529a5aa2 100644
--- a/applications/solvers/combustion/PDRFoam/StCourantNo.H
+++ b/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
diff --git a/applications/solvers/combustion/PDRFoam/setDeltaT.H b/applications/solvers/combustion/PDRFoam/setDeltaT.H
index 7092e9779a9beb26ccb045ade8b064560c3b1eed..c40bc4a1d751a80ba1147b21970e6fa57ffbc7fa 100644
--- a/applications/solvers/combustion/PDRFoam/setDeltaT.H
+++ b/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;
}
// ************************************************************************* //
diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H
index d06ec2e5f0a1252c1262bcdc702c65ddb759b485..2b9b50d12463a7e4dbb7d5a8694ee4e20b1ad892 100644
--- a/applications/solvers/combustion/XiFoam/bEqn.H
+++ b/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;
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index eaf3219445e03098bddfc77e624e49b248405543..ce80690224ef442289ebeb22c50d882185d9a6f1 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -89,8 +89,8 @@ int main(int argc, char *argv[])
chemistry.solve
(
- runTime.value() - runTime.deltaT().value(),
- runTime.deltaT().value()
+ runTime.value() - runTime.deltaTValue(),
+ runTime.deltaTValue()
);
// turbulent time scale
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 63549b99a5911bc109491a398040d2742c0ae59e..42d9534654432c3f2285de3005223da66af80cff 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -80,8 +80,8 @@ int main(int argc, char *argv[])
chemistry.solve
(
- runTime.value() - runTime.deltaT().value(),
- runTime.deltaT().value()
+ runTime.value() - runTime.deltaTValue(),
+ runTime.deltaTValue()
);
// turbulent time scale
diff --git a/applications/solvers/combustion/reactingFoam/chemistry.H b/applications/solvers/combustion/reactingFoam/chemistry.H
index d059bd9ed34f1a577175a271ef6e77360bf63bb6..691b6dcb920832fcd215e8044bd88e32acba594b 100644
--- a/applications/solvers/combustion/reactingFoam/chemistry.H
+++ b/applications/solvers/combustion/reactingFoam/chemistry.H
@@ -3,8 +3,8 @@
chemistry.solve
(
- runTime.value() - runTime.deltaT().value(),
- runTime.deltaT().value()
+ runTime.value() - runTime.deltaTValue(),
+ runTime.deltaTValue()
);
// turbulent time scale
diff --git a/applications/solvers/combustion/rhoReactingFoam/chemistry.H b/applications/solvers/combustion/rhoReactingFoam/chemistry.H
index d059bd9ed34f1a577175a271ef6e77360bf63bb6..691b6dcb920832fcd215e8044bd88e32acba594b 100644
--- a/applications/solvers/combustion/rhoReactingFoam/chemistry.H
+++ b/applications/solvers/combustion/rhoReactingFoam/chemistry.H
@@ -3,8 +3,8 @@
chemistry.solve
(
- runTime.value() - runTime.deltaT().value(),
- runTime.deltaT().value()
+ runTime.value() - runTime.deltaTValue(),
+ runTime.deltaTValue()
);
// turbulent time scale
diff --git a/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H b/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H
index 33b4edc8a7d31da894068a3c7016dc38bf21137e..a0601fc1de64de09b82259d3d9a83a718e7e3443 100644
--- a/applications/solvers/compressible/rhoCentralFoam/compressibleCourantNo.H
+++ b/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 = "
diff --git a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
index 0571ee5082f177e2ac68e9d3dc570517cad618cf..f06b13e5defc515ca8f10745f7c92150a65d9b1e 100644
--- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C
+++ b/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;
diff --git a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C b/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
index 3d71de6324737b321553dd0945566e76e39372d8..def72f426b8888cc77b0cc71623abf7d8896a9ce 100644
--- a/applications/solvers/compressible/rhopSonicFoam/rhopSonicFoam.C
+++ b/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;
diff --git a/applications/solvers/electromagnetics/mhdFoam/magneticFieldErr.H b/applications/solvers/electromagnetics/mhdFoam/magneticFieldErr.H
index a25c31e6839ab7f79217c17789537c1284850a11..a9db2ea5852df8ba7e712c7e604e71d33f18de31 100644
--- a/applications/solvers/electromagnetics/mhdFoam/magneticFieldErr.H
+++ b/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;
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C
index a3d68f55ca4d2f5ffdca0b4e995d69aeadddda94..93e42ee0d5ac828e3c4bcb72769fdf83866d19e9 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C
+++ b/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
diff --git a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H b/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H
index 125f1b23b5f77795da6ffd574496235cc8967ccd..570a8b099327510efa2f4416cad36d4fa1399628 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H
+++ b/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
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H b/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H
index 07b1e9953b0db867186f6c668d27a9415a26c265..3a8a5c20f1ef59b8454167c5061ae5579f56e54f 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H
@@ -3,8 +3,8 @@
chemistry.solve
(
- runTime.value() - runTime.deltaT().value(),
- runTime.deltaT().value()
+ runTime.value() - runTime.deltaTValue(),
+ runTime.deltaTValue()
);
// turbulent time scale
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
index 07b1e9953b0db867186f6c668d27a9415a26c265..3a8a5c20f1ef59b8454167c5061ae5579f56e54f 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H
@@ -3,8 +3,8 @@
chemistry.solve
(
- runTime.value() - runTime.deltaT().value(),
- runTime.deltaT().value()
+ runTime.value() - runTime.deltaTValue(),
+ runTime.deltaTValue()
);
// turbulent time scale
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H
index 07b1e9953b0db867186f6c668d27a9415a26c265..3a8a5c20f1ef59b8454167c5061ae5579f56e54f 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H
@@ -3,8 +3,8 @@
chemistry.solve
(
- runTime.value() - runTime.deltaT().value(),
- runTime.deltaT().value()
+ runTime.value() - runTime.deltaTValue(),
+ runTime.deltaTValue()
);
// turbulent time scale
diff --git a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H
index ee96a897b4a8c47a284990c8f20c74bb9fa0ad7d..a9d43535ec3ecb15dce6fcd9f12b2a34e1026d11 100644
--- a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H
+++ b/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
diff --git a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
index e531649a9171b02f2348d7ba63e47083f2ff9a5c..dd8f23464a48e8d51b9b118deef7135587763641 100644
--- a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H
+++ b/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;
}
// ************************************************************************* //
diff --git a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
index 7ba881c45ba1ef4523a5792fd6582d164c04009f..500c53b6f1f7134fe4dbe951257037598189f585 100644
--- a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
+++ b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H
@@ -44,7 +44,7 @@ if (adjustTimeStep)
(
min
(
- maxDeltaTFact*runTime.deltaT().value(),
+ maxDeltaTFact*runTime.deltaTValue(),
maxDeltaT
)
);
diff --git a/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H b/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H
index 428465ddd9daf13cbd8872f0667dde0bcbdf1798..96e37e95fbc2da795abaf6dfea89d856ae3e9267 100644
--- a/applications/solvers/multiphase/settlingFoam/compressibleContinuityErrs.H
+++ b/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)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H
index 75dcd68c7fbde8e856b00651af8b22b3fbeb624a..f18461d66aac1342e5fe8b966520413f0f372b56 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H
+++ b/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;
diff --git a/applications/test/fieldDependency/fieldDependency.C b/applications/test/fieldDependency/fieldDependency.C
index fa3c7b2e86a48989315a0b914666cc4ebd6ecec5..65812996ba37417f206df59ac3858c16ca2a502d 100644
--- a/applications/test/fieldDependency/fieldDependency.C
+++ b/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;
diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
index d16f4f23cce3bcde783777e001f9310a0d426bd6..5e240daff160087d0548267752782b6143839953 100644
--- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C
+++ b/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;
diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C
index f9f47c815a90fb4bda00ac188b5328fbec46bb62..c916be8daa13324e333b20146943fda309bbe4cd 100644
--- a/applications/utilities/mesh/advanced/splitCells/splitCells.C
+++ b/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"
diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
index 1da7ba049e4202ae5e2065fe3f9be3fd0a5502a6..f76e4dae462db79a9446aaed6fe9d99dc3a370c6 100644
--- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C
+++ b/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;
diff --git a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
index af2c429bdc93fa9f922847285dc86127f0255311..a1bb6a743156b59fd42dc20d0f7077950d34349d 100644
--- a/applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C
+++ b/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"
diff --git a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
index da0f8683887c836e90ad56cfcf9742968c74b310..5857f03e243a3259949b1f214ba5e9efddbef9ce 100644
--- a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C
+++ b/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"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.C
index 67abf365642afabad71e2d6f14ea9e1fffa391b9..a6fc986a74c76d306b336d8683d6d6be634990ec 100644
--- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/wedge/wedge.C
+++ b/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"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
index 15affd66e0f447bbc4f193c9f3a9c657bc0215bf..a753d03c54bf73ba407e6fbca17d55d21bb89fae 100644
--- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C
+++ b/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"
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C
index 6e2682e19902ce4bcc2beb16f6cbaa7aab357eea..543bee59e875de7bdfdf09ee395f0524486640ab 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.C
+++ b/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_
- || db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
+ a.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 word& b,
- const word& c
+ const regIOobject& a,
+ const regIOobject& b,
+ const regIOobject& c
) const
{
if
(
- db().lookupObject<regIOobject>(a).eventNo() >= eventNo_
- || db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
- || db().lookupObject<regIOobject>(c).eventNo() >= eventNo_
+ a.eventNo() >= eventNo_
+ || b.eventNo() >= eventNo_
+ || c.eventNo() >= eventNo_
)
{
return false;
@@ -228,18 +232,18 @@ bool Foam::regIOobject::upToDate
bool Foam::regIOobject::upToDate
(
- const word& a,
- const word& b,
- const word& c,
- const word& d
+ const regIOobject& a,
+ const regIOobject& b,
+ const regIOobject& c,
+ const regIOobject& d
) const
{
if
(
- db().lookupObject<regIOobject>(a).eventNo() >= eventNo_
- || db().lookupObject<regIOobject>(b).eventNo() >= eventNo_
- || db().lookupObject<regIOobject>(c).eventNo() >= eventNo_
- || db().lookupObject<regIOobject>(d).eventNo() >= eventNo_
+ a.eventNo() >= eventNo_
+ || b.eventNo() >= eventNo_
+ || c.eventNo() >= eventNo_
+ || d.eventNo() >= eventNo_
)
{
return false;
diff --git a/src/OpenFOAM/db/regIOobject/regIOobject.H b/src/OpenFOAM/db/regIOobject/regIOobject.H
index d2c9a3dcbe6e0788e909092b04bcc87860e3cd55..cae92919b297d1c4e2d6ec68430077955b64887f 100644
--- a/src/OpenFOAM/db/regIOobject/regIOobject.H
+++ b/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
- bool upToDate(const word&) const;
- bool upToDate(const word&, const word&) const;
- bool upToDate(const word&, const word&, const word&) const;
+ //- Return true if up-to-date with respect to given object
+ // otherwise false
+ bool upToDate(const regIOobject&) const;
+
+ //- Return true if up-to-date with respect to given objects
+ // otherwise false
+ bool upToDate
+ (
+ 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;
+
+ //- Return true if up-to-date with respect to given objects
+ // otherwise false
bool upToDate
(
- const word&,
- const word&,
- const word&,
- const word&
+ const regIOobject&,
+ const regIOobject&,
+ const regIOobject&,
+ const regIOobject&
) const;
- //- Flag me as up to date
+ //- Set up to date (obviously)
void setUpToDate();
diff --git a/src/OpenFOAM/global/constants/math/mathematicalConstants.H b/src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H
similarity index 84%
rename from src/OpenFOAM/global/constants/math/mathematicalConstants.H
rename to src/OpenFOAM/global/constants/mathematical/mathematicalConstants.H
index 64811272d8f074fc2137e4be092c20f4a03f3996..41f37930363af0cd236c113fe363e96c0e9031dc 100644
--- a/src/OpenFOAM/global/constants/math/mathematicalConstants.H
+++ b/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
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/global/unitConversion/unitConversion.H b/src/OpenFOAM/global/unitConversion/unitConversion.H
new file mode 100644
index 0000000000000000000000000000000000000000..0ab93f1a50ec67f943e190a87b2388adf9d11988
--- /dev/null
+++ b/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
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
index 6350c934466ee98ae08bd4750c6cb5320ef3736c..5dda9f504d68d0a1fbf342e46bea069585dfc19d 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C
+++ b/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"
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
index 8fce92f3c808fc7fdb7d9eee19585d4c368da002..521f3dd261d9c0135d64b58028b42d47bafbc581 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheckMotion.C
+++ b/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 * * * * * * * * * * * //
diff --git a/src/dynamicFvMesh/include/meshCourantNo.H b/src/dynamicFvMesh/include/meshCourantNo.H
index 9def19e9578fb9bc2531776237fb078876437e05..d9cbb0f7a3c94bf6581649edfe70d74e2b68d962 100644
--- a/src/dynamicFvMesh/include/meshCourantNo.H
+++ b/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
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
index f17e07c323f3329c5ff16d8282eecb7cdd62ddfe..1fef7573ab1fdb85c55db23b5dceadd52b5b5318 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
+++ b/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"
diff --git a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
index 16606233d04418e686e3730c9849515ab0b51c7b..3df18121c9a09c9b68a05c688172ca90aeb63182 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
+++ b/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 * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C b/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
index 83d0000ea39b1c1ed6ac15ff98a37c3d4c657952..9c4030ed81d95d295f21aad87fd26fa559c73df6 100644
--- a/src/dynamicMesh/motionSmoother/polyMeshGeometry/polyMeshGeometry.C
+++ b/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
{
diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
index 8d69476e2581e7af63f0dbe149c4a736b71a9a75..16cf2db379fbe6768e19d1ab451b409d7aa58b9d 100644
--- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
+++ b/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;
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
index 8bcdcccf41a69a3e07209a571bcec888dd87de44..5fa81d79e2604cfd32217a323ad26ed8e4d4ea02 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
+++ b/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;
diff --git a/src/engine/engineTime/engineTime.C b/src/engine/engineTime/engineTime.C
index 8adf64fdcde9238eeea90e21476b437049858154..1938858126766dc3ee6b2e4f5ccab7fcf3521926 100644
--- a/src/engine/engineTime/engineTime.C
+++ b/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)
);
}
diff --git a/src/engine/engineValve/engineValve.C b/src/engine/engineValve/engineValve.C
index 396cfa139aecbf258383d9e99ef5e2fc3e71e459..0c2b66b7560d4711a708efc412c3563a72709e0d 100644
--- a/src/engine/engineValve/engineValve.C
+++ b/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);
}
diff --git a/src/engine/ignition/ignitionSite.C b/src/engine/ignition/ignitionSite.C
index 3c6529aef674bfcae62398bed5d678a0a0fac18e..5f67356087c492a42c8707ed157114bad5ebdcd1 100644
--- a/src/engine/ignition/ignitionSite.C
+++ b/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_);
}
diff --git a/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H b/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H
index a20e1d0f14c28fd144621b68670a0f96131d4a70..8cc2522e97326dc4a3943ea35cc39b2de47f591f 100644
--- a/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H
+++ b/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
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.C
index 221b7949b4365c9bad6c6753e1cac6b831e579d5..38ee3466ee7554c9f5a643c8a6ae4ad0988d6b64 100644
--- a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitMulticomponentPointSource/timeActivatedExplicitMulticomponentPointSource.C
+++ b/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)
{
diff --git a/src/finiteVolume/cfdTools/general/include/setDeltaT.H b/src/finiteVolume/cfdTools/general/include/setDeltaT.H
index 58cd25f233a02b9bf3be2049342fe4260d5ce2e9..2651bdd07fb933e1e4d90c2efe65dcc98a8e9093 100644
--- a/src/finiteVolume/cfdTools/general/include/setDeltaT.H
+++ b/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;
}
// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H b/src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H
index c3d9bdad3b821576d466b945a379e088312a5a36..0c5dd30d4ba8ff8b80249fea3b71cf39cd10bff0 100644
--- a/src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H
+++ b/src/finiteVolume/cfdTools/general/include/setInitialDeltaT.H
@@ -39,7 +39,7 @@ if (adjustTimeStep)
(
min
(
- maxCo*runTime.deltaT().value()/CoNum,
+ maxCo*runTime.deltaTValue()/CoNum,
maxDeltaT
)
);
diff --git a/src/finiteVolume/cfdTools/general/include/volContinuity.H b/src/finiteVolume/cfdTools/general/include/volContinuity.H
index 8a65397de48fe5f7878f9ade6106e2d637da847f..a8f31e2223020a67dd2c44df1f1a4fac8bc41c70 100644
--- a/src/finiteVolume/cfdTools/general/include/volContinuity.H
+++ b/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
diff --git a/src/finiteVolume/cfdTools/incompressible/CourantNo.H b/src/finiteVolume/cfdTools/incompressible/CourantNo.H
index 27ab37b085862a86bd92a171f7eabb1df02c1b1e..a8ac950f3dbab7f0554b0104caa534a8f9d04171 100644
--- a/src/finiteVolume/cfdTools/incompressible/CourantNo.H
+++ b/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
diff --git a/src/finiteVolume/cfdTools/incompressible/continuityErrs.H b/src/finiteVolume/cfdTools/incompressible/continuityErrs.H
index e2304c682bfbae3abfbdf5828b51a30c990265d0..cafd84b58be6915e38d095df0e41f371615dcbc5 100644
--- a/src/finiteVolume/cfdTools/incompressible/continuityErrs.H
+++ b/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;
diff --git a/src/finiteVolume/cfdTools/incompressible/movingMeshContinuityErrs.H b/src/finiteVolume/cfdTools/incompressible/movingMeshContinuityErrs.H
index 04b5af8ae8233c318722cca54446837c674c737d..8268163cb054f019f9bc4e7930ad168abc9b7509 100644
--- a/src/finiteVolume/cfdTools/incompressible/movingMeshContinuityErrs.H
+++ b/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;
diff --git a/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H b/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H
index e480176117c71793fa6e5a1c52c3ee6562224075..dea0fe4de8a55c44abfd69a494ee7e6a5f2b789d 100644
--- a/src/finiteVolume/cfdTools/incompressible/movingMeshRhoUContinuityErrs.H
+++ b/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();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
index abc4619706097b9d6ff0da884c87d1905d31c256..1e4f3ffcc5cc79cd6af1201c0748a38de3a55519 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
+++ b/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)),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index 9b67c39b78254d58ba87b6a12479ea1d1c8a8b81..3acad83e718bbd0fc7fb80ae588b136ce75c7fe3 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/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::
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
index 17742fe879719fb886780c8a71176803ff1d496d..9c24dae9ccf1137da9bba5f629f3148e752aaafc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
+++ b/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 =
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
index 6fd51f56324ac54af6c8ad822984ff338b64e007..e449688ffe66c53250114bfc83e1f995e5712721 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C
+++ b/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");
diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
index 9a7ad2d0d3b401872b6e5e15997ba410c5d03973..abc203a73b0d8bd8c8dd42293b664c19b4a51691 100644
--- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
+++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C
@@ -59,8 +59,8 @@ EulerD2dt2Scheme<Type>::fvcD2dt2
IOobject::NO_WRITE
);
- scalar deltaT = mesh().time().deltaT().value();
- scalar deltaT0 = mesh().time().deltaT0().value();
+ scalar deltaT = mesh().time().deltaTValue();
+ 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 deltaT0 = mesh().time().deltaT0().value();
+ scalar deltaT = mesh().time().deltaTValue();
+ 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 deltaT0 = mesh().time().deltaT0().value();
+ scalar deltaT = mesh().time().deltaTValue();
+ 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 deltaT0 = mesh().time().deltaT0().value();
+ scalar deltaT = mesh().time().deltaTValue();
+ 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 deltaT0 = mesh().time().deltaT0().value();
+ scalar deltaT = mesh().time().deltaTValue();
+ scalar deltaT0 = mesh().time().deltaT0Value();
scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
index e7749610a7add9a9eef2c6c5647e540cb60562c2..5b43623c61bd25ea4a584b63999401782635c770 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/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();
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
index 8a121b2d44737ea23d1170a7de5ab65ef680af17..5b55f27a1e8660ffd82720c64d45cc427adb499c 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/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();
}
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/boundedBackwardDdtScheme/boundedBackwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/boundedBackwardDdtScheme/boundedBackwardDdtScheme.C
index c8ef5c7259f58d5feb4ab75a2c0a8b0dd6b95807..c7b8d4986601ff3261292ef6a0b42f69d38a0eb0 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/boundedBackwardDdtScheme/boundedBackwardDdtScheme.C
+++ b/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();
}
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
index f9354e3d8405227954d85ea99c0ecc252c708b5b..696a60647be230ce6544e702b845a43a74665976 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
+++ b/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),
- cacheFields_
- (
- ITstream
- (
- objectPath() + "::cacheFields",
- tokenList()
- )()
- )
+ defaultFluxRequired_(false)
{
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;
- }
-}
-
-
// ************************************************************************* //
diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
index 25a9da32c94854bf5f5d574ad5dd299afd070017..06bdadea9074ddcc28a07bd8653014b4e3c8ddc1 100644
--- a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
+++ b/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
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 12a7d0b49b6a615b0e7340b0eb447c55263b975c..151de78a1ef28a735d488ba94c290a29e6c1a479 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/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 =
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 5dd07f3a921b2732973b88d6993c543b61ff6863..28f0a8d23ee6946b34de5885160a603d2f2bd9e2 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/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();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 5bcb692065cec4ca8f64ecdbe0e7cf22035807b7..bd66f20ea19374e9f140db51b7122afb3bb08489 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/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"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
index 0c0f12a84468268b9723b85007987a2a50f596fa..156d72f77388286b266c4688b4a2faa4cc642e35 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
+++ b/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());
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
index 8b768e6347656b59931acf3a07490293c5d92b6b..711551664d4b91381bb7274981ab48b5938336c3 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
+++ b/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());
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index 89a331837e5062431508279391579fca25ef6bf0..868cc70abb65758436989dc1bb8ef072f3edc29b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/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();
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index c6a8c067b12b48d0ad710fd84a3a541db71b42cc..dbd769c557734c21ac695a7ca89276f8ef88a400 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/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();
diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
index f2a7adb5b6e6efd896e0fe4d3714ad1017703b93..db0ff59bfe3985378b63a31664c801b409ccc5bd 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/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_);
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 9c0cf511dce6faa06860e2d7fd85501439cf4c04..72d0541e7e5d3ba253ec086d9e3865268ce9d86b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/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)
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 4944c82ff1c5cf8f94513bb1010780b7a27182bb..c9db7f746607d81f6c8a863e0b74c130ef796f1c 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/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.
diff --git a/src/lagrangian/basic/Particle/ParticleI.H b/src/lagrangian/basic/Particle/ParticleI.H
index 2e6d8f868f0ec8526f457bbe75b28a376dec1c5d..58af93f61820716f9778ca93446a56e44360ce82 100644
--- a/src/lagrangian/basic/Particle/ParticleI.H
+++ b/src/lagrangian/basic/Particle/ParticleI.H
@@ -373,7 +373,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();
}
diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
index 9f8f595ea5663c082c568c71b05c5a69c0aa2399..4b2367c41a8dc6f2147ba0d435872239d2fe4b8d 100644
--- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
+++ b/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
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index c1ecfee45d7fc78fab474ad05a480cf46c3d1a12..dc45f4dec40a4410123793910f20f604376450bb 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/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();
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 2f24587bb7373c951fc7c82bc978d36b8fc6fa5f..e7725acd2cea59687ec8a45150b456f322075efa 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/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 * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dieselSpray/spray/sprayI.H b/src/lagrangian/dieselSpray/spray/sprayI.H
index 86c063ca6f7dc5bdae3823837b0ff472918efb10..5a6ce977cc8d68511372104ae72a372882782567 100644
--- a/src/lagrangian/dieselSpray/spray/sprayI.H
+++ b/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;
}
diff --git a/src/lagrangian/dieselSpray/spray/sprayInject.C b/src/lagrangian/dieselSpray/spray/sprayInject.C
index 394f361c68eec9f727b263b449c503391f95a81d..b0aea70def1878bccdd0eba33d70276936704ce2 100644
--- a/src/lagrangian/dieselSpray/spray/sprayInject.C
+++ b/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_.deltaT().value();
+ (runTime_.deltaTValue() - dt)
+ /runTime_.deltaTValue();
bool keepParcel = pPtr->move(*this);
diff --git a/src/lagrangian/dieselSpray/spray/sprayOps.C b/src/lagrangian/dieselSpray/spray/sprayOps.C
index 9a19041075c0d395f2d6f63d222708fc16d79ca7..d027aac1b6abf93e7b32d53f708b0cfc30e25a68 100644
--- a/src/lagrangian/dieselSpray/spray/sprayOps.C
+++ b/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_
);
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
index f5c846ebf86280b945bf71379e75f881c7d742c7..d381e9516f52ce9d5b96a0d05cc11b805dee2ac7 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
+++ b/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();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
index e395d2c425530e4bdab60bc32755ded21ee02522..36cf7b05885da131ed7937077c2944c6554d3734 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
+++ b/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();
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
index c78b872e2b1527eed51a9a15b6eb0863ae225610..7c996a0cf9c0e92295912c0f6280bd1e5f34a1b1 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
+++ b/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"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
index 78faf5c1f5fcd96ba78450ec4256f430f0094cb3..aa56562f009838cfbcbf64a078d8fa51b81e3f22 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
+++ b/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];
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index f034fbbaa3d8f5bf5706eba27e8dc6d5d332b7db..652c9070f6c6e9254b7bc6c48d2145dd23ad4b6c 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/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;
}
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 732b338d85b13543a434bbb4a4f5e19d0b526916..1ae536e4db9b509427752e0e380e3cea5c55dd19 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/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;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 7ba1e5ca78c674a4512f324400087b2fdaa63cdf..5c50573752b6f415fc6944b7454601c4086e16e9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/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
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
index cce0d86a22c0d6f9000d2f3b6f2d9a35e48b10bc..c9e975e296afc9a6730cbc43ffe929594b0d3cf9 100644
--- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
+++ b/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_));
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
index 64c5c45ccf9bc54036aca97284dbe6d218a314f2..9712e8e7fba6ea4b0cee513a5568250f55fb8051 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
+++ b/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)
{
diff --git a/src/lagrangian/solidParticle/solidParticle.C b/src/lagrangian/solidParticle/solidParticle.C
index 7c7319c0901ea5cc49f17d9081019c2c5d79053c..78c8529ea7a6194e3af31f0ad0d7bfff7965a1b0 100644
--- a/src/lagrangian/solidParticle/solidParticle.C
+++ b/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;
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
index 7799663505090f66e3bffef463a2f39a9ec9cf03..cc49e48939e1f138451812d8dfcc703b6ce29e4a 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
+++ b/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"
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
index f799881e932c7c8e74e26cdd08a15fc2d0c9457d..a1346b4e8eb23ba5edff990649fdda6a7ac9507a 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C
+++ b/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 * * * * * * * * * * * * * //
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
index 8a71825221cdeaeff2e5e8ce9d4a4498a4bd8793..ebc75c79a8a6564d3f58c665b2ee5165271340bc 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C
+++ b/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"
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
index bf1d6ec6c07e43e8b8372bad039cbfe362372928..a181662b2713c42e29b0c551dd54a983a47262d9 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C
+++ b/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"
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
index f72dcc313116940793884b29acff53100d2d52aa..7f2d0cd617db15682e3292e59c67eefa81d62a5f 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C
+++ b/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 * * * * * * * * * * * //
diff --git a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
index 7cd8fb9dd2120de505040ab6afe713005d95a200..3c85f5a957ec76dd8bda00667dc6d273863de0ea 100644
--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C
+++ b/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;
diff --git a/src/mesh/blockMesh/curvedEdges/arcEdge.C b/src/mesh/blockMesh/curvedEdges/arcEdge.C
index 985caef831512f7aef6145b95a63849467c2a1df..bb7b3b7a8cbfb840b6fa11b73516f4b7e37f7a0f 100644
--- a/src/mesh/blockMesh/curvedEdges/arcEdge.C
+++ b/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 * * * * * * * * * * * * * //
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index dfbab90f055911e7e6272c258f6cd762dd2f870e..cd12d26f52cce77b536db78f5ab23a5c49b6f574 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/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)
diff --git a/src/meshTools/coordinateSystems/toroidalCS.C b/src/meshTools/coordinateSystems/toroidalCS.C
index 3e912007a54c60b2a8e55801a7ecae8ecb028f76..5dd56d19454e035c40289d1dc8c0008baceea45f 100644
--- a/src/meshTools/coordinateSystems/toroidalCS.C
+++ b/src/meshTools/coordinateSystems/toroidalCS.C
@@ -26,7 +26,7 @@ License
#include "toroidalCS.H"
#include "addToRunTimeSelectionTable.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
index 9924eb0a9cb2d245c980874a5960db0af518e685..91afa7c23ee6fa7ce92f36ab3d01a107f4480bad 100644
--- a/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
+++ b/src/meshTools/primitiveMeshGeometry/primitiveMeshGeometry.C
@@ -26,7 +26,7 @@ License
#include "primitiveMeshGeometry.H"
#include "pyramidPointFaceRef.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
index b36997f208ad0256a70a8924b55772176f49eccf..c63c196f3d0cc20603209fcc26434c590f16e303 100644
--- a/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
+++ b/src/meshTools/sets/cellSources/shapeToCell/shapeToCell.C
@@ -26,7 +26,7 @@ License
#include "shapeToCell.H"
#include "polyMesh.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
#include "hexMatcher.H"
#include "cellFeatures.H"
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index a8a979af4e8ef72bd45052faa28e317a79ce3e6e..47c31f04bf049800c62eb0fd2fe4e1f740e9246c 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -36,7 +36,7 @@ License
#include "meshTools.H"
#include "plane.H"
#include "Random.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
#include "treeBoundBox.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
index 4383c30a2f745ff896e6e6d65523f89ceadaeef2..1a1f2baf1d7c016dc040ef653a34f888f45b7966 100644
--- a/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
+++ b/src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
@@ -33,7 +33,7 @@ License
#include "linePointRef.H"
#include "OFstream.H"
#include "IFstream.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
index 8eb7ca65feca6864afb71f9086d62a80b19a4e31..7770e05a2e7999a3704692a30daadeff210935c3 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C
@@ -70,7 +70,7 @@ void Foam::fieldAverage::initialize()
totalIter_.setSize(faItems_.size(), 1);
totalTime_.clear();
- totalTime_.setSize(faItems_.size(), obr_.time().deltaT().value());
+ totalTime_.setSize(faItems_.size(), obr_.time().deltaTValue());
// Add mean fields to the field lists
@@ -170,7 +170,7 @@ void Foam::fieldAverage::calcAverages()
forAll(faItems_, fieldI)
{
totalIter_[fieldI]++;
- totalTime_[fieldI] += obr_.time().deltaT().value();
+ totalTime_[fieldI] += obr_.time().deltaTValue();
}
addMeanSqrToPrime2Mean<scalar, scalar>
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
index 4e59e8a30bc07833f2a447ebb3454437863aaf60..f3ebf13dc5d870bfa4f80b3b445e07344e61d5c7 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
+++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C
@@ -150,7 +150,7 @@ const
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
- const scalar dt = obr_.time().deltaT().value();
+ const scalar dt = obr_.time().deltaTValue();
forAll(faItems_, i)
{
@@ -193,7 +193,7 @@ void Foam::fieldAverage::calculatePrime2MeanFields
typedef GeometricField<Type1, fvPatchField, volMesh> fieldType1;
typedef GeometricField<Type2, fvPatchField, volMesh> fieldType2;
- const scalar dt = obr_.time().deltaT().value();
+ const scalar dt = obr_.time().deltaTValue();
forAll(faItems_, i)
{
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
index 8754ed2df4789c95297e6a38a2ce203e7d909bf4..f344fa870f151adba1bf62357491b574815b3dc8 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
+++ b/src/postProcessing/functionObjects/field/streamLine/streamLineParticle.C
@@ -164,7 +164,7 @@ bool Foam::streamLineParticle::move(streamLineParticle::trackData& td)
td.switchProcessor = false;
td.keepParticle = true;
- scalar deltaT = GREAT; //cloud().pMesh().time().deltaT().value();
+ scalar deltaT = GREAT; //cloud().pMesh().time().deltaTValue();
scalar tEnd = (1.0 - stepFraction())*deltaT;
scalar dtMax = tEnd;
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 6d220ee226c9c8e6f9f827f4eea3b136c48bdc76..8b5ca8a90d2e3b069c3a31d85e06b03c978b4cde 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -330,7 +330,7 @@ Foam::tmp<Foam::pointField> Foam::linearValveLayersFvMesh::newPoints() const
forAll (patchPoints, ppI)
{
- np[patchPoints[ppI]] += vel*time().deltaT().value();
+ np[patchPoints[ppI]] += vel*time().deltaTValue();
}
return tnewPoints;
diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
index 2e42a81c0f39e2e37c6dcb5abf35ab727dc42c43..a080a156a53c481a68068e50a9fc8cba61ce861d 100644
--- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
+++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
@@ -349,7 +349,7 @@ bool Foam::mixerFvMesh::update()
csPtr_->globalPosition
(
csPtr_->localPosition(points())
- + vector(0, rpm_*360.0*time().deltaT().value()/60.0, 0)
+ + vector(0, rpm_*360.0*time().deltaTValue()/60.0, 0)
*movingPointsMask()
)
);
@@ -372,7 +372,7 @@ bool Foam::mixerFvMesh::update()
csPtr_->globalPosition
(
csPtr_->localPosition(oldPoints())
- + vector(0, rpm_*360.0*time().deltaT().value()/60.0, 0)
+ + vector(0, rpm_*360.0*time().deltaTValue()/60.0, 0)
*movingPointsMask()
)
);
diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
index dedf725e247942f7384a9dcd1e758805ef27e271..dce98aa4af56d2c94e3dade9e64cb93a1a2baf95 100644
--- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
+++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C
@@ -420,7 +420,7 @@ bool Foam::movingConeTopoFvMesh::update()
// )/
// (curLeft_ - leftEdge_)
// )
- )*curMotionVel_*time().deltaT().value();
+ )*curMotionVel_*time().deltaTValue();
}
else
{
@@ -442,11 +442,11 @@ bool Foam::movingConeTopoFvMesh::update()
// )/
// (curLeft_ - leftEdge_)
// )
- )*curMotionVel_*time().deltaT().value();
+ )*curMotionVel_*time().deltaTValue();
}
-// curLeft_ += curMotionVel_.x()*time().deltaT().value();
-// curRight_ += curMotionVel_.x()*time().deltaT().value();
+// curLeft_ += curMotionVel_.x()*time().deltaTValue();
+// curRight_ += curMotionVel_.x()*time().deltaTValue();
curLeft_ = average
(
faceZones()
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C
index bd5f890ee59e8d2f81cca253dc538182dc089117..09c2a247f316e18bd37a76dd1b0507eaba1a66eb 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C
@@ -43,7 +43,7 @@ Description
#include "cellShape.H"
#include "cellModeller.H"
#include "mergePoints.H"
-#include "mathematicalConstants.H"
+#include "unitConversion.H"
using namespace Foam;