Time::timeName(): no longer needed, calls replaced by name()

The timeName() function simply returns the dimensionedScalar::name() which holds
the user-time name of the current time and now that timeName() is no longer
virtual the dimensionedScalar::name() can be called directly.  The timeName()
function implementation is maintained for backward-compatibility.
This commit is contained in:
Henry Weller
2022-11-30 15:53:51 +00:00
parent 262672ec10
commit ed7e703040
546 changed files with 1612 additions and 1613 deletions

View File

@ -685,7 +685,7 @@ void Foam::BlendedInterfacialModel<ModelType>::postProcessBlendingCoefficients
IOobject
(
fluid.phases()[phasei].volScalarField::name(),
mesh.time().timeName(),
mesh.time().name(),
mesh
),
mesh,
@ -1284,7 +1284,7 @@ Foam::BlendedInterfacialModel<ModelType>::BlendedInterfacialModel
IOobject
(
IOobject::groupName(typeName, interface.name()),
interface.fluid().mesh().time().timeName(),
interface.fluid().mesh().time().name(),
interface.fluid().mesh()
)
),

View File

@ -249,7 +249,7 @@ InterfaceCompositionPhaseChangePhaseSystem
"interfaceCompositionPhaseChange:dmdtf",
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
@ -275,7 +275,7 @@ InterfaceCompositionPhaseChangePhaseSystem
"interfaceCompositionPhaseChange:Tf",
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -321,7 +321,7 @@ InterfaceCompositionPhaseChangePhaseSystem
),
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),
@ -345,7 +345,7 @@ InterfaceCompositionPhaseChangePhaseSystem
),
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),

View File

@ -113,7 +113,7 @@ MomentumTransferPhaseSystem
IOobject
(
IOobject::groupName("Kd", interface.name()),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),
@ -129,7 +129,7 @@ MomentumTransferPhaseSystem
IOobject
(
IOobject::groupName("Kdf", interface.name()),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),
@ -155,7 +155,7 @@ MomentumTransferPhaseSystem
IOobject
(
IOobject::groupName("Vm", interface.name()),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),
@ -171,7 +171,7 @@ MomentumTransferPhaseSystem
IOobject
(
IOobject::groupName("Vmf", interface.name()),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),

View File

@ -175,7 +175,7 @@ Foam::PhaseTransferPhaseSystem<BasePhaseSystem>::PhaseTransferPhaseSystem
"phaseTransfer:dmdtf",
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),
@ -195,7 +195,7 @@ Foam::PhaseTransferPhaseSystem<BasePhaseSystem>::PhaseTransferPhaseSystem
"phaseTransfer:d2mdtdpf",
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),
@ -228,7 +228,7 @@ Foam::PhaseTransferPhaseSystem<BasePhaseSystem>::PhaseTransferPhaseSystem
),
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh()
),
this->mesh(),

View File

@ -129,7 +129,7 @@ ThermalPhaseChangePhaseSystem
"thermalPhaseChange:dmdtf",
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
@ -151,7 +151,7 @@ ThermalPhaseChangePhaseSystem
"thermalPhaseChange:d2mdtdpf",
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -173,7 +173,7 @@ ThermalPhaseChangePhaseSystem
"thermalPhaseChange:Tf",
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
@ -197,7 +197,7 @@ ThermalPhaseChangePhaseSystem
"thermalPhaseChange:nucleation:dmdtf",
interface.name()
),
this->mesh().time().timeName(),
this->mesh().time().name(),
this->mesh(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE

View File

@ -41,7 +41,7 @@ Foam::SidedInterfacialModel<ModelType>::SidedInterfacialModel
IOobject
(
IOobject::groupName(typeName, interface.name()),
interface.mesh().time().timeName(),
interface.mesh().time().name(),
interface.mesh()
)
),

View File

@ -71,7 +71,7 @@ Foam::diameterModels::IATE::IATE
IOobject
(
IOobject::groupName("kappai", phase.name()),
phase.time().timeName(),
phase.time().name(),
phase.mesh(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE

View File

@ -55,7 +55,7 @@ Foam::diameterModels::IATEsources::dummy::R
IOobject
(
typedName("R"),
iate_.phase().time().timeName(),
iate_.phase().time().name(),
iate_.phase().mesh()
),
iate_.phase().mesh(),

View File

@ -72,7 +72,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R
IOobject
(
typedName("R"),
iate_.phase().time().timeName(),
iate_.phase().time().name(),
iate_.phase().mesh()
),
iate_.phase().mesh(),

View File

@ -71,7 +71,7 @@ Foam::diameterModels::IATEsources::turbulentBreakUp::R
IOobject
(
typedName("R"),
iate_.phase().time().timeName(),
iate_.phase().time().name(),
iate_.phase().mesh()
),
iate_.phase().mesh(),

View File

@ -69,7 +69,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R
IOobject
(
typedName("R"),
phase().time().timeName(),
phase().time().name(),
phase().mesh()
),
phase().mesh(),
@ -81,7 +81,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R
IOobject
(
typedName("Rdk"),
phase().time().timeName(),
phase().time().name(),
phase().mesh()
),
phase().mesh(),

View File

@ -54,7 +54,7 @@ Foam::diameterModels::isothermal::isothermal
IOobject
(
IOobject::groupName("d", phase.name()),
phase.time().timeName(),
phase.time().name(),
phase.mesh()
),
phase.mesh(),

View File

@ -69,7 +69,7 @@ Foam::diameterModels::linearTsub::linearTsub
IOobject
(
IOobject::groupName("d", phase.name()),
phase.time().timeName(),
phase.time().name(),
phase.mesh()
),
phase.mesh(),

View File

@ -77,7 +77,7 @@ Foam::diameterModels::shapeModels::fractal::fractal
IOobject
(
"kappa" + group.name().substr(1),
group.mesh().time().timeName(),
group.mesh().time().name(),
group.mesh(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
@ -98,7 +98,7 @@ Foam::diameterModels::shapeModels::fractal::fractal
IOobject
(
"dColl" + group.name().substr(1),
group.mesh().time().timeName(),
group.mesh().time().name(),
group.mesh()
),
this->dColl()
@ -108,7 +108,7 @@ Foam::diameterModels::shapeModels::fractal::fractal
IOobject
(
IOobject::groupName("Su", kappa_.name()),
group.mesh().time().timeName(),
group.mesh().time().name(),
group.mesh()
),
group.mesh(),

View File

@ -116,7 +116,7 @@ Foam::diameterModels::shapeModels::sinteringModels::KochFriedlander::R() const
IOobject
(
typedName("R"),
fi.time().timeName(),
fi.time().name(),
fi.mesh()
),
fi.mesh(),

View File

@ -75,7 +75,7 @@ Foam::diameterModels::shapeModels::sinteringModels::noSintering::R() const
IOobject
(
typedName("R"),
fi.time().timeName(),
fi.time().name(),
fi.mesh()
),
fi.mesh(),

View File

@ -52,7 +52,7 @@ Foam::diameterModels::sizeGroup::sizeGroup
name,
velocityGroup.phase().name()
),
mesh.time().timeName(),
mesh.time().name(),
mesh,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE

View File

@ -152,7 +152,7 @@ Foam::diameterModels::velocityGroup::velocityGroup
"f",
phase.name()
),
phase.time().timeName(),
phase.time().name(),
phase.mesh(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE

View File

@ -47,7 +47,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::phi(const volVectorField& U) const
typeIOobject<surfaceScalarField> phiHeader
(
phiName,
U.mesh().time().timeName(),
U.mesh().time().name(),
U.mesh(),
IOobject::NO_READ
);
@ -63,7 +63,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::phi(const volVectorField& U) const
IOobject
(
phiName,
U.mesh().time().timeName(),
U.mesh().time().name(),
U.mesh(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
@ -97,7 +97,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::phi(const volVectorField& U) const
IOobject
(
phiName,
U.mesh().time().timeName(),
U.mesh().time().name(),
U.mesh(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -127,7 +127,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
IOobject
(
IOobject::groupName("U", this->name()),
fluid.mesh().time().timeName(),
fluid.mesh().time().name(),
fluid.mesh(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
@ -140,7 +140,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
IOobject
(
IOobject::groupName("alphaPhi", this->name()),
fluid.mesh().time().timeName(),
fluid.mesh().time().name(),
fluid.mesh()
),
fluid.mesh(),
@ -151,7 +151,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
IOobject
(
IOobject::groupName("alphaRhoPhi", this->name()),
fluid.mesh().time().timeName(),
fluid.mesh().time().name(),
fluid.mesh()
),
fluid.mesh(),
@ -186,7 +186,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
IOobject
(
IOobject::groupName("continuityError", this->name()),
fluid.mesh().time().timeName(),
fluid.mesh().time().name(),
fluid.mesh()
),
fluid.mesh(),
@ -203,7 +203,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
IOobject
(
IOobject::groupName("Uf", this->name()),
fluid.mesh().time().timeName(),
fluid.mesh().time().name(),
fluid.mesh(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE

View File

@ -54,7 +54,7 @@ Foam::phaseModel::phaseModel
IOobject
(
IOobject::groupName("alpha", phaseName),
fluid.mesh().time().timeName(),
fluid.mesh().time().name(),
fluid.mesh(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -67,7 +67,7 @@ Foam::phaseModel::phaseModel
IOobject
(
IOobject::groupName("alpha", phaseName),
fluid.mesh().time().timeName(),
fluid.mesh().time().name(),
fluid.mesh(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE

View File

@ -241,7 +241,7 @@ Foam::phaseSystem::phaseSystem
IOobject
(
"dpdt",
mesh.time().timeName(),
mesh.time().name(),
mesh
),
mesh,

View File

@ -125,7 +125,7 @@ void Foam::phaseSystem::solve
IOobject
(
"alphaVoid",
mesh_.time().timeName(),
mesh_.time().name(),
mesh_
),
mesh_,
@ -173,7 +173,7 @@ void Foam::phaseSystem::solve
IOobject
(
"Sp",
mesh_.time().timeName(),
mesh_.time().name(),
mesh_
),
mesh_,
@ -525,7 +525,7 @@ void Foam::phaseSystem::solve
IOobject
(
"sumAlphaMoving",
mesh_.time().timeName(),
mesh_.time().name(),
mesh_
),
mesh_,

View File

@ -178,7 +178,7 @@ void Foam::phaseSystem::fillFields
IOobject
(
IOobject::groupName(name, phase.name()),
this->mesh_.time().timeName(),
this->mesh_.time().name(),
this->mesh_
),
this->mesh_,
@ -214,7 +214,7 @@ void Foam::phaseSystem::fillFields
IOobject
(
IOobject::groupName(name, phase.name()),
this->mesh_.time().timeName(),
this->mesh_.time().name(),
this->mesh_
),
this->mesh_,

View File

@ -40,7 +40,7 @@ Foam::diameterModels::LiaoBase::LiaoBase
IOobject
(
"kolmogorovLengthScale",
populationBalance_.time().timeName(),
populationBalance_.time().name(),
populationBalance_.mesh()
),
populationBalance_.mesh(),
@ -56,7 +56,7 @@ Foam::diameterModels::LiaoBase::LiaoBase
IOobject
(
"shearStrainRate",
populationBalance_.time().timeName(),
populationBalance_.time().name(),
populationBalance_.mesh()
),
populationBalance_.mesh(),
@ -72,7 +72,7 @@ Foam::diameterModels::LiaoBase::LiaoBase
IOobject
(
"eddyStrainRate",
populationBalance_.time().timeName(),
populationBalance_.time().name(),
populationBalance_.mesh()
),
populationBalance_.mesh(),

View File

@ -70,7 +70,7 @@ Foam::diameterModels::binaryBreakupModels::LuoSvendsen::LuoSvendsen
IOobject
(
"kolmogorovLengthScale",
popBal_.time().timeName(),
popBal_.time().name(),
popBal_.mesh()
),
popBal_.mesh(),

View File

@ -69,7 +69,7 @@ BrownianCollisions
IOobject
(
"lambda",
popBal_.time().timeName(),
popBal_.time().name(),
popBal_.mesh()
),
popBal_.mesh(),

View File

@ -64,7 +64,7 @@ DahnekeInterpolation
IOobject
(
"BrownianCollisionRate",
popBal_.mesh().time().timeName(),
popBal_.mesh().time().name(),
popBal_.mesh()
),
popBal_.mesh(),
@ -76,7 +76,7 @@ DahnekeInterpolation
IOobject
(
"ballisticCollisionRate",
popBal_.mesh().time().timeName(),
popBal_.mesh().time().name(),
popBal_.mesh()
),
popBal_.mesh(),

View File

@ -80,7 +80,7 @@ LiaoCoalescence
IOobject
(
"CPack",
popBal_.time().timeName(),
popBal_.time().name(),
popBal_.mesh()
),
popBal_.mesh(),
@ -100,7 +100,7 @@ LiaoCoalescence
IOobject
(
"dCrit",
popBal_.time().timeName(),
popBal_.time().name(),
popBal_.mesh()
),
popBal_.mesh(),
@ -116,7 +116,7 @@ LiaoCoalescence
IOobject
(
"uRelTurb",
popBal_.time().timeName(),
popBal_.time().name(),
popBal_.mesh()
),
popBal_.mesh(),
@ -132,7 +132,7 @@ LiaoCoalescence
IOobject
(
"uRelBuoy",
popBal_.time().timeName(),
popBal_.time().name(),
popBal_.mesh()
),
popBal_.mesh(),
@ -148,7 +148,7 @@ LiaoCoalescence
IOobject
(
"uRelShear",
popBal_.time().timeName(),
popBal_.time().name(),
popBal_.mesh()
),
popBal_.mesh(),

View File

@ -93,7 +93,7 @@ PrinceBlanch
IOobject
(
"shearStrainRate",
popBal_.time().timeName(),
popBal_.time().name(),
popBal_.mesh()
),
popBal_.mesh(),

View File

@ -71,7 +71,7 @@ Foam::diameterModels::driftModels::phaseChange::phaseChange
IOobject
(
IOobject::groupName(typedName("W"), interfaces_[i].name()),
popBal_.mesh().time().timeName(),
popBal_.mesh().time().name(),
popBal_.mesh()
),
popBal_.mesh(),

View File

@ -77,7 +77,7 @@ void Foam::diameterModels::populationBalanceModel::registerVelocityGroups()
"dilatationError",
velGroup.phase().name()
),
fluid_.time().timeName(),
fluid_.time().name(),
mesh_
),
mesh_,
@ -167,7 +167,7 @@ void Foam::diameterModels::populationBalanceModel::registerSizeGroups
IOobject
(
"Su",
fluid_.time().timeName(),
fluid_.time().name(),
mesh_
),
mesh_,
@ -182,7 +182,7 @@ void Foam::diameterModels::populationBalanceModel::registerSizeGroups
IOobject
(
"Sp",
fluid_.time().timeName(),
fluid_.time().name(),
mesh_
),
mesh_,
@ -236,7 +236,7 @@ void Foam::diameterModels::populationBalanceModel::initialiseDmdtfs()
typedName("dmdtf"),
interface.name()
),
mesh().time().timeName(),
mesh().time().name(),
mesh()
),
mesh(),
@ -815,7 +815,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
"Sui",
mesh_.time().timeName(),
mesh_.time().name(),
mesh_
),
mesh_,
@ -879,7 +879,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
"coalescenceRate",
mesh_.time().timeName(),
mesh_.time().name(),
mesh_
),
mesh_,
@ -905,7 +905,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
"breakupRate",
fluid_.time().timeName(),
fluid_.time().name(),
mesh_
),
mesh_,
@ -923,7 +923,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
"binaryBreakupRate",
fluid_.time().timeName(),
fluid_.time().name(),
mesh_
),
mesh_,
@ -959,7 +959,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
"driftRate",
fluid_.time().timeName(),
fluid_.time().name(),
mesh_
),
mesh_,
@ -977,7 +977,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
"nucleationRate",
fluid_.time().timeName(),
fluid_.time().name(),
mesh_
),
mesh_,
@ -1000,7 +1000,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
IOobject::groupName("alpha", this->name()),
fluid_.time().timeName(),
fluid_.time().name(),
mesh_,
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -1017,7 +1017,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
IOobject::groupName("d", this->name()),
fluid_.time().timeName(),
fluid_.time().name(),
mesh_,
IOobject::NO_READ,
IOobject::AUTO_WRITE
@ -1034,7 +1034,7 @@ Foam::diameterModels::populationBalanceModel::populationBalanceModel
IOobject
(
IOobject::groupName("U", this->name()),
fluid_.time().timeName(),
fluid_.time().name(),
mesh_,
IOobject::NO_READ,
IOobject::AUTO_WRITE