diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C index 2abb60eb0e..3bd064a544 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/derivedFvPatchFields/tractionDisplacement/tractionDisplacementFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -123,7 +123,7 @@ void Foam::tractionDisplacementFvPatchVectorField::updateCoeffs() return; } - this->updateCoeffs(pressure_->value(this->db().time().timeOutputValue())); + this->updateCoeffs(pressure_->value(this->db().time().userTime())); } diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C index aff848b64c..d172a180b1 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/adaptiveLinear/adaptiveLinear.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ adaptiveLinear::adaptiveLinear relaxationModel(typeName, relaxationDict, runTime), relaxationStart_(coeffDict().lookup("relaxationStart")), relaxationEnd_(coeffDict().lookup("relaxationEnd")), - lastTimeValue_(runTime_.time().timeOutputValue()), + lastTimeValue_(runTime_.time().userTime()), relaxation_(relaxationStart_) {} @@ -56,7 +56,7 @@ adaptiveLinear::adaptiveLinear scalar adaptiveLinear::relaxation() { - if (runTime_.time().timeOutputValue() > lastTimeValue_) + if (runTime_.time().userTime() > lastTimeValue_) { scalar currentRelaxation = relaxation_; @@ -65,13 +65,13 @@ scalar adaptiveLinear::relaxation() /( ( runTime_.time().endTime().value() - - runTime_.time().timeOutputValue() + - runTime_.time().userTime() ) - /(runTime_.time().timeOutputValue() - lastTimeValue_) + /(runTime_.time().userTime() - lastTimeValue_) + 1 ); - lastTimeValue_ = runTime_.time().timeOutputValue(); + lastTimeValue_ = runTime_.time().userTime(); return currentRelaxation; } diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C index 0e631afa6d..4e85303149 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/relaxationModel/rampHoldFall/rampHoldFall.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ rampHoldFall::rampHoldFall scalar rampHoldFall::relaxation() { - scalar t = runTime_.time().timeOutputValue(); + scalar t = runTime_.time().userTime(); scalar tStart = runTime_.time().startTime().value(); scalar tEnd = runTime_.time().endTime().value(); diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C index 22266fa5bb..c8d11e5709 100644 --- a/etc/codeTemplates/BC/BC.C +++ b/etc/codeTemplates/BC/BC.C @@ -34,7 +34,7 @@ License template Foam::scalar Foam::CLASS::t() const { - return this->db().time().timeOutputValue(); + return this->db().time().userTime(); } diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index acb999ed6e..2f4b9dc40d 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -678,7 +678,7 @@ Foam::word Foam::Time::findInstance fileHandler().findInstance ( startIO, - timeOutputValue(), + userTime(), stopInstance ) ); @@ -807,6 +807,24 @@ Foam::dimensionedScalar Foam::Time::endTime() const } +Foam::scalar Foam::Time::userTimeToTime(const scalar tau) const +{ + return tau; +} + + +Foam::scalar Foam::Time::timeToUserTime(const scalar t) const +{ + return t; +} + + +Foam::scalar Foam::Time::userTime() const +{ + return timeToUserTime(value()); +} + + bool Foam::Time::running() const { return value() < (endTime_ - 0.5*deltaT_); diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H index b37951e8f3..fce055722f 100644 --- a/src/OpenFOAM/db/Time/Time.H +++ b/src/OpenFOAM/db/Time/Time.H @@ -431,6 +431,15 @@ public: return prevTimeState_(); } + //- Convert the user-time (e.g. CA deg) to real-time (s). + virtual scalar userTimeToTime(const scalar tau) const; + + //- Convert the real-time (s) into user-time (e.g. CA deg) + virtual scalar timeToUserTime(const scalar t) const; + + //- Return current user time value + scalar userTime() const; + // Check diff --git a/src/OpenFOAM/db/Time/TimeState.C b/src/OpenFOAM/db/Time/TimeState.C index 61a0748f74..45ea5ae19a 100644 --- a/src/OpenFOAM/db/Time/TimeState.C +++ b/src/OpenFOAM/db/Time/TimeState.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,30 +41,4 @@ Foam::TimeState::TimeState() {} -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * // - -Foam::TimeState::~TimeState() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::scalar Foam::TimeState::userTimeToTime(const scalar theta) const -{ - return theta; -} - - -Foam::scalar Foam::TimeState::timeToUserTime(const scalar t) const -{ - return t; -} - - -Foam::scalar Foam::TimeState::timeToUserTimeRatio() const -{ - return 1; -} - - // ************************************************************************* // diff --git a/src/OpenFOAM/db/Time/TimeState.H b/src/OpenFOAM/db/Time/TimeState.H index 4f917e56fa..904784bc56 100644 --- a/src/OpenFOAM/db/Time/TimeState.H +++ b/src/OpenFOAM/db/Time/TimeState.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,6 +42,10 @@ SourceFiles namespace Foam { +// Forward declaration of classes +class Time; + + /*---------------------------------------------------------------------------*\ Class TimeState Declaration \*---------------------------------------------------------------------------*/ @@ -51,6 +55,7 @@ class TimeState public dimensionedScalar { +// ***HGW temporary until protected: label timeIndex_; @@ -64,31 +69,19 @@ protected: public: + //- Declare friendship with the Time class + friend class Time; + + // Constructors TimeState(); - //- Destructor - virtual ~TimeState(); - - // Member Functions // Access - //- Convert the user-time (e.g. CA deg) to real-time (s). - virtual scalar userTimeToTime(const scalar theta) const; - - //- Convert the real-time (s) into user-time (e.g. CA deg) - virtual scalar timeToUserTime(const scalar t) const; - - //- Ratio between real-time and user-time - virtual scalar timeToUserTimeRatio() const; - - //- Return current time value - inline scalar timeOutputValue() const; - //- Return current time index inline label timeIndex() const; diff --git a/src/OpenFOAM/db/Time/TimeStateI.H b/src/OpenFOAM/db/Time/TimeStateI.H index 6c1a21bb6e..52031cdd7a 100644 --- a/src/OpenFOAM/db/Time/TimeStateI.H +++ b/src/OpenFOAM/db/Time/TimeStateI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,13 +25,6 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -inline Foam::scalar Foam::TimeState::timeOutputValue() const -{ - return timeToUserTime(value()); -} - - inline Foam::label Foam::TimeState::timeIndex() const { return timeIndex_; diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C index 3f53b95143..fb9edd4f6a 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,7 +61,7 @@ uniformFixedValuePointPatchField } else { - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); fixedValuePointPatchField::operator=(uniformValue_->value(t)); } } @@ -81,7 +81,7 @@ uniformFixedValuePointPatchField uniformValue_(ptf.uniformValue_, false) { // For safety re-evaluate - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); fixedValuePointPatchField::operator=(uniformValue_->value(t)); } @@ -98,7 +98,7 @@ uniformFixedValuePointPatchField uniformValue_(ptf.uniformValue_, false) { // For safety re-evaluate - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); fixedValuePointPatchField::operator==(uniformValue_->value(t)); } @@ -113,7 +113,7 @@ void Foam::uniformFixedValuePointPatchField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); fixedValuePointPatchField::operator==(uniformValue_->value(t)); fixedValuePointPatchField::updateCoeffs(); diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C index b3d6648db1..7dcf0abed1 100644 --- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C +++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ Type Foam::TimeFunction1::integral ) const { return - time_.timeToUserTimeRatio() + time_.timeToUserTime(1) *function_->integral ( time_.userTimeToTime(x1), diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index f8b6179035..bf79f56d8a 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -363,7 +363,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs() } } - const scalar Ta = Ta_->value(this->db().time().timeOutputValue()); + const scalar Ta = Ta_->value(this->db().time().userTime()); const scalarField hp ( diff --git a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C index 05f75749b5..318a23c310 100644 --- a/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C +++ b/src/dynamicMesh/motionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -235,7 +235,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate { Function1s::Table timeSeries(word::null, dict); - fld = timeSeries.value(mesh().time().timeOutputValue()); + fld = timeSeries.value(mesh().time().userTime()); } else if (type == "slip") { diff --git a/src/dynamicMesh/pointInterpolator/dynamicMeshPointInterpolator.C b/src/dynamicMesh/pointInterpolator/dynamicMeshPointInterpolator.C index 88f9c6ad81..7548862677 100644 --- a/src/dynamicMesh/pointInterpolator/dynamicMeshPointInterpolator.C +++ b/src/dynamicMesh/pointInterpolator/dynamicMeshPointInterpolator.C @@ -112,7 +112,7 @@ Foam::dynamicMeshPointInterpolator::curPointField() const ( interpolatorPtr_->valueWeights ( - t.timeOutputValue(), + t.userTime(), currentIndices_, currentWeights_ ) diff --git a/src/engine/engineTime/crankConRod/crankConRod.C b/src/engine/engineTime/crankConRod/crankConRod.C index 56735fb457..82c3c6473e 100644 --- a/src/engine/engineTime/crankConRod/crankConRod.C +++ b/src/engine/engineTime/crankConRod/crankConRod.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -145,24 +145,6 @@ Foam::word Foam::crankConRod::unit() const } -Foam::scalar Foam::crankConRod::thetaRevolution() const -{ - scalar t = theta(); - - while (t > 180.0) - { - t -= 360.0; - } - - while (t < -180.0) - { - t += 360.0; - } - - return t; -} - - Foam::scalar Foam::crankConRod::deltaTheta() const { return timeToDeg(deltaTValue()); @@ -201,10 +183,4 @@ Foam::scalar Foam::crankConRod::timeToUserTime(const scalar t) const } -Foam::scalar Foam::crankConRod::timeToUserTimeRatio() const -{ - return timeToDeg(1); -} - - // ************************************************************************* // diff --git a/src/engine/engineTime/crankConRod/crankConRod.H b/src/engine/engineTime/crankConRod/crankConRod.H index db6df30a7d..352e10f6f5 100644 --- a/src/engine/engineTime/crankConRod/crankConRod.H +++ b/src/engine/engineTime/crankConRod/crankConRod.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -167,10 +167,6 @@ public: //- Return time unit virtual word unit() const; - //- Return current crank-angle translated to a single revolution - // (value between -180 and 180 with 0 = top dead centre) - scalar thetaRevolution() const; - //- Return crank-angle increment virtual scalar deltaTheta() const; @@ -183,9 +179,6 @@ public: //- Convert the real-time (s) into user-time (CA deg) virtual scalar timeToUserTime(const scalar t) const; - //- Ratio between real-time and user-time - virtual scalar timeToUserTimeRatio() const; - //- Read the control dictionary and set the write controls etc. virtual void readDict(); diff --git a/src/engine/engineTime/engineTime/engineTime.H b/src/engine/engineTime/engineTime/engineTime.H index ef0da13058..c0e288d94b 100644 --- a/src/engine/engineTime/engineTime/engineTime.H +++ b/src/engine/engineTime/engineTime/engineTime.H @@ -120,7 +120,7 @@ public: // Conversion //- Calculate the piston position from the engine geometry - // and given timr (CA or s) + // and given time (CA or s) virtual scalar pistonPosition(const scalar theta) const = 0; diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C index dee4f44931..76d7b49650 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C @@ -295,7 +295,7 @@ Foam::MRFZone::MRFZone Foam::vector Foam::MRFZone::Omega() const { - return omega_->value(mesh_.time().timeOutputValue())*axis_; + return omega_->value(mesh_.time().userTime())*axis_; } diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C index db6fb06d6a..3aaa7bfc79 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,7 @@ void Foam::MRFZone::makeRelativeRhoFlux const surfaceVectorField& Cf = mesh_.Cf(); const surfaceVectorField& Sf = mesh_.Sf(); - const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_; + const vector Omega = omega_->value(mesh_.time().userTime())*axis_; const vectorField& Cfi = Cf; const vectorField& Sfi = Sf; @@ -68,7 +68,7 @@ void Foam::MRFZone::makeRelativeRhoFlux const surfaceVectorField& Cf = mesh_.Cf(); const surfaceVectorField& Sf = mesh_.Sf(); - const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_; + const vector Omega = omega_->value(mesh_.time().userTime())*axis_; // Included patches forAll(includedFaces_, patchi) @@ -108,7 +108,7 @@ void Foam::MRFZone::makeRelativeRhoFlux const surfaceVectorField& Cf = mesh_.Cf(); const surfaceVectorField& Sf = mesh_.Sf(); - const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_; + const vector Omega = omega_->value(mesh_.time().userTime())*axis_; // Included patches forAll(includedFaces_[patchi], i) @@ -141,7 +141,7 @@ void Foam::MRFZone::makeAbsoluteRhoFlux const surfaceVectorField& Cf = mesh_.Cf(); const surfaceVectorField& Sf = mesh_.Sf(); - const vector Omega = omega_->value(mesh_.time().timeOutputValue())*axis_; + const vector Omega = omega_->value(mesh_.time().userTime())*axis_; const vectorField& Cfi = Cf; const vectorField& Sfi = Sf; diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C index 3af3119883..0237a3c082 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C @@ -108,7 +108,7 @@ void Foam::cylindricalInletVelocityFvPatchVectorField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); const scalar axialVelocity = axialVelocity_->value(t); const scalar radialVelocity = radialVelocity_->value(t); const scalar rpm = rpm_->value(t); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C index 471766b0a9..8b8f13d6c4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -89,7 +89,7 @@ void Foam::fixedMeanFvPatchField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); Type meanValue = meanValue_->value(t); Field newValues(this->patchInternalField()); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C index 52d4fc1cd1..c66e59c6fe 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -101,7 +101,7 @@ void Foam::fixedMeanOutletInletFvPatchField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); Type meanValue = meanValue_->value(t); Field newValues(this->patchInternalField()); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C index 846c7825b1..b74a32ae74 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -144,7 +144,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateValues const RhoType& rho ) { - const scalar t = db().time().timeOutputValue(); + const scalar t = db().time().userTime(); const vectorField n(patch().nf()); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C index 59a16079ca..84cdac188d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -132,7 +132,7 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::updateValues const RhoType& rho ) { - const scalar t = db().time().timeOutputValue(); + const scalar t = db().time().userTime(); const vectorField n(patch().nf()); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C index 5496353deb..ff1f208f38 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C @@ -115,7 +115,7 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); scalarField alphap = patch().lookupPatchField(alphaName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C index b9a141b60c..bb0d951455 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.C @@ -111,7 +111,7 @@ void Foam::pressureInletOutletVelocityFvPatchVectorField::updateCoeffs() if (tangentialVelocity_.valid()) { - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); const vector tangentialVelocity = tangentialVelocity_->value(t); const vectorField n(patch().nf()); refValue() = tangentialVelocity - n*(n & tangentialVelocity); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C index 4ec049050e..74f86fb9e5 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C @@ -33,7 +33,7 @@ License void Foam::rotatingPressureInletOutletVelocityFvPatchVectorField:: calcTangentialVelocity() { - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); vector om = omega_->value(t); vector axisHat = om/mag(om); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C index 972ef5a187..b56ca5411c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -91,7 +91,7 @@ void Foam::rotatingTotalPressureFvPatchScalarField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); const vector omega = omega_->value(t); const vector axis = omega/mag(omega); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C index ba5fa90203..6acf6a26fc 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,7 +111,7 @@ void Foam::rotatingWallVelocityFvPatchVectorField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); scalar om = omega_->value(t); // Calculate the rotating wall velocity from the specification of the motion diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C index 749e782374..ff100c403f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalUniformFixedValue/surfaceNormalUniformFixedValueFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -101,7 +101,7 @@ void Foam::surfaceNormalUniformFixedValueFvPatchVectorField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); fvPatchVectorField::operator=(uniformValue_->value(t)*patch().nf()); fvPatchVectorField::updateCoeffs(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C index 48fc2c488a..9e258ac8ce 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C @@ -130,7 +130,7 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); const scalar flowRate = flowRate_->value(t); const scalar rpm = rpm_->value(t); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C index 630443d44a..ac3522ea2e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFvPatchField/timeVaryingMappedFvPatchField.C @@ -503,7 +503,7 @@ Foam::tmp> Foam::timeVaryingMappedFvPatchField::map() // Apply offset to mapped values if (offset_.valid()) { - const scalar t = time().timeOutputValue(); + const scalar t = time().userTime(); fld += offset_->value(t); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C index df2ad484ab..3fdab1ba85 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ void Foam::translatingWallVelocityFvPatchVectorField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); const vector U = U_->value(t); // Remove the component of U normal to the wall in case the wall is not flat diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C index f45f8828a8..a4b6ec35e1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedGradient/uniformFixedGradientFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -109,7 +109,7 @@ void Foam::uniformFixedGradientFvPatchField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); this->gradient() = uniformGradient_->value(t); fixedGradientFvPatchField::updateCoeffs(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C index 8ee8abcea6..81b4ebd84d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValue/uniformFixedValueFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,7 +112,7 @@ void Foam::uniformFixedValueFvPatchField::updateCoeffs() return; } - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); fvPatchField::operator==(uniformValue_->value(t)); fixedValueFvPatchField::updateCoeffs(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C index 205930ebeb..ffa85f10e8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C @@ -56,7 +56,7 @@ Foam::uniformInletOutletFvPatchField::uniformInletOutletFvPatchField uniformInletValue_(Function1::New("uniformInletValue", dict)) { this->refValue() = - uniformInletValue_->value(this->db().time().timeOutputValue()); + uniformInletValue_->value(this->db().time().userTime()); if (dict.found("value")) { @@ -90,7 +90,7 @@ Foam::uniformInletOutletFvPatchField::uniformInletOutletFvPatchField { // Evaluate refValue since not mapped this->refValue() = - uniformInletValue_->value(this->db().time().timeOutputValue()); + uniformInletValue_->value(this->db().time().userTime()); this->refGrad() = Zero; this->valueFraction() = 0.0; @@ -126,7 +126,7 @@ void Foam::uniformInletOutletFvPatchField::updateCoeffs() } this->refValue() = - uniformInletValue_->value(this->db().time().timeOutputValue()); + uniformInletValue_->value(this->db().time().userTime()); const Field& phip = this->patch().template lookupPatchField @@ -165,7 +165,7 @@ void Foam::uniformInletOutletFvPatchField::autoMap // Override this->refValue() = - uniformInletValue_->value(this->db().time().timeOutputValue()); + uniformInletValue_->value(this->db().time().userTime()); } @@ -180,7 +180,7 @@ void Foam::uniformInletOutletFvPatchField::rmap // Override this->refValue() = - uniformInletValue_->value(this->db().time().timeOutputValue()); + uniformInletValue_->value(this->db().time().userTime()); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C index 80a7bb3ec3..5062750a8a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C @@ -73,7 +73,7 @@ uniformTotalPressureFvPatchScalarField } else { - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); fvPatchScalarField::operator==(p0_->value(t)); } } @@ -98,7 +98,7 @@ uniformTotalPressureFvPatchScalarField { // Set the patch pressure to the current total pressure // This is not ideal but avoids problems with the creation of patch faces - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); fvPatchScalarField::operator==(p0_->value(t)); } @@ -132,7 +132,7 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs return; } - scalar p0 = p0_->value(this->db().time().timeOutputValue()); + scalar p0 = p0_->value(this->db().time().userTime()); const fvsPatchField& phip = patch().lookupPatchField(phiName_); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C index 01c6f3c595..36bdd7c7c8 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,7 +100,7 @@ updateCoeffs() alphap = max(alphap, scalar(0)); alphap = min(alphap, scalar(1)); - const scalar t = db().time().timeOutputValue(); + const scalar t = db().time().userTime(); scalar flowRate = flowRate_->value(t); // a simpler way of doing this would be nice diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C index d93ccaac8a..9fbd210f39 100644 --- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C +++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C @@ -88,7 +88,7 @@ bool Foam::functionObjects::setTimeStepFunctionObject::execute() { const_cast(time_).setDeltaT ( - timeStepPtr_().value(time_.timeOutputValue()) + timeStepPtr_().value(time_.userTime()) ); } diff --git a/src/functionObjects/utilities/setWriteInterval/setWriteIntervalFunctionObject.C b/src/functionObjects/utilities/setWriteInterval/setWriteIntervalFunctionObject.C index a86f5f6a07..5d2c210a6a 100644 --- a/src/functionObjects/utilities/setWriteInterval/setWriteIntervalFunctionObject.C +++ b/src/functionObjects/utilities/setWriteInterval/setWriteIntervalFunctionObject.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ bool Foam::functionObjects::setWriteIntervalFunctionObject::execute() { const_cast(time_).setWriteInterval ( - writeIntervalPtr_().value(time_.timeOutputValue()) + writeIntervalPtr_().value(time_.userTime()) ); return true; diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C index d1e5f826ec..5f46197372 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C @@ -549,7 +549,7 @@ void Foam::timeVaryingMappedFixedValuePointPatchField::updateCoeffs() // Apply offset to mapped values if (offset_.valid()) { - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); this->operator==(*this + offset_->value(t)); } diff --git a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C index 9b8fbe1b86..b2450189e2 100644 --- a/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C +++ b/src/meshTools/edgeMesh/edgeMeshFormats/edgeMeshFormatsCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ Foam::fileName Foam::fileFormats::edgeMeshFormatsCore::findMeshInstance for (instanceI = ts.size()-1; instanceI >= 0; --instanceI) { - if (ts[instanceI].value() <= t.timeOutputValue()) + if (ts[instanceI].value() <= t.userTime()) { break; } @@ -125,7 +125,7 @@ Foam::fileName Foam::fileFormats::edgeMeshFormatsCore::findMeshFile for (instanceI = ts.size()-1; instanceI >= 0; --instanceI) { - if (ts[instanceI].value() <= t.timeOutputValue()) + if (ts[instanceI].value() <= t.userTime()) { break; } diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C index 10d468e689..f540e44296 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C @@ -150,7 +150,7 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs() // calculate the wavy film height - const scalar t = db().time().timeOutputValue(); + const scalar t = db().time().userTime(); const scalar GMean = GammaMean_->value(t); const scalar a = a_->value(t); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C index b4df3f9f2e..8505c37e59 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C @@ -149,7 +149,7 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs() // calculate the wavy film height - const scalar t = db().time().timeOutputValue(); + const scalar t = db().time().userTime(); const scalar GMean = GammaMean_->value(t); const scalar a = a_->value(t); diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C index 8fa2199b1a..0e695d6e28 100644 --- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C +++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ Foam::fileName Foam::fileFormats::surfaceFormatsCore::findMeshInstance for (instanceI = ts.size()-1; instanceI >= 0; --instanceI) { - if (ts[instanceI].value() <= t.timeOutputValue()) + if (ts[instanceI].value() <= t.userTime()) { break; } @@ -125,7 +125,7 @@ Foam::fileName Foam::fileFormats::surfaceFormatsCore::findMeshFile for (instanceI = ts.size()-1; instanceI >= 0; --instanceI) { - if (ts[instanceI].value() <= t.timeOutputValue()) + if (ts[instanceI].value() <= t.userTime()) { break; } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C index d6214b1291..25f2a5ec31 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C @@ -764,7 +764,7 @@ Foam::scalar Foam::chemistryModel::solve if (log_) { cpuSolveFile_() - << this->time().timeOutputValue() + << this->time().userTime() << " " << solveChemistryCpuTime_ << endl; } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/reduction/chemistryReduction/chemistryReduction.C b/src/thermophysicalModels/chemistryModel/chemistryModel/reduction/chemistryReduction/chemistryReduction.C index 728864342f..13773719f8 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/reduction/chemistryReduction/chemistryReduction.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/reduction/chemistryReduction/chemistryReduction.C @@ -95,14 +95,14 @@ void Foam::chemistryReduction::update() if (log_) { cpuReduceFile_() - << this->chemistry_.time().timeOutputValue() + << this->chemistry_.time().userTime() << " " << reduceMechCpuTime_ << endl; if (sumn_) { // Write average number of species nActiveSpeciesFile_() - << this->chemistry_.time().timeOutputValue() + << this->chemistry_.time().userTime() << " " << sumnActiveSpecies_/sumn_ << endl; } diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/tabulation/ISAT/ISAT.C b/src/thermophysicalModels/chemistryModel/chemistryModel/tabulation/ISAT/ISAT.C index af81a394c7..73175a8e96 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/tabulation/ISAT/ISAT.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/tabulation/ISAT/ISAT.C @@ -656,33 +656,33 @@ void Foam::chemistryTabulationMethods::ISAT::writePerformance() if (log_) { nRetrievedFile_() - << runTime_.timeOutputValue() << " " << nRetrieved_ << endl; + << runTime_.userTime() << " " << nRetrieved_ << endl; nRetrieved_ = 0; nGrowthFile_() - << runTime_.timeOutputValue() << " " << nGrowth_ << endl; + << runTime_.userTime() << " " << nGrowth_ << endl; nGrowth_ = 0; nAddFile_() - << runTime_.timeOutputValue() << " " << nAdd_ << endl; + << runTime_.userTime() << " " << nAdd_ << endl; nAdd_ = 0; sizeFile_() - << runTime_.timeOutputValue() << " " + << runTime_.userTime() << " " << chemisTree_.size() << endl; cpuRetrieveFile_() - << runTime_.timeOutputValue() + << runTime_.userTime() << " " << searchISATCpuTime_ << endl; searchISATCpuTime_ = 0; cpuGrowFile_() - << runTime_.timeOutputValue() + << runTime_.userTime() << " " << growCpuTime_ << endl; growCpuTime_ = 0; cpuAddFile_() - << runTime_.timeOutputValue() + << runTime_.userTime() << " " << addNewLeafCpuTime_ << endl; addNewLeafCpuTime_ = 0; } diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C index 313f4144f9..7c92876da1 100644 --- a/src/triSurface/triSurface/triSurface.C +++ b/src/triSurface/triSurface/triSurface.C @@ -59,7 +59,7 @@ Foam::fileName Foam::triSurface::triSurfInstance(const Time& d) for (i=ts.size()-1; i>=0; i--) { - if (ts[i].value() <= d.timeOutputValue()) + if (ts[i].value() <= d.userTime()) { break; } diff --git a/src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C b/src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C index ed7a6f64e0..0b143d84c4 100644 --- a/src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C +++ b/src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C @@ -183,7 +183,7 @@ void Foam::waveAlphaFvPatchScalarField::updateCoeffs() return; } - const scalar t = db().time().timeOutputValue(); + const scalar t = db().time().userTime(); operator==(alpha(t)); diff --git a/src/waves/derivedFvPatchFields/waveInletOutlet/waveInletOutletFvPatchField.C b/src/waves/derivedFvPatchFields/waveInletOutlet/waveInletOutletFvPatchField.C index 998016c9ae..483ad2c45f 100644 --- a/src/waves/derivedFvPatchFields/waveInletOutlet/waveInletOutletFvPatchField.C +++ b/src/waves/derivedFvPatchFields/waveInletOutlet/waveInletOutletFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -121,7 +121,7 @@ void Foam::waveInletOutletFvPatchField::updateCoeffs() phiName_ ); - const scalar t = this->db().time().timeOutputValue(); + const scalar t = this->db().time().userTime(); const waveSuperposition& waves = waveSuperposition::New(this->db()); const pointField& localPoints = this->patch().patch().localPoints(); diff --git a/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C b/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C index d3161ae947..67d51425fc 100644 --- a/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C +++ b/src/waves/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C @@ -185,7 +185,7 @@ void Foam::waveVelocityFvPatchVectorField::updateCoeffs() return; } - const scalar t = db().time().timeOutputValue(); + const scalar t = db().time().userTime(); operator==(U(t)); diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/WatersKing.C b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/WatersKing.C index 8fa15c8503..f724589a15 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/WatersKing.C +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/WatersKing.C @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) const scalar LOGvGreat = ::log(vGreat); while (!runTime.end()) { - scalar t = runTime.timeOutputValue()/lambda; + scalar t = runTime.userTime()/lambda; forAll(A, i) { if (bk[i]*t < LOGvGreat)