zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Time: Removed the deprecated timeName() function

Browse Source 
use name() instead.
This commit is contained in:
Henry Weller
2024-06-26 11:38:49 +01:00
parent 10c1f27e06
commit 8bf9afff11
14 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousCondensation/homogeneousCondensation.C
View File

@ -85,7 +85,7 @@ Foam::fv::homogeneousCondensation::homogeneousCondensation
IOobject IOobject
( (
typedName(IOobject::groupName("d", interface_.name())), typedName(IOobject::groupName("d", interface_.name())),
mesh.time().timeName(), mesh.time().name(),
mesh, mesh,
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -98,7 +98,7 @@ Foam::fv::homogeneousCondensation::homogeneousCondensation
IOobject IOobject
( (
typedName(IOobject::groupName("mDotByAlpha", interface_.name())), typedName(IOobject::groupName("mDotByAlpha", interface_.name())),
mesh.time().timeName(), mesh.time().name(),
mesh, mesh,
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE

4
applications/modules/multiphaseEuler/fvModels/nucleation/homogeneousLiquidPhaseSeparation/homogeneousLiquidPhaseSeparation.C
View File

@ -113,7 +113,7 @@ Foam::fv::homogeneousLiquidPhaseSeparation::homogeneousLiquidPhaseSeparation
IOobject IOobject
( (
typedName(IOobject::groupName("d", interface_.name())), typedName(IOobject::groupName("d", interface_.name())),
mesh.time().timeName(), mesh.time().name(),
mesh, mesh,
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -126,7 +126,7 @@ Foam::fv::homogeneousLiquidPhaseSeparation::homogeneousLiquidPhaseSeparation
IOobject IOobject
( (
typedName(IOobject::groupName("mDotByAlpha", interface_.name())), typedName(IOobject::groupName("mDotByAlpha", interface_.name())),
mesh.time().timeName(), mesh.time().name(),
mesh, mesh,
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE

16
applications/modules/multiphaseEuler/thermophysicalTransportModels/heatTransferModels/wallBoiling/wallBoilingHeatTransfer.C
View File

@ -89,7 +89,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer
IOobject IOobject
( (
IOobject::groupName("fWallBoiling", interface_.name()), IOobject::groupName("fWallBoiling", interface_.name()),
interface_.mesh().time().timeName(), interface_.mesh().time().name(),
interface_.mesh(), interface_.mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -102,7 +102,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer
IOobject IOobject
( (
IOobject::groupName("departureDiameter", interface_.name()), IOobject::groupName("departureDiameter", interface_.name()),
interface_.mesh().time().timeName(), interface_.mesh().time().name(),
interface_.mesh(), interface_.mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -115,7 +115,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer
IOobject IOobject
( (
IOobject::groupName("departureFrequency", interface_.name()), IOobject::groupName("departureFrequency", interface_.name()),
interface_.mesh().time().timeName(), interface_.mesh().time().name(),
interface_.mesh(), interface_.mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -128,7 +128,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer
IOobject IOobject
( (
IOobject::groupName("nucleationSites", interface_.name()), IOobject::groupName("nucleationSites", interface_.name()),
interface_.mesh().time().timeName(), interface_.mesh().time().name(),
interface_.mesh(), interface_.mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -141,7 +141,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer
IOobject IOobject
( (
IOobject::groupName(typedName("dmdtf"), interface_.name()), IOobject::groupName(typedName("dmdtf"), interface_.name()),
interface_.mesh().time().timeName(), interface_.mesh().time().name(),
interface_.mesh(), interface_.mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -154,7 +154,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer
IOobject IOobject
( (
IOobject::groupName("qq", interface_.name()), IOobject::groupName("qq", interface_.name()),
interface_.mesh().time().timeName(), interface_.mesh().time().name(),
interface_.mesh(), interface_.mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -167,7 +167,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer
IOobject IOobject
( (
IOobject::groupName("Tsurface", interface_.name()), IOobject::groupName("Tsurface", interface_.name()),
interface_.mesh().time().timeName(), interface_.mesh().time().name(),
interface_.mesh(), interface_.mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -180,7 +180,7 @@ Foam::heatTransferModels::wallBoilingHeatTransfer::wallBoilingHeatTransfer
IOobject IOobject
( (
IOobject::groupName(typedName("K"), interface_.name()), IOobject::groupName(typedName("K"), interface_.name()),
interface_.mesh().time().timeName(), interface_.mesh().time().name(),
interface_.mesh(), interface_.mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE

2
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View File

@ -110,7 +110,7 @@ int main(int argc, char *argv[])
const word oldInstance = mesh.pointsInstance(); const word oldInstance = mesh.pointsInstance();
// Search for list of objects for this time // 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; if (fields) Info<< "Reading geometric fields" << nl << endl;

4
etc/caseDicts/functions/multiphase/populationBalanceInitialDistributionFs
View File

@ -73,7 +73,7 @@ codeRead
IOobject IOobject
( (
IOobject::groupName("fDefault", phaseName), IOobject::groupName("fDefault", phaseName),
mesh().time().timeName(), mesh().time().name(),
mesh(), mesh(),
IOobject::MUST_READ IOobject::MUST_READ
), ),
@ -87,7 +87,7 @@ codeRead
IOobject IOobject
( (
IOobject::groupName("f" + Foam::name(i), phaseName), IOobject::groupName("f" + Foam::name(i), phaseName),
mesh().time().timeName(), mesh().time().name(),
mesh(), mesh(),
IOobject::READ_IF_PRESENT IOobject::READ_IF_PRESENT
), ),

6
src/OpenFOAM/db/Time/Time.H
View File

@ -380,12 +380,6 @@ public:
const int precision = curPrecision_ 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 //- Search a given directory for valid time directories
static instantList findTimes static instantList findTimes
( (

4
src/finiteVolume/solver/solver.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation \\ / A nd | Copyright (C) 2022-2024 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -64,7 +64,7 @@ Foam::solver::solver(fvMesh& mesh)
IOobject IOobject
( (
typeName, typeName,
mesh.time().timeName(), mesh.time().name(),
mesh mesh
) )
), ),

2
src/fvConstraints/zeroDimensionalFixedPressure/zeroDimensionalFixedPressureConstraint.C
View File

@ -257,7 +257,7 @@ bool Foam::fv::zeroDimensionalFixedPressureConstraint::constrain
IOobject IOobject
( (
typedName("source"), typedName("source"),
mesh().time().timeName(), mesh().time().name(),
mesh(), mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE

2
src/fvMeshMovers/multiValveEngine/movingObject.C
View File

@ -308,7 +308,7 @@ Foam::fvMeshMovers::multiValveEngine::movingObject::movingObject
IOobject IOobject
( (
"motionScale_" + name, "motionScale_" + name,
meshMover_.mesh().time().timeName(), meshMover_.mesh().time().name(),
meshMover_.mesh(), meshMover_.mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE

6
src/fvModels/general/zeroDimensionalMassSource/zeroDimensionalMassSourceBase.C
View File

@ -108,7 +108,7 @@ const Foam::volScalarField& Foam::fv::zeroDimensionalMassSourceBase::m() const
typeIOobject<volScalarField> mIo typeIOobject<volScalarField> mIo
( (
typedName("m"), typedName("m"),
mesh().time().timeName(), mesh().time().name(),
mesh(), mesh(),
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -135,7 +135,7 @@ const Foam::volScalarField& Foam::fv::zeroDimensionalMassSourceBase::m() const
IOobject IOobject
( (
typedName("factor"), typedName("factor"),
mesh().time().timeName(), mesh().time().name(),
mesh(), mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
@ -265,7 +265,7 @@ void Foam::fv::zeroDimensionalMassSourceBase::correct()
IOobject IOobject
( (
typedName("deltaM"), typedName("deltaM"),
mesh().time().timeName(), mesh().time().name(),
mesh() mesh()
), ),
mesh(), mesh(),

2
src/fvModels/propellerDisk/propellerDiskTemplates.C
View File

@ -49,7 +49,7 @@ void Foam::fv::propellerDisk::addActuationDiskAxialInertialResistance
IOobject IOobject
( (
typedName("force"), typedName("force"),
mesh().time().timeName(), mesh().time().name(),
mesh(), mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE

4
src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel.C
View File

@ -79,7 +79,7 @@ Foam::chemistryModel<ThermoType>::chemistryModel
IOobject IOobject
( (
"RR." + Yvf_[fieldi].name(), "RR." + Yvf_[fieldi].name(),
this->mesh().time().timeName(), this->mesh().time().name(),
this->mesh(), this->mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE
@ -102,7 +102,7 @@ Foam::chemistryModel<ThermoType>::chemistryModel
typeIOobject<volScalarField> header typeIOobject<volScalarField> header
( (
Yvf_[i].name(), Yvf_[i].name(),
this->mesh().time().timeName(), this->mesh().time().name(),
this->mesh(), this->mesh(),
IOobject::NO_READ IOobject::NO_READ
); );

2
tutorials/mesh/refineMesh/sector/system/R
View File

@ -26,7 +26,7 @@ codeWrite
IOobject IOobject
( (
"R", "R",
mesh().time().timeName(), mesh().time().name(),
mesh() mesh()
), ),
mag(XY & mesh().C()) mag(XY & mesh().C())

6
tutorials/mesh/refineMesh/sector/system/eRThetaZ
View File

@ -29,19 +29,19 @@ codeWrite
vectorIOField vectorIOField
( (
IOobject("eR", mesh().time().timeName(), mesh()), IOobject("eR", mesh().time().name(), mesh()),
xy/mag(xy) xy/mag(xy)
).write(); ).write();
vectorIOField vectorIOField
( (
IOobject("eTheta", mesh().time().timeName(), mesh()), IOobject("eTheta", mesh().time().name(), mesh()),
(zStar ^ xy)/mag(zStar ^ xy) (zStar ^ xy)/mag(zStar ^ xy)
).write(); ).write();
vectorIOField vectorIOField
( (
IOobject("eZ", mesh().time().timeName(), mesh()), IOobject("eZ", mesh().time().name(), mesh()),
zStar/mag(zStar) zStar/mag(zStar)
).write(); ).write();
#}; #};