diff --git a/src/dynamicMesh/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.C index 1447a184fc..d6577f8bd8 100644 --- a/src/dynamicMesh/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.C +++ b/src/dynamicMesh/motionSolvers/displacement/linearSolver/displacementLinearMotionMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ Foam::displacementLinearMotionMotionSolver::curPoints() const tmp tcurPoints(new pointField(points0())); pointField& curPoints = tcurPoints.ref(); - const scalar t = mesh().time().value(); + const scalar t = mesh().time().userTimeValue(); const scalar displacement = displacement_->value(t); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C index 6abd94e559..05bec61318 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,7 +107,7 @@ void Foam::uniformJumpFvPatchField::updateCoeffs() if (this->cyclicPatch().owner()) { - this->jump_ = jumpTable_->value(this->db().time().value()); + this->jump_ = jumpTable_->value(this->db().time().userTimeValue()); } fixedJumpFvPatchField::updateCoeffs(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C index 3edb775c53..c8eef74821 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,7 @@ void Foam::uniformJumpAMIFvPatchField::updateCoeffs() if (this->cyclicAMIPatch().owner()) { - this->jump_ = jumpTable_->value(this->db().time().value()); + this->jump_ = jumpTable_->value(this->db().time().userTimeValue()); } fixedJumpAMIFvPatchField::updateCoeffs(); diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C index 85a74bed40..35c5a6c34f 100644 --- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C +++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -269,7 +269,7 @@ bool Foam::functionObjects::wallHeatFlux::write() if (Pstream::master()) { file() - << mesh_.time().value() + << mesh_.time().userTimeValue() << tab << pp.name() << tab << minqp << tab << maxqp diff --git a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C index 855d1f6d15..6fd09f8646 100644 --- a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C +++ b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -221,7 +221,7 @@ bool Foam::functionObjects::wallHeatTransferCoeff::write() if (Pstream::master()) { file() - << mesh_.time().value() + << mesh_.time().userTimeValue() << tab << pp.name() << tab << minHtcp << tab << maxHtcp diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C index 35dd667430..a1106c5ca4 100644 --- a/src/functionObjects/field/wallShearStress/wallShearStress.C +++ b/src/functionObjects/field/wallShearStress/wallShearStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -243,7 +243,7 @@ bool Foam::functionObjects::wallShearStress::write() if (Pstream::master()) { - file() << mesh_.time().value() + file() << mesh_.time().userTimeValue() << tab << pp.name() << tab << minSsp << tab << maxSsp diff --git a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C index e713501abf..70e33b6469 100644 --- a/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C +++ b/src/fvConstraints/fixedTemperatureConstraint/fixedTemperatureConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -137,7 +137,7 @@ bool Foam::fv::fixedTemperatureConstraint::constrain { case temperatureMode::uniform: { - const scalar t = mesh().time().value(); + const scalar t = mesh().time().userTimeValue(); scalarField Tuni(cells.size(), TValue_->value(t)); eqn.setValues(cells, thermo.he(Tuni, cells)); break; diff --git a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C index 2d0d3e5608..6d2abacadc 100644 --- a/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C +++ b/src/fvConstraints/fixedValueConstraint/fixedValueConstraint.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ bool Foam::fv::fixedValueConstraint::constrainType const word& fieldName ) const { - const scalar t = mesh().time().value(); + const scalar t = mesh().time().userTimeValue(); eqn.setValues ( diff --git a/src/fvModels/derived/accelerationSource/accelerationSourceTemplates.C b/src/fvModels/derived/accelerationSource/accelerationSourceTemplates.C index c97bbbce7f..6cf8673dc6 100644 --- a/src/fvModels/derived/accelerationSource/accelerationSourceTemplates.C +++ b/src/fvModels/derived/accelerationSource/accelerationSourceTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,9 @@ void Foam::fv::accelerationSource::add const scalar t = mesh().time().value(); const scalar dt = mesh().time().deltaTValue(); - const vector dU = velocity_->value(t) - velocity_->value(t - dt); + const vector dU = + velocity_->value(mesh().time().timeToUserTime(t)) + - velocity_->value(mesh().time().timeToUserTime(t - dt)); const vector a = dU/mesh().time().deltaTValue(); const labelList& cells = set_.cells(); diff --git a/src/fvModels/derived/heatSource/heatSource.C b/src/fvModels/derived/heatSource/heatSource.C index d2d8927a19..cc4c17c9bc 100644 --- a/src/fvModels/derived/heatSource/heatSource.C +++ b/src/fvModels/derived/heatSource/heatSource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -129,7 +129,7 @@ void Foam::fv::heatSource::addSup { const labelList& cells = set_.cells(); - const scalar t = mesh().time().value(); + const scalar t = mesh().time().userTimeValue(); const scalar q = q_->value(t); forAll(cells, i) diff --git a/src/fvModels/derived/massSource/massSource.C b/src/fvModels/derived/massSource/massSource.C index 50c6766823..839bbfd76a 100644 --- a/src/fvModels/derived/massSource/massSource.C +++ b/src/fvModels/derived/massSource/massSource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ void Foam::fv::massSource::addGeneralSupType const word& fieldName ) const { - const scalar t = mesh().time().value(); + const scalar t = mesh().time().userTimeValue(); const scalar massFlowRate = massFlowRate_->value(t); const Type value = fieldValues_[fieldName]->value(t); @@ -127,7 +127,7 @@ void Foam::fv::massSource::addSupType if (fieldName == rhoName_) { - const scalar t = mesh().time().value(); + const scalar t = mesh().time().userTimeValue(); const scalar massFlowRate = massFlowRate_->value(t); forAll(cells, i) @@ -146,7 +146,7 @@ void Foam::fv::massSource::addSupType << endl; } - const scalar t = mesh().time().value(); + const scalar t = mesh().time().userTimeValue(); const scalar massFlowRate = massFlowRate_->value(t); const scalar T = fieldValues_[TName_]->value(t); const basicThermo& thermo = diff --git a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSourceTemplates.C b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSourceTemplates.C index 33e1f1e894..2d4ed123e0 100644 --- a/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSourceTemplates.C +++ b/src/fvModels/derived/sixDoFAccelerationSource/sixDoFAccelerationSourceTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,10 @@ void Foam::fv::sixDoFAccelerationSource::addSup const word& fieldName ) const { - Vector accelerations(accelerations_->value(mesh().time().value())); + const Vector accelerations + ( + accelerations_->value(mesh().time().userTimeValue()) + ); // If gravitational force is present combine with the linear acceleration if (mesh().foundObject("g")) diff --git a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C index 7a7adba2ff..12abc7d7e0 100644 --- a/src/fvModels/general/semiImplicitSource/semiImplicitSource.C +++ b/src/fvModels/general/semiImplicitSource/semiImplicitSource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,7 +96,7 @@ void Foam::fv::semiImplicitSource::addSupType << ">::addSup for source " << name() << endl; } - const scalar t = mesh().time().value(); + const scalar t = mesh().time().userTimeValue(); const GeometricField& psi = eqn.psi(); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C index 041be25d09..09ca294e45 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,7 +102,7 @@ void constantRadiation::correct() tmp constantRadiation::Shs() { - const scalar time = film().time().value(); + const scalar time = film().time().userTimeValue(); if ((time >= timeStart_) && (time <= timeStart_ + duration_)) { diff --git a/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C index 129ed730c7..02e09a30a0 100644 --- a/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C +++ b/src/twoPhaseModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,7 +105,7 @@ Foam::timeVaryingAlphaContactAngleFvPatchScalarField::theta const fvsPatchVectorField& ) const { - scalar t = patch().boundaryMesh().mesh().time().value(); + scalar t = patch().boundaryMesh().mesh().time().userTimeValue(); scalar theta0 = thetaT0_; if (t < t0_)