From 8bf9afff11aa817cd37ae7b4b728fbd4576ab8f0 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 26 Jun 2024 11:38:49 +0100 Subject: [PATCH] Time: Removed the deprecated timeName() function use name() instead. --- .../homogeneousCondensation.C | 4 ++-- .../homogeneousLiquidPhaseSeparation.C | 4 ++-- .../wallBoiling/wallBoilingHeatTransfer.C | 16 ++++++++-------- .../mesh/manipulation/stitchMesh/stitchMesh.C | 2 +- .../populationBalanceInitialDistributionFs | 4 ++-- src/OpenFOAM/db/Time/Time.H | 6 ------ src/finiteVolume/solver/solver.C | 4 ++-- .../zeroDimensionalFixedPressureConstraint.C | 2 +- src/fvMeshMovers/multiValveEngine/movingObject.C | 2 +- .../zeroDimensionalMassSourceBase.C | 6 +++--- .../propellerDisk/propellerDiskTemplates.C | 2 +- .../chemistryModel/chemistryModel.C | 4 ++-- tutorials/mesh/refineMesh/sector/system/R | 2 +- tutorials/mesh/refineMesh/sector/system/eRThetaZ | 6 +++--- 14 files changed, 29 insertions(+), 35 deletions(-) diff --git a/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousCondensation/homogeneousCondensation.C b/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousCondensation/homogeneousCondensation.C index 4801f10623..b425598e8a 100644 --- a/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousCondensation/homogeneousCondensation.C +++ b/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousCondensation/homogeneousCondensation.C @@ -85,7 +85,7 @@ Foam::fv::homogeneousCondensation::homogeneousCondensation IOobject ( typedName(IOobject::groupName("d", interface_.name())), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -98,7 +98,7 @@ Foam::fv::homogeneousCondensation::homogeneousCondensation IOobject ( typedName(IOobject::groupName("mDotByAlpha", interface_.name())), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C b/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C index 0c9621f819..ac8d8ba93f 100644 --- a/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C +++ b/applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C @@ -113,7 +113,7 @@ Foam::fv::homogeneousLiquidPhaseSeparation::homogeneousLiquidPhaseSeparation IOobject ( typedName(IOobject::groupName("d", interface_.name())), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -126,7 +126,7 @@ Foam::fv::homogeneousLiquidPhaseSeparation::homogeneousLiquidPhaseSeparation IOobject ( typedName(IOobject::groupName("mDotByAlpha", interface_.name())), - mesh.time().timeName(), + mesh.time().name(), mesh, IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C b/applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C index 640c6a1bed..5a69675313 100644 --- a/applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C +++ b/applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C @@ -89,7 +89,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer IOobject ( IOobject::groupName("fWallBoiling", interface_.name()), - interface_.mesh().time().timeName(), + interface_.mesh().time().name(), interface_.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -102,7 +102,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer IOobject ( IOobject::groupName("departureDiameter", interface_.name()), - interface_.mesh().time().timeName(), + interface_.mesh().time().name(), interface_.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -115,7 +115,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer IOobject ( IOobject::groupName("departureFrequency", interface_.name()), - interface_.mesh().time().timeName(), + interface_.mesh().time().name(), interface_.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -128,7 +128,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer IOobject ( IOobject::groupName("nucleationSites", interface_.name()), - interface_.mesh().time().timeName(), + interface_.mesh().time().name(), interface_.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -141,7 +141,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer IOobject ( IOobject::groupName(typedName("dmdtf"), interface_.name()), - interface_.mesh().time().timeName(), + interface_.mesh().time().name(), interface_.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -154,7 +154,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer IOobject ( IOobject::groupName("qq", interface_.name()), - interface_.mesh().time().timeName(), + interface_.mesh().time().name(), interface_.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -167,7 +167,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer IOobject ( IOobject::groupName("Tsurface", interface_.name()), - interface_.mesh().time().timeName(), + interface_.mesh().time().name(), interface_.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -180,7 +180,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer IOobject ( IOobject::groupName(typedName("K"), interface_.name()), - interface_.mesh().time().timeName(), + interface_.mesh().time().name(), interface_.mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C index e060f6d1e4..26abcf047e 100644 --- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C +++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) const word oldInstance = mesh.pointsInstance(); // Search for list of objects for this time - IOobjectList objects(mesh, runTime.timeName()); + IOobjectList objects(mesh, runTime.name()); if (fields) Info<< "Reading geometric fields" << nl << endl; diff --git a/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs b/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs index fa4e90f1d2..65406bc25b 100644 --- a/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs +++ b/etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs @@ -73,7 +73,7 @@ codeRead IOobject ( IOobject::groupName("fDefault", phaseName), - mesh().time().timeName(), + mesh().time().name(), mesh(), IOobject::MUST_READ ), @@ -87,7 +87,7 @@ codeRead IOobject ( IOobject::groupName("f" + Foam::name(i), phaseName), - mesh().time().timeName(), + mesh().time().name(), mesh(), IOobject::READ_IF_PRESENT ), diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H index 69987b7a75..41c0bbf026 100644 --- a/src/OpenFOAM/db/Time/Time.H +++ b/src/OpenFOAM/db/Time/Time.H @@ -380,12 +380,6 @@ public: const int precision = curPrecision_ ); - //- Return current time name (for backwards-compatibility) - const word& timeName() const - { - return dimensionedScalar::name(); - } - //- Search a given directory for valid time directories static instantList findTimes ( diff --git a/src/finiteVolume/solver/solver.C b/src/finiteVolume/solver/solver.C index ebe36b4e2d..a78f2e85c3 100644 --- a/src/finiteVolume/solver/solver.C +++ b/src/finiteVolume/solver/solver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2022-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ Foam::solver::solver(fvMesh& mesh) IOobject ( typeName, - mesh.time().timeName(), + mesh.time().name(), mesh ) ), diff --git a/src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C b/src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C index acb12e17f9..32c9598e85 100644 --- a/src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C +++ b/src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C @@ -257,7 +257,7 @@ bool Foam::fv::zeroDimensionalFixedPressureConstraint::constrain IOobject ( typedName("source"), - mesh().time().timeName(), + mesh().time().name(), mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE diff --git a/src/fvMeshMovers/multiValveEngine/movingObject.C b/src/fvMeshMovers/multiValveEngine/movingObject.C index 5b0714eacf..13dcb46f80 100644 --- a/src/fvMeshMovers/multiValveEngine/movingObject.C +++ b/src/fvMeshMovers/multiValveEngine/movingObject.C @@ -308,7 +308,7 @@ Foam::fvMeshMovers::multiValveEngine::movingObject::movingObject IOobject ( "motionScale_" + name, - meshMover_.mesh().time().timeName(), + meshMover_.mesh().time().name(), meshMover_.mesh(), IOobject::NO_READ, IOobject::NO_WRITE diff --git a/src/fvModels/general/zeroDimensionalMassSource/zeroDimensionalMassSourceBase.C b/src/fvModels/general/zeroDimensionalMassSource/zeroDimensionalMassSourceBase.C index 58164cc1ef..7c411aab2d 100644 --- a/src/fvModels/general/zeroDimensionalMassSource/zeroDimensionalMassSourceBase.C +++ b/src/fvModels/general/zeroDimensionalMassSource/zeroDimensionalMassSourceBase.C @@ -108,7 +108,7 @@ const Foam::volScalarField& Foam::fv::zeroDimensionalMassSourceBase::m() const typeIOobject mIo ( typedName("m"), - mesh().time().timeName(), + mesh().time().name(), mesh(), IOobject::READ_IF_PRESENT, IOobject::AUTO_WRITE @@ -135,7 +135,7 @@ const Foam::volScalarField& Foam::fv::zeroDimensionalMassSourceBase::m() const IOobject ( typedName("factor"), - mesh().time().timeName(), + mesh().time().name(), mesh(), IOobject::NO_READ, IOobject::AUTO_WRITE @@ -265,7 +265,7 @@ void Foam::fv::zeroDimensionalMassSourceBase::correct() IOobject ( typedName("deltaM"), - mesh().time().timeName(), + mesh().time().name(), mesh() ), mesh(), diff --git a/src/fvModels/propellerDisk/propellerDiskTemplates.C b/src/fvModels/propellerDisk/propellerDiskTemplates.C index e6cc8e5a77..d694448aa9 100644 --- a/src/fvModels/propellerDisk/propellerDiskTemplates.C +++ b/src/fvModels/propellerDisk/propellerDiskTemplates.C @@ -49,7 +49,7 @@ void Foam::fv::propellerDisk::addActuationDiskAxialInertialResistance IOobject ( typedName("force"), - mesh().time().timeName(), + mesh().time().name(), mesh(), IOobject::NO_READ, IOobject::AUTO_WRITE diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C index 5b3bbd4baf..7b17b9e27b 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C @@ -79,7 +79,7 @@ Foam::chemistryModel::chemistryModel IOobject ( "RR." + Yvf_[fieldi].name(), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh(), IOobject::NO_READ, IOobject::NO_WRITE @@ -102,7 +102,7 @@ Foam::chemistryModel::chemistryModel typeIOobject header ( Yvf_[i].name(), - this->mesh().time().timeName(), + this->mesh().time().name(), this->mesh(), IOobject::NO_READ ); diff --git a/tutorials/mesh/refineMesh/sector/system/R b/tutorials/mesh/refineMesh/sector/system/R index 3387c26a06..8929a0a91f 100644 --- a/tutorials/mesh/refineMesh/sector/system/R +++ b/tutorials/mesh/refineMesh/sector/system/R @@ -26,7 +26,7 @@ codeWrite IOobject ( "R", - mesh().time().timeName(), + mesh().time().name(), mesh() ), mag(XY & mesh().C()) diff --git a/tutorials/mesh/refineMesh/sector/system/eRThetaZ b/tutorials/mesh/refineMesh/sector/system/eRThetaZ index 7d7b2d0ae1..4ea942951d 100644 --- a/tutorials/mesh/refineMesh/sector/system/eRThetaZ +++ b/tutorials/mesh/refineMesh/sector/system/eRThetaZ @@ -29,19 +29,19 @@ codeWrite vectorIOField ( - IOobject("eR", mesh().time().timeName(), mesh()), + IOobject("eR", mesh().time().name(), mesh()), xy/mag(xy) ).write(); vectorIOField ( - IOobject("eTheta", mesh().time().timeName(), mesh()), + IOobject("eTheta", mesh().time().name(), mesh()), (zStar ^ xy)/mag(zStar ^ xy) ).write(); vectorIOField ( - IOobject("eZ", mesh().time().timeName(), mesh()), + IOobject("eZ", mesh().time().name(), mesh()), zStar/mag(zStar) ).write(); #};