From 427bbd8174228297453cb5c5beaad1b80098b6ec Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 20 Oct 2009 22:17:37 +0100 Subject: [PATCH 1/4] Changed the interface for the upToDate check to avoid unnecessary object lookups by providing the independent objects directly. --- .../test/fieldDependency/fieldDependency.C | 6 +-- src/OpenFOAM/db/regIOobject/regIOobject.C | 42 ++++++++++--------- src/OpenFOAM/db/regIOobject/regIOobject.H | 37 ++++++++++++---- 3 files changed, 54 insertions(+), 31 deletions(-) diff --git a/applications/test/fieldDependency/fieldDependency.C b/applications/test/fieldDependency/fieldDependency.C index fa3c7b2e86..65812996ba 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/src/OpenFOAM/db/regIOobject/regIOobject.C b/src/OpenFOAM/db/regIOobject/regIOobject.C index 6e2682e199..543bee59e8 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(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(a).eventNo() >= eventNo_ - || db().lookupObject(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(a).eventNo() >= eventNo_ - || db().lookupObject(b).eventNo() >= eventNo_ - || db().lookupObject(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(a).eventNo() >= eventNo_ - || db().lookupObject(b).eventNo() >= eventNo_ - || db().lookupObject(c).eventNo() >= eventNo_ - || db().lookupObject(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 d2c9a3dcbe..cae92919b2 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 word&, - const word&, - const word&, - const word& + const regIOobject&, + const regIOobject& ) 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(); From 942d3344d755973ede2481a0ec9f2f1622b36e0a Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 20 Oct 2009 22:19:03 +0100 Subject: [PATCH 2/4] Moved the "cache" dictionary to solution because the concept is general. --- .../finiteVolume/fvSchemes/fvSchemes.C | 34 +------------------ .../finiteVolume/fvSchemes/fvSchemes.H | 4 --- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C b/src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C index f9354e3d84..696a60647b 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 25a9da32c9..06bdadea90 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 From d6a278f2b2b36d22c174585e19c12964cf423869 Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 21 Oct 2009 10:55:00 +0100 Subject: [PATCH 3/4] Introduced the new file unitConversion.H to hold degToRad, radToDeg and other unit conversion functions as they are required e.g. slug <-> kg. --- .../combinePatchFaces/combinePatchFaces.C | 2 +- .../mesh/advanced/splitCells/splitCells.C | 2 +- .../mesh/conversion/kivaToFoam/kivaToFoam.C | 2 +- .../conversion/polyDualMesh/polyDualMeshApp.C | 2 +- .../starToFoam/createCoupleMatches.C | 2 +- .../extrudeMesh/extrudeModel/wedge/wedge.C | 2 +- .../mesh/manipulation/autoPatch/autoPatch.C | 2 +- .../mathematicalConstants.H | 16 +---- .../global/unitConversion/unitConversion.H | 67 +++++++++++++++++++ .../primitiveMeshCheck/primitiveMeshCheck.C | 2 +- .../primitiveMeshCheckMotion.C | 5 +- .../meshCut/cellLooper/topoCellLooper.C | 2 +- .../undoableMeshCutter/undoableMeshCutter.C | 2 +- .../polyMeshGeometry/polyMeshGeometry.C | 2 +- src/engine/engineTime/engineTime.C | 2 +- .../surfaceInterpolation.C | 2 +- .../multiHoleInjector/multiHoleInjector.C | 2 +- src/lagrangian/dieselSpray/spray/spray.C | 2 +- .../blobsSwirl/blobsSwirlInjector.C | 2 +- .../autoHexMeshDriver/autoLayerDriver.C | 2 +- .../autoHexMeshDriver/autoRefineDriver.C | 1 + .../layerParameters/layerParameters.C | 2 +- .../refinementParameters.C | 2 +- .../meshRefinementProblemCells.C | 2 +- src/mesh/blockMesh/curvedEdges/arcEdge.C | 2 +- src/meshTools/cellQuality/cellQuality.C | 3 +- src/meshTools/coordinateSystems/toroidalCS.C | 2 +- .../primitiveMeshGeometry.C | 2 +- .../cellSources/shapeToCell/shapeToCell.C | 2 +- .../surfaceIntersection/edgeIntersections.C | 2 +- .../surfaceFeatures/surfaceFeatures.C | 2 +- .../biconic25-55Run35/datToFoam/datToFoam.C | 2 +- 32 files changed, 98 insertions(+), 48 deletions(-) rename src/OpenFOAM/global/constants/{math => mathematical}/mathematicalConstants.H (84%) create mode 100644 src/OpenFOAM/global/unitConversion/unitConversion.H diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C index d16f4f23cc..5e240daff1 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 f9f47c815a..c916be8daa 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 1da7ba049e..f76e4dae46 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 af2c429bdc..a1bb6a7431 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 da0f868388..5857f03e24 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 67abf36564..a6fc986a74 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 15affd66e0..a753d03c54 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/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 64811272d8..41f3793036 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 0000000000..0ab93f1a50 --- /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 6350c93446..5dda9f504d 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 8fce92f3c8..521f3dd261 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/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C index f17e07c323..1fef7573ab 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 16606233d0..3df18121c9 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 83d0000ea3..9c4030ed81 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/engineTime/engineTime.C b/src/engine/engineTime/engineTime.C index 8adf64fdcd..84218a8803 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 * * * * * * * * * * * // diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C index 5bcb692065..bd66f20ea1 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/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C index 9f8f595ea5..4b2367c41a 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/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C index 2f24587bb7..e7725acd2c 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/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C index c78b872e2b..7c996a0cf9 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/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C index 7799663505..cc49e48939 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 f799881e93..a1346b4e8e 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 8a71825221..ebc75c79a8 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 bf1d6ec6c0..a181662b27 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 f72dcc3131..7f2d0cd617 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/blockMesh/curvedEdges/arcEdge.C b/src/mesh/blockMesh/curvedEdges/arcEdge.C index 985caef831..bb7b3b7a8c 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 dfbab90f05..cd12d26f52 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 3e912007a5..5dd56d1945 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 9924eb0a9c..91afa7c23e 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 b36997f208..c63c196f3d 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 a8a979af4e..47c31f04bf 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 4383c30a2f..1a1f2baf1d 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/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C index bd5f890ee5..09c2a247f3 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; From 92217930887b844f0ab8f5d1b22b114f5054ab96 Mon Sep 17 00:00:00 2001 From: graham Date: Wed, 21 Oct 2009 16:36:07 +0100 Subject: [PATCH 4/4] Changing deltaT().value() to deltaTValue() and deltaT0().value() to deltaT0Value() across the whole code - faster to return especially if being used often, in each call to a submodel for example. --- .../DNS/dnsFoam/readTurbulenceProperties.H | 4 ++-- .../solvers/combustion/PDRFoam/StCourantNo.H | 4 ++-- .../solvers/combustion/PDRFoam/setDeltaT.H | 4 ++-- applications/solvers/combustion/XiFoam/bEqn.H | 2 +- .../dieselEngineFoam/dieselEngineFoam.C | 4 ++-- .../combustion/dieselFoam/dieselFoam.C | 4 ++-- .../combustion/reactingFoam/chemistry.H | 4 ++-- .../combustion/rhoReactingFoam/chemistry.H | 4 ++-- .../rhoCentralFoam/compressibleCourantNo.H | 4 ++-- .../compressible/rhoSonicFoam/rhoSonicFoam.C | 2 +- .../rhopSonicFoam/rhopSonicFoam.C | 2 +- .../mhdFoam/magneticFieldErr.H | 2 +- .../fluid/compressibleCourantNo.C | 4 ++-- .../shallowWaterFoam/CourantNo.H | 6 +++--- .../lagrangian/coalChemistryFoam/chemistry.H | 4 ++-- .../chemistry.H | 4 ++-- .../lagrangian/reactingParcelFoam/chemistry.H | 4 ++-- .../multiphase/cavitatingFoam/CourantNo.H | 6 +++--- .../multiphase/cavitatingFoam/setDeltaT.H | 4 ++-- .../cavitatingFoam/setInitialDeltaT.H | 2 +- .../settlingFoam/compressibleContinuityErrs.H | 4 ++-- .../multiphase/twoPhaseEulerFoam/CourantNos.H | 2 +- src/dynamicFvMesh/include/meshCourantNo.H | 4 ++-- .../fvMotionSolverEngineMesh.C | 2 +- .../layeredEngineMesh/layeredEngineMesh.C | 2 +- src/engine/engineTime/engineTime.C | 4 ++-- src/engine/engineValve/engineValve.C | 2 +- src/engine/ignition/ignitionSite.C | 4 ++-- .../compressible/compressibleCourantNo.H | 4 ++-- ...tivatedExplicitMulticomponentPointSource.C | 4 ++-- .../cfdTools/general/include/setDeltaT.H | 4 ++-- .../general/include/setInitialDeltaT.H | 2 +- .../cfdTools/general/include/volContinuity.H | 6 +++--- .../cfdTools/incompressible/CourantNo.H | 4 ++-- .../cfdTools/incompressible/continuityErrs.H | 4 ++-- .../incompressible/movingMeshContinuityErrs.H | 4 ++-- .../movingMeshRhoUContinuityErrs.H | 4 ++-- .../activeBaffleVelocityFvPatchVectorField.C | 2 +- .../derived/advective/advectiveFvPatchField.C | 2 +- .../movingWallVelocityFvPatchVectorField.C | 2 +- .../syringePressureFvPatchScalarField.C | 2 +- .../EulerD2dt2Scheme/EulerD2dt2Scheme.C | 20 +++++++++---------- .../EulerDdtScheme/EulerDdtScheme.C | 6 +++--- .../backwardDdtScheme/backwardDdtScheme.C | 4 ++-- .../boundedBackwardDdtScheme.C | 4 ++-- .../fvMatrices/solvers/MULES/MULESTemplates.C | 4 ++-- src/finiteVolume/fvMesh/fvMesh.C | 2 +- ...velocityComponentLaplacianFvMotionSolver.C | 2 +- .../velocityLaplacianFvMotionSolver.C | 2 +- ...OscillatingVelocityPointPatchVectorField.C | 2 +- ...oscillatingVelocityPointPatchVectorField.C | 2 +- ...gidBodyDisplacementPointPatchVectorField.C | 4 ++-- ...surfaceDisplacementPointPatchVectorField.C | 4 ++-- ...aceSlipDisplacementPointPatchVectorField.C | 2 +- src/lagrangian/basic/Particle/ParticleI.H | 2 +- src/lagrangian/dieselSpray/parcel/parcel.C | 2 +- src/lagrangian/dieselSpray/spray/sprayI.H | 6 +++--- .../dieselSpray/spray/sprayInject.C | 6 +++--- src/lagrangian/dieselSpray/spray/sprayOps.C | 8 ++++---- .../gradientDispersionRAS.C | 2 +- .../stochasticDispersionRAS.C | 2 +- .../wallModel/reflectParcel/reflectParcel.C | 2 +- .../clouds/Templates/DsmcCloud/DsmcCloudI.H | 2 +- .../Templates/KinematicCloud/KinematicCloud.C | 2 +- .../KinematicParcel/KinematicParcel.C | 2 +- .../InjectionModel/InjectionModel.C | 2 +- .../correlationFunction/correlationFunction.C | 4 ++-- .../molecule/molecule/molecule.C | 2 +- src/lagrangian/solidParticle/solidParticle.C | 2 +- .../trackedParticle/trackedParticle.C | 2 +- .../fieldAverage/fieldAverage/fieldAverage.C | 4 ++-- .../fieldAverage/fieldAverageTemplates.C | 4 ++-- .../field/streamLine/streamLineParticle.C | 2 +- .../linearValveLayersFvMesh.C | 2 +- .../mixerFvMesh/mixerFvMesh.C | 4 ++-- .../movingConeTopoFvMesh.C | 8 ++++---- 76 files changed, 136 insertions(+), 136 deletions(-) diff --git a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H index 9f4d8368a8..20fd654cef 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 18d6e86a94..5f3f3359fb 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 7092e9779a..c40bc4a1d7 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 d06ec2e5f0..2b9b50d124 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 eaf3219445..ce80690224 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 63549b99a5..42d9534654 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 d059bd9ed3..691b6dcb92 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 d059bd9ed3..691b6dcb92 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 33b4edc8a7..a0601fc1de 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 0571ee5082..f06b13e5de 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 3d71de6324..def72f426b 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 a25c31e683..a9db2ea585 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 a3d68f55ca..93e42ee0d5 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 125f1b23b5..570a8b0993 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 07b1e9953b..3a8a5c20f1 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 07b1e9953b..3a8a5c20f1 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 07b1e9953b..3a8a5c20f1 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 ee96a897b4..a9d43535ec 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 e531649a91..dd8f23464a 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 7ba881c45b..500c53b6f1 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 428465ddd9..96e37e95fb 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 75dcd68c7f..f18461d66a 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/src/dynamicFvMesh/include/meshCourantNo.H b/src/dynamicFvMesh/include/meshCourantNo.H index 9def19e957..d9cbb0f7a3 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/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C index 8d69476e25..16cf2db379 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 8bcdcccf41..5fa81d79e2 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 84218a8803..1938858126 100644 --- a/src/engine/engineTime/engineTime.C +++ b/src/engine/engineTime/engineTime.C @@ -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 396cfa139a..0c2b66b756 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 3c6529aef6..5f67356087 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 a20e1d0f14..8cc2522e97 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 221b7949b4..38ee3466ee 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& 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& 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 58cd25f233..2651bdd07f 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 c3d9bdad3b..0c5dd30d4b 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 8a65397de4..a8f31e2223 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 27ab37b085..a8ac950f3d 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 e2304c682b..cafd84b58b 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 04b5af8ae8..8268163cb0 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 e480176117..dea0fe4de8 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 abc4619706..1e4f3ffcc5 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 9b67c39b78..3acad83e71 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::updateCoeffs() this->dimensionedInternalField().mesh() .ddtScheme(this->dimensionedInternalField().name()) ); - scalar deltaT = this->db().time().deltaT().value(); + scalar deltaT = this->db().time().deltaTValue(); const GeometricField& 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 17742fe879..9c24dae9cc 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("U"); scalarField phip = diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C index 6fd51f5632..e449688ffe 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("phi"); diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C index 9a7ad2d0d3..abc203a73b 100644 --- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C +++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C @@ -59,8 +59,8 @@ EulerD2dt2Scheme::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::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::fvmD2dt2 fvMatrix& 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::fvmD2dt2 fvMatrix& 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::fvmD2dt2 fvMatrix& 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 e7749610a7..5b43623c61 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C @@ -276,7 +276,7 @@ EulerDdtScheme::fvmDdt fvMatrix& 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::fvmDdt ); fvMatrix& 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::fvmDdt ); fvMatrix& 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 8a121b2d44..5b55f27a1e 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C @@ -44,14 +44,14 @@ namespace fv template scalar backwardDdtScheme::deltaT_() const { - return mesh().time().deltaT().value(); + return mesh().time().deltaTValue(); } template scalar backwardDdtScheme::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 c8ef5c7259..c7b8d49866 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/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C index 12a7d0b49b..151de78a1e 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 5dd07f3a92..28f0a8d23e 100644 --- a/src/finiteVolume/fvMesh/fvMesh.C +++ b/src/finiteVolume/fvMesh/fvMesh.C @@ -576,7 +576,7 @@ Foam::tmp 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 tsweptVols = polyMesh::movePoints(p); scalarField& sweptVols = tsweptVols(); diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C index 0c0f12a844..156d72f773 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 8b768e6347..711551664d 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 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 89a331837e..868cc70abb 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::updateCoeffs(); diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C index c6a8c067b1..dbd769c557 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::operator= ( (p0_ + amplitude_*sin(omega_*t.value()) - p.localPoints()) - /t.deltaT().value() + /t.deltaTValue() ); fixedValuePointPatchField::updateCoeffs(); diff --git a/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/sixDoFRigidBodyDisplacement/sixDoFRigidBodyDisplacementPointPatchVectorField.C index f2a7adb5b6..db0ff59bfe 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::operator=(motion_.generatePositions(p0_) - p0_); diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C index 9c0cf511dc..72d0541e7e 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 4944c82ff1..c9db7f7466 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 2e6d8f868f..58af93f618 100644 --- a/src/lagrangian/basic/Particle/ParticleI.H +++ b/src/lagrangian/basic/Particle/ParticleI.H @@ -373,7 +373,7 @@ inline Foam::scalar Foam::Particle::currentTime() const { return cloud_.pMesh().time().value() - + stepFraction_*cloud_.pMesh().time().deltaT().value(); + + stepFraction_*cloud_.pMesh().time().deltaTValue(); } diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C index c1ecfee45d..dc45f4dec4 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/sprayI.H b/src/lagrangian/dieselSpray/spray/sprayI.H index 86c063ca6f..5a6ce977cc 100644 --- a/src/lagrangian/dieselSpray/spray/sprayI.H +++ b/src/lagrangian/dieselSpray/spray/sprayI.H @@ -157,7 +157,7 @@ inline tmp 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 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 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 394f361c68..b0aea70def 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 9a19041075..d027aac1b6 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 f5c846ebf8..d381e9516f 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 e395d2c425..36cf7b0588 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/wallModel/reflectParcel/reflectParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C index 78faf5c1f5..aa56562f00 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/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H index 58a152acec..9b65d77659 100644 --- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H +++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H @@ -128,7 +128,7 @@ inline Foam::Random& Foam::DsmcCloud::rndGen() template inline void Foam::DsmcCloud::storeDeltaT() { - cachedDeltaT_ = mesh().time().deltaT().value(); + cachedDeltaT_ = mesh().time().deltaTValue(); } diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index f034fbbaa3..652c9070f6 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::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 732b338d85..1ae536e4db 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::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 7ba1e5ca78..5c50573752 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::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 cce0d86a22..c9e975e296 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C @@ -41,9 +41,9 @@ void Foam::correlationFunction::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 64c5c45ccf..9712e8e7fb 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 7c7319c090..78c8529ea7 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/trackedParticle/trackedParticle.C b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticle.C index 7cd8fb9dd2..3c85f5a957 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/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C index 8eb7ca65fe..7770e05a2e 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 diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C index 4e59e8a30b..f3ebf13dc5 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 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 fieldType1; typedef GeometricField 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 8754ed2df4..f344fa870f 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 6d220ee226..8b5ca8a90d 100644 --- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C +++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C @@ -330,7 +330,7 @@ Foam::tmp 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 2e42a81c0f..a080a156a5 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 dedf725e24..dce98aa4af 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()