diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index a9d178d63b..45d5063aa7 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ Foam::kineticTheoryModels::frictionalStressModels::JohnsonJackson::nu ( IOobject::groupName ( - IOobject::modelName("nu", frictionalStressModel::typeName), + Foam::typedName("nu"), phase.group() ), dimensionedScalar(dimTime, 0.5)*pf*sin(phi_) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C index 1fce8b9d93..760d9ccc61 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,7 +133,7 @@ JohnsonJacksonSchaeffer::nu ( IOobject::groupName ( - IOobject::modelName("nu", frictionalStressModel::typeName), + Foam::typedName("nu"), phase.group() ), phase.mesh(), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 378a8b9be2..1b06cb3c49 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -122,7 +122,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu ( IOobject::groupName ( - IOobject::modelName("nu", frictionalStressModel::typeName), + Foam::typedName("nu"), phase.group() ), phase.mesh(), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C index 687b47de19..7eeb606171 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,7 +78,7 @@ Foam::kineticTheoryModels::viscosityModels::Gidaspow::nu ( IOobject::groupName ( - IOobject::modelName("nu", viscosityModel::typeName), + Foam::typedName("nu"), Theta.group() ), da*sqrt(Theta) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C index 8063f6aa4e..680b911b22 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::nu ( IOobject::groupName ( - IOobject::modelName("nu", viscosityModel::typeName), + Foam::typedName("nu"), Theta.group() ), da*sqrt(Theta)* diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C index f74213daeb..d328038e78 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,7 +78,7 @@ Foam::kineticTheoryModels::viscosityModels::Syamlal::nu ( IOobject::groupName ( - IOobject::modelName("nu", viscosityModel::typeName), + Foam::typedName("nu"), Theta.group() ), da*sqrt(Theta) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C index 91eae175fa..9450ded558 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -67,7 +67,7 @@ Foam::tmp Foam::kineticTheoryModels::noneViscosity::nu ( IOobject::groupName ( - IOobject::modelName("nu", viscosityModel::typeName), + Foam::typedName("nu"), Theta.group() ), alpha1.mesh(), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C index 2df2534098..6032db4546 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,7 +54,7 @@ Foam::diameterModels::IATEsources::dummy::R ( IOobject ( - "dummy:R", + typedName("R"), iate_.phase().time().timeName(), iate_.phase().mesh() ), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C index e5c4329c6e..691ec23e15 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,7 +71,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R ( IOobject ( - "randomCoalescence:R", + typedName("R"), iate_.phase().time().timeName(), iate_.phase().mesh() ), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C index 6ca683eb52..9163bfaa6c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,7 +70,7 @@ Foam::diameterModels::IATEsources::turbulentBreakUp::R ( IOobject ( - "turbulentBreakUp:R", + typedName("R"), iate_.phase().time().timeName(), iate_.phase().mesh() ), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C index ba46259e2e..f5ba9c3f51 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C @@ -68,7 +68,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R ( IOobject ( - "wallBoiling:R", + typedName("R"), phase().time().timeName(), phase().mesh() ), @@ -80,7 +80,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R ( IOobject ( - "wallBoiling:Rdk", + typedName("Rdk"), phase().time().timeName(), phase().mesh() ), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C index d8c881bb88..35e45b2beb 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -115,7 +115,7 @@ Foam::diameterModels::shapeModels::sinteringModels::KochFriedlander::R() const ( IOobject ( - "KochFriedlander:R", + typedName("R"), fi.time().timeName(), fi.mesh() ), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C index 389b3b2a3e..34dd008a68 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C @@ -74,7 +74,7 @@ Foam::diameterModels::shapeModels::sinteringModels::noSintering::R() const ( IOobject ( - "noSintering:R", + typedName("R"), fi.time().timeName(), fi.mesh() ), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C index 6e73374ba7..97c2dce710 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C @@ -70,7 +70,7 @@ Foam::diameterModels::driftModels::phaseChange::phaseChange ( IOobject ( - IOobject::groupName(type() + ":W", interfaces_[i].name()), + IOobject::groupName(typedName("W"), interfaces_[i].name()), popBal_.mesh().time().timeName(), popBal_.mesh() ), diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C index 6936ba60d7..d44ecfab32 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C @@ -233,7 +233,7 @@ void Foam::diameterModels::populationBalanceModel::initialiseDmdtfs() ( IOobject::groupName ( - "populationBalance:dmdtf", + typedName("dmdtf"), interface.name() ), mesh().time().timeName(), diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C index 48773efde1..80ae4378b6 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.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 @@ -43,7 +43,7 @@ SpalartAllmarasDDES::rd { return volScalarField::Internal::New ( - modelName("rd"), + typedName("rd"), min ( this->nuEff()() @@ -70,7 +70,7 @@ SpalartAllmarasDDES::fd { return volScalarField::Internal::New ( - modelName("fd"), + typedName("fd"), 1 - tanh(pow3(8*rd(magGradU))) ); } @@ -89,7 +89,7 @@ SpalartAllmarasDDES::dTilda { return volScalarField::Internal::New ( - modelName("dTilda"), + typedName("dTilda"), max ( this->y_ diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H index ec09f42238..47216158ee 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H @@ -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 @@ -80,8 +80,6 @@ protected: // Protected Member Functions - using IOobject::modelName; - //- Length scale virtual tmp dTilda ( diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C index e1ea09a8b5..0a27c755d8 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.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 @@ -41,7 +41,7 @@ tmp SpalartAllmarasDES::chi() const { return volScalarField::New ( - modelName("chi"), + typedName("chi"), nuTilda_/this->nu() ); } @@ -56,7 +56,7 @@ tmp SpalartAllmarasDES::fv1 const volScalarField chi3("chi3", pow3(chi)); return volScalarField::New ( - modelName("fv1"), + typedName("fv1"), chi3/(chi3 + pow3(Cv1_)) ); } @@ -72,7 +72,7 @@ SpalartAllmarasDES::fv2 { return volScalarField::Internal::New ( - modelName("fv2"), + typedName("fv2"), 1.0 - chi/(1.0 + chi*fv1) ); } @@ -87,7 +87,7 @@ SpalartAllmarasDES::Omega { return volScalarField::Internal::New ( - modelName("Omega"), + typedName("Omega"), sqrt(2.0)*mag(skew(gradU)) ); } @@ -105,7 +105,7 @@ SpalartAllmarasDES::Stilda { return volScalarField::Internal::New ( - modelName("Stilda"), + typedName("Stilda"), max ( Omega @@ -126,7 +126,7 @@ tmp SpalartAllmarasDES::r { return volScalarField::Internal::New ( - modelName("r"), + typedName("r"), min ( nur @@ -153,11 +153,11 @@ SpalartAllmarasDES::fw ) const { const volScalarField::Internal r(this->r(nuTilda_, Omega, dTilda)); - const volScalarField::Internal g(modelName("g"), r + Cw2_*(pow6(r) - r)); + const volScalarField::Internal g(typedName("g"), r + Cw2_*(pow6(r) - r)); return volScalarField::Internal::New ( - modelName("fw"), + typedName("fw"), g*pow((1 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0) ); } @@ -174,7 +174,7 @@ SpalartAllmarasDES::dTilda { return volScalarField::Internal::New ( - modelName("dTilda"), + typedName("dTilda"), min(CDES_*this->delta()(), y_) ); } @@ -186,11 +186,11 @@ void SpalartAllmarasDES::cacheLESRegion const volScalarField::Internal& dTilda ) const { - if (this->mesh_.cacheTemporaryObject(modelName("LESRegion"))) + if (this->mesh_.cacheTemporaryObject(typedName("LESRegion"))) { volScalarField::Internal::New ( - modelName("LESRegion"), + typedName("LESRegion"), neg(dTilda - y_()) ); } @@ -422,7 +422,7 @@ tmp SpalartAllmarasDES::k() const ( volScalarField::New ( - modelName("k"), + typedName("k"), sqr(this->nut()/ck_/dTildaExtrapolated) ) ); diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H index 7943829e0b..e68c53c5e1 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H @@ -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 @@ -93,8 +93,6 @@ protected: // Protected Member Functions - using IOobject::modelName; - tmp chi() const; tmp fv1(const volScalarField& chi) const; diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index 760cc90203..00d4f025de 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.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 @@ -40,7 +40,7 @@ SpalartAllmarasIDDES::IDDESalpha() const { return volScalarField::Internal::New ( - modelName("alpha"), + typedName("alpha"), max(0.25 - this->y_()/IDDESDelta_.hmax(), scalar(-5)) ); } @@ -55,7 +55,7 @@ SpalartAllmarasIDDES::ft { return volScalarField::Internal::New ( - modelName("ft"), + typedName("ft"), tanh(pow3(sqr(ct_)*rd(this->nut_, magGradU))) ); } @@ -70,7 +70,7 @@ SpalartAllmarasIDDES::fl { return volScalarField::Internal::New ( - modelName("fl"), + typedName("fl"), tanh(pow(sqr(cl_)*rd(this->nu(), magGradU), 10)) ); } @@ -86,7 +86,7 @@ SpalartAllmarasIDDES::rd { return volScalarField::Internal::New ( - modelName("rd"), + typedName("rd"), min ( nur @@ -112,7 +112,7 @@ SpalartAllmarasIDDES::fd { return volScalarField::Internal::New ( - modelName("fd"), + typedName("fd"), 1 - tanh(pow3(8*rd(this->nuEff(), magGradU))) ); } @@ -133,17 +133,17 @@ SpalartAllmarasIDDES::dTilda const volScalarField::Internal expTerm ( - modelName("expTerm"), + typedName("expTerm"), exp(sqr(alpha)) ); - const volScalarField::Internal magGradU(modelName("magGradU"), mag(gradU)); + const volScalarField::Internal magGradU(typedName("magGradU"), mag(gradU)); tmp fHill ( volScalarField::Internal::New ( - modelName("fHill"), + typedName("fHill"), 2*(pos0(alpha)*pow(expTerm, -11.09) + neg(alpha)*pow(expTerm, -9.0)) ) ); @@ -152,14 +152,14 @@ SpalartAllmarasIDDES::dTilda ( volScalarField::Internal::New ( - modelName("fStep"), + typedName("fStep"), min(2*pow(expTerm, -9.0), scalar(1)) ) ); const volScalarField::Internal fHyb ( - modelName("fHyb"), + typedName("fHyb"), max(1 - fd(magGradU), fStep) ); @@ -167,7 +167,7 @@ SpalartAllmarasIDDES::dTilda ( volScalarField::Internal::New ( - modelName("fAmp"), + typedName("fAmp"), 1 - max(ft(magGradU), fl(magGradU)) ) ); @@ -176,7 +176,7 @@ SpalartAllmarasIDDES::dTilda ( volScalarField::Internal::New ( - modelName("fRestore"), + typedName("fRestore"), max(fHill - 1, scalar(0))*fAmp ) ); @@ -184,7 +184,7 @@ SpalartAllmarasIDDES::dTilda // IGNORING ft2 terms const volScalarField::Internal Psi ( - modelName("Psi"), + typedName("Psi"), sqrt ( min @@ -201,7 +201,7 @@ SpalartAllmarasIDDES::dTilda return volScalarField::Internal::New ( - modelName("dTilda"), + typedName("dTilda"), max ( dimensionedScalar(dimLength, small), diff --git a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H index a697a099be..756122ab96 100644 --- a/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H @@ -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 @@ -107,8 +107,6 @@ protected: // Protected Member Functions - using IOobject::modelName; - //- Length scale virtual tmp dTilda ( diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C index d41e80a385..cca4bc2a19 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.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 @@ -259,14 +259,14 @@ void RNGkEpsilon::correct() volScalarField::Internal divU ( - modelName("divU"), + typedName("divU"), fvc::div(fvc::absolute(this->phi(), U))() ); tmp tgradU = fvc::grad(U); volScalarField::Internal S2 ( - modelName("S2"), + typedName("S2"), (tgradU().v() && dev(twoSymm(tgradU().v()))) ); tgradU.clear(); @@ -275,15 +275,15 @@ void RNGkEpsilon::correct() volScalarField::Internal eta ( - modelName("eta"), + typedName("eta"), sqrt(mag(S2))*k_()/epsilon_() ); - volScalarField::Internal eta3(modelName("eta3"), eta*sqr(eta)); + volScalarField::Internal eta3(typedName("eta3"), eta*sqr(eta)); volScalarField::Internal R ( - modelName("R"), + typedName("R"), ((eta*(-eta/eta0_ + scalar(1)))/(beta_*eta3 + scalar(1))) ); diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H index 488e617c70..8c63ea5aaa 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -84,10 +84,6 @@ class RNGkEpsilon : public eddyViscosity> { - // Private Member Functions - - using IOobject::modelName; - protected: diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.C index c2717dfd50..714b9173bd 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -41,7 +41,7 @@ namespace RASModels template tmp SpalartAllmaras::chi() const { - return volScalarField::New(modelName("chi"), nuTilda_/this->nu()); + return volScalarField::New(typedName("chi"), nuTilda_/this->nu()); } @@ -51,8 +51,8 @@ tmp SpalartAllmaras::fv1 const volScalarField& chi ) const { - const volScalarField chi3(modelName("chi3"), pow3(chi)); - return volScalarField::New(modelName("fv1"), chi3/(chi3 + pow3(Cv1_))); + const volScalarField chi3(typedName("chi3"), pow3(chi)); + return volScalarField::New(typedName("fv1"), chi3/(chi3 + pow3(Cv1_))); } @@ -65,7 +65,7 @@ tmp SpalartAllmaras::fv2 { return volScalarField::Internal::New ( - modelName("fv2"), + typedName("fv2"), 1.0 - chi/(1.0 + chi*fv1) ); } @@ -81,13 +81,13 @@ SpalartAllmaras::Stilda { const volScalarField::Internal Omega ( - modelName("Omega"), + typedName("Omega"), ::sqrt(2.0)*mag(skew(fvc::grad(this->U_)().v())) ); return volScalarField::Internal::New ( - modelName("Stilda"), + typedName("Stilda"), ( max ( @@ -108,7 +108,7 @@ tmp SpalartAllmaras::fw { const volScalarField::Internal r ( - modelName("r"), + typedName("r"), min ( nuTilda_() @@ -124,11 +124,11 @@ tmp SpalartAllmaras::fw ) ); - const volScalarField::Internal g(modelName("g"), r + Cw2_*(pow6(r) - r)); + const volScalarField::Internal g(typedName("g"), r + Cw2_*(pow6(r) - r)); return volScalarField::Internal::New ( - modelName("fw"), + typedName("fw"), g*pow((1.0 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0) ); } diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.H index d7aa9ff1a3..3b376fed5b 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -87,10 +87,6 @@ class SpalartAllmaras : public eddyViscosity> { - // Private Member Functions - - using IOobject::modelName; - protected: diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.C index b1ec1d3bae..eb702277f8 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.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 @@ -59,13 +59,13 @@ tmp kOmega2006::beta const volScalarField::Internal ChiOmega ( - modelName("ChiOmega"), + typedName("ChiOmega"), mag((Omega & Omega) && Shat)/pow3(betaStar_*omega_.v()) ); const volScalarField::Internal fBeta ( - modelName("fBeta"), + typedName("fBeta"), (1 + 85*ChiOmega)/(1 + 100*ChiOmega) ); @@ -294,7 +294,7 @@ void kOmega2006::correct() volScalarField::Internal divU ( - modelName("divU"), + typedName("divU"), fvc::div(fvc::absolute(this->phi(), U))().v() ); diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.H index dfec0b83dd..60993847e4 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega2006/kOmega2006.H @@ -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 @@ -81,8 +81,6 @@ class kOmega2006 { // Private Member Functions - using IOobject::modelName; - void correctNut(const volTensorField& gradU); tmp beta(const volTensorField& gradU) const; diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C index 68d3dff326..de83c9cd47 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.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 @@ -88,8 +88,8 @@ template void realizableKE::correctNut() { const volTensorField gradU(fvc::grad(this->U_)); - const volScalarField S2(modelName("S2"), 2*magSqr(dev(symm(gradU)))); - const volScalarField magS(modelName("magS"), sqrt(S2)); + const volScalarField S2(typedName("S2"), 2*magSqr(dev(symm(gradU)))); + const volScalarField magS(typedName("magS"), sqrt(S2)); correctNut(gradU, S2, magS); } @@ -267,21 +267,21 @@ void realizableKE::correct() volScalarField::Internal divU ( - modelName("divU"), + typedName("divU"), fvc::div(fvc::absolute(this->phi(), U))() ); const volTensorField gradU(fvc::grad(U)); - const volScalarField S2(modelName("S2"), 2*magSqr(dev(symm(gradU)))); - const volScalarField magS(modelName("magS"), sqrt(S2)); + const volScalarField S2(typedName("S2"), 2*magSqr(dev(symm(gradU)))); + const volScalarField magS(typedName("magS"), sqrt(S2)); const volScalarField::Internal eta ( - modelName("eta"), magS()*k_()/epsilon_() + typedName("eta"), magS()*k_()/epsilon_() ); const volScalarField::Internal C1 ( - modelName("C1"), + typedName("C1"), max(eta/(scalar(5) + eta), scalar(0.43)) ); diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H index 599c79b742..9e748c71cb 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H @@ -79,10 +79,6 @@ class realizableKE : public eddyViscosity> { - // Private Member Functions - - using IOobject::modelName; - protected: diff --git a/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C index 9a5ac02ffa..151e0fc44b 100644 --- a/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.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 @@ -301,16 +301,16 @@ void v2f::correct() const volScalarField G(this->GName(), nut*S2); const volScalarField Ts(this->Ts()); - const volScalarField L2(type() + ":L2", sqr(Ls())); + const volScalarField L2(typedName("L2"), sqr(Ls())); const volScalarField v2fAlpha ( - type() + ":alpha", + typedName("alpha"), 1.0/Ts*((C1_ - N)*v2_ - 2.0/3.0*k_*(C1_ - 1.0)) ); const volScalarField Ceps1 ( - "Ceps1", + typedName("Ceps1"), 1.4*(1.0 + 0.05*min(sqrt(k_/v2_), scalar(100.0))) ); diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateFunction/strainRateFunction.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateFunction/strainRateFunction.C index 3477f685fa..cba3618e8d 100644 --- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateFunction/strainRateFunction.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateFunction/strainRateFunction.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 @@ -107,7 +107,7 @@ nu ( volScalarField::New ( - IOobject::groupName(type() + ":nu", nu0.group()), + IOobject::groupName(typedName("nu"), nu0.group()), nu0.mesh(), dimensionedScalar(dimViscosity, 0) ) diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateViscosityModel/strainRateViscosityModel.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateViscosityModel/strainRateViscosityModel.C index 51e546b32f..7d4d79fbb4 100644 --- a/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateViscosityModel/strainRateViscosityModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalisedNewtonian/generalisedNewtonianViscosityModels/strainRateViscosityModels/strainRateViscosityModel/strainRateViscosityModel.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 @@ -67,7 +67,7 @@ strainRateViscosityModel::strainRateViscosityModel ( IOobject::groupName ( - IOobject::modelName("nu", typeName), + typedName("nu"), U.group() ), U.time().timeName(), diff --git a/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C b/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C index 91de00055f..7673e711e3 100644 --- a/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/lambdaThixotropic/lambdaThixotropic.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 @@ -73,7 +73,7 @@ lambdaThixotropic::lambdaThixotropic ( IOobject::groupName ( - IOobject::modelName("lambda", typeName), + typedName("lambda"), alphaRhoPhi.group() ), this->runTime_.timeName(), @@ -90,7 +90,7 @@ lambdaThixotropic::lambdaThixotropic ( IOobject::groupName ( - IOobject::modelName("nu", typeName), + typedName("nu"), alphaRhoPhi.group() ), this->runTime_.timeName(), diff --git a/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H index 42817d2ced..c8506bb513 100644 --- a/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H @@ -142,7 +142,7 @@ public: //- Helper function to return the name of the turbulence G field inline word GName() const { - return modelName("G"); + return typedName("G"); } //- Access function to velocity field diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H index 9768f97deb..76f9ef4b76 100644 --- a/src/OpenFOAM/db/IOobject/IOobject.H +++ b/src/OpenFOAM/db/IOobject/IOobject.H @@ -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 @@ -224,11 +224,6 @@ public: //- Return member (name without the extension) static word member(const word& name); - //- Return the name of the object within the given model - // as : - template - static inline word modelName(Name name, const word& model); - //- Type of file modification checking static fileCheckTypes fileModificationChecking; @@ -393,10 +388,6 @@ public: //- Return member (name without the extension) word member() const; - //- Return the name of the object within this model - // as : - inline word modelName(const char* name) const; - const fileName& rootPath() const; const fileName& caseName(const bool global) const; diff --git a/src/OpenFOAM/db/IOobject/IOobjectI.H b/src/OpenFOAM/db/IOobject/IOobjectI.H index 765b7974c8..ac1fc73b79 100644 --- a/src/OpenFOAM/db/IOobject/IOobjectI.H +++ b/src/OpenFOAM/db/IOobject/IOobjectI.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,26 +41,6 @@ inline Foam::word Foam::IOobject::groupName(Name name, const word& group) } -template -inline Foam::word Foam::IOobject::modelName(Name name, const word& model) -{ - if (model != word::null) - { - return (model + ':') + name; - } - else - { - return name; - } -} - - -inline Foam::word Foam::IOobject::modelName(const char* name) const -{ - return type() + ':' + name; -} - - template inline Stream& Foam::IOobject::writeBanner(Stream& os, bool noHint) { diff --git a/src/OpenFOAM/db/typeInfo/typeInfo.H b/src/OpenFOAM/db/typeInfo/typeInfo.H index f3f7b2b13a..59247bec34 100644 --- a/src/OpenFOAM/db/typeInfo/typeInfo.H +++ b/src/OpenFOAM/db/typeInfo/typeInfo.H @@ -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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,12 +64,16 @@ Description //- Declare a ClassNameNoDebug() with extra virtual type info #define TypeNameNoDebug(TypeNameString) \ ClassNameNoDebug(TypeNameString); \ - virtual const word& type() const { return typeName; } + virtual const word& type() const { return typeName; } \ + template \ + word typedName(Name name) const { return (typeName + ':') + name; } //- Declare a ClassName() with extra virtual type info #define TypeName(TypeNameString) \ ClassName(TypeNameString); \ - virtual const word& type() const { return typeName; } + virtual const word& type() const { return typeName; } \ + template \ + word typedName(Name name) const { return (typeName + ':') + name; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -138,6 +142,15 @@ inline bool isA(const Type& t) } +//- Return the name of the object within the given type +// as : +template +inline word typedName(Name name) +{ + return (TypeName::typeName + ':') + name; +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/combustionModels/EDC/EDC.C b/src/combustionModels/EDC/EDC.C index fcaa891398..f41f11bacb 100644 --- a/src/combustionModels/EDC/EDC.C +++ b/src/combustionModels/EDC/EDC.C @@ -80,7 +80,7 @@ Foam::combustionModels::EDC::EDC ( IOobject ( - this->thermo().phasePropertyName(typeName + ":kappa"), + this->thermo().phasePropertyName(typedName("kappa")), this->mesh().time().timeName(), this->mesh(), IOobject::NO_READ, @@ -216,7 +216,7 @@ Foam::combustionModels::EDC::Qdot() const { return volScalarField::New ( - this->thermo().phasePropertyName(typeName + ":Qdot"), + this->thermo().phasePropertyName(typedName("Qdot")), kappa_*chemistryPtr_->Qdot() ); } diff --git a/src/combustionModels/PaSR/PaSR.C b/src/combustionModels/PaSR/PaSR.C index d85db7e71a..58a5b31e21 100644 --- a/src/combustionModels/PaSR/PaSR.C +++ b/src/combustionModels/PaSR/PaSR.C @@ -54,7 +54,7 @@ Foam::combustionModels::PaSR::PaSR ( IOobject ( - thermo.phasePropertyName(typeName + ":kappa"), + thermo.phasePropertyName(typedName("kappa")), this->mesh().time().timeName(), this->mesh(), IOobject::NO_READ, @@ -116,7 +116,7 @@ Foam::combustionModels::PaSR::Qdot() const { return volScalarField::New ( - this->thermo().phasePropertyName(typeName + ":Qdot"), + this->thermo().phasePropertyName(typedName("Qdot")), kappa_*laminar::Qdot() ); } diff --git a/src/combustionModels/noCombustion/noCombustion.C b/src/combustionModels/noCombustion/noCombustion.C index 0208c7aa17..6158ccb178 100644 --- a/src/combustionModels/noCombustion/noCombustion.C +++ b/src/combustionModels/noCombustion/noCombustion.C @@ -79,7 +79,7 @@ Foam::combustionModels::noCombustion::Qdot() const { return volScalarField::New ( - this->thermo().phasePropertyName(typeName + ":Qdot"), + this->thermo().phasePropertyName(typedName("Qdot")), this->mesh(), dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); diff --git a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C index 55fed717b2..f39a343929 100644 --- a/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C +++ b/src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.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 @@ -139,7 +139,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData() ( IOobject ( - typeName + ":D", + typedName("D"), mesh_.time().timeName(), mesh_, IOobject::NO_READ, @@ -152,7 +152,7 @@ void Foam::porosityModels::DarcyForchheimer::calcTransformModelData() ( IOobject ( - typeName + ":F", + typedName("F"), mesh_.time().timeName(), mesh_, IOobject::NO_READ, diff --git a/src/fvModels/derived/damping/damping/damping.C b/src/fvModels/derived/damping/damping/damping.C index b67043acec..80ab93452e 100644 --- a/src/fvModels/derived/damping/damping/damping.C +++ b/src/fvModels/derived/damping/damping/damping.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -126,7 +126,7 @@ Foam::tmp Foam::fv::damping::forceCoeff() const ( IOobject ( - type() + ":forceCoeff", + typedName("forceCoeff"), mesh().time().timeName(), mesh() ), @@ -152,7 +152,7 @@ Foam::tmp Foam::fv::damping::forceCoeff() const ( IOobject ( - type() + ":forceCoeff", + typedName("forceCoeff"), mesh().time().timeName(), mesh() ), diff --git a/src/fvModels/derived/heatTransfer/heatTransferModels/constant/constant.C b/src/fvModels/derived/heatTransfer/heatTransferModels/constant/constant.C index 0e68770c1c..2eeeedf24e 100644 --- a/src/fvModels/derived/heatTransfer/heatTransferModels/constant/constant.C +++ b/src/fvModels/derived/heatTransfer/heatTransferModels/constant/constant.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 @@ -122,7 +122,7 @@ Foam::fv::heatTransferModels::constant::htc() const { if (!htcPtr_.valid()) { - return volScalarField::New(type() + ":htc", mesh(), htc_); + return volScalarField::New(typedName("htc"), mesh(), htc_); } else { diff --git a/src/fvModels/derived/heatTransfer/heatTransferModels/function1/function1.C b/src/fvModels/derived/heatTransfer/heatTransferModels/function1/function1.C index 2460d9c478..b943e716b6 100644 --- a/src/fvModels/derived/heatTransfer/heatTransferModels/function1/function1.C +++ b/src/fvModels/derived/heatTransfer/heatTransferModels/function1/function1.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 @@ -94,7 +94,7 @@ Foam::fv::heatTransferModels::function1::htc() const tmp tHtc = volScalarField::New ( - type() + ":htc", + typedName("htc"), mesh(), dimPower/dimTemperature/dimArea, zeroGradientFvPatchScalarField::typeName diff --git a/src/fvModels/derived/heatTransfer/heatTransferModels/function2/function2.C b/src/fvModels/derived/heatTransfer/heatTransferModels/function2/function2.C index d6b797a16b..1eacf9a34e 100644 --- a/src/fvModels/derived/heatTransfer/heatTransferModels/function2/function2.C +++ b/src/fvModels/derived/heatTransfer/heatTransferModels/function2/function2.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 @@ -70,7 +70,7 @@ Foam::fv::heatTransferModels::function2::function2 ( IOobject ( - type() + ":htc", + typedName("htc"), model.mesh().time().timeName(), model.mesh(), IOobject::NO_READ, diff --git a/src/fvModels/derived/heatTransfer/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/fvModels/derived/heatTransfer/heatTransferModels/heatTransferModel/heatTransferModel.C index e8f655b297..816fd219f0 100644 --- a/src/fvModels/derived/heatTransfer/heatTransferModels/heatTransferModel/heatTransferModel.C +++ b/src/fvModels/derived/heatTransfer/heatTransferModels/heatTransferModel/heatTransferModel.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 @@ -169,7 +169,7 @@ Foam::tmp Foam::fv::heatTransferModel::AoV() const { if (!AoVPtr_.valid()) { - return volScalarField::New(type() + ":AoV", mesh_, AoV_); + return volScalarField::New(typedName("AoV"), mesh_, AoV_); } else { diff --git a/src/fvModels/derived/heatTransfer/heatTransferModels/variable/variable.C b/src/fvModels/derived/heatTransfer/heatTransferModels/variable/variable.C index edeb0336e1..0405835257 100644 --- a/src/fvModels/derived/heatTransfer/heatTransferModels/variable/variable.C +++ b/src/fvModels/derived/heatTransfer/heatTransferModels/variable/variable.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 @@ -77,7 +77,7 @@ Foam::fv::heatTransferModels::variable::variable ( IOobject ( - type() + ":htc", + typedName("htc"), mesh.time().timeName(), mesh, IOobject::NO_READ, diff --git a/src/lagrangian/parcel/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C b/src/lagrangian/parcel/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C index 5879bf0301..519d36cc91 100644 --- a/src/lagrangian/parcel/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.C +++ b/src/lagrangian/parcel/submodels/ReactingMultiphase/StochasticCollision/SuppressionCollision/SuppressionCollision.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,7 +42,7 @@ void Foam::SuppressionCollision::collide volScalarField vDotSweep(sc.vDotSweep()); dimensionedScalar Dt("dt", dimTime, dt); - volScalarField P(type() + ":p", 1.0 - exp(-vDotSweep*Dt)); + volScalarField P(typedName("p"), 1.0 - exp(-vDotSweep*Dt)); forAllIter(typename CloudType, this->owner(), iter) { diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C index 03d6500136..0263d4c6dd 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C @@ -158,7 +158,7 @@ tmp kinematicSingleLayer::pe() return volScalarField::New ( - IOobject::modelName("pe", typeName), + typedName("pe"), p_ // Pressure (mapped from primary region) - tpSp // Accumulated particle impingement ); @@ -872,7 +872,7 @@ tmp kinematicSingleLayer::sigma() const ( volScalarField::New ( - type() + ":sigma", + typedName("sigma"), regionMesh(), dimensionedScalar(dimMass/sqr(dimTime), 0), extrapolatedCalculatedFvPatchScalarField::typeName @@ -1086,7 +1086,7 @@ tmp kinematicSingleLayer::SYi { return volScalarField::Internal::New ( - IOobject::modelName("SY(" + Foam::name(i) + ")", typeName), + typedName("SY(" + Foam::name(i) + ")"), primaryMesh(), dimensionedScalar(dimMass/dimVolume/dimTime, 0) ); @@ -1099,7 +1099,7 @@ tmp kinematicSingleLayer::SU() const ( volVectorField::Internal::New ( - IOobject::modelName("SU", typeName), + typedName("SU"), primaryMesh(), dimensionedVector(dimDensity*dimVelocity/dimTime, Zero) ) @@ -1135,7 +1135,7 @@ tmp kinematicSingleLayer::Sh() const { return volScalarField::Internal::New ( - IOobject::modelName("Sh", typeName), + typedName("Sh"), primaryMesh(), dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.C index 4b37dd33fb..926602d8c0 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmMomentumTransportModel/laminar/laminar.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 @@ -75,7 +75,7 @@ tmp laminar::Us() const ( volVectorField::Internal::New ( - IOobject::modelName("Us", typeName), + typedName("Us"), 1.5*filmModel_.U() ) ); diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.C index baf6b5c730..619e8f193c 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/thixotropic/thixotropicViscosity.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 @@ -81,7 +81,7 @@ thixotropicViscosity::thixotropicViscosity ( IOobject ( - IOobject::modelName("lambda", typeName), + typedName("lambda"), film.regionMesh().time().timeName(), film.regionMesh(), IOobject::MUST_READ, diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.C index cf9d799e73..1753b29ec3 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmViscosityModel/waxSolvent/waxSolventViscosity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ void waxSolventViscosity::correctMu() ( film.regionMesh().lookupObject ( - IOobject::modelName("Wwax", waxSolventEvaporation::typeName) + Foam::typedName("Wwax") ) ); @@ -67,7 +67,7 @@ void waxSolventViscosity::correctMu() ( film.regionMesh().lookupObject ( - IOobject::modelName("Wsolvent", waxSolventEvaporation::typeName) + Foam::typedName("Wsolvent") ) ); @@ -75,7 +75,7 @@ void waxSolventViscosity::correctMu() ( film.regionMesh().lookupObject ( - IOobject::modelName("Ysolvent0", waxSolventEvaporation::typeName) + Foam::typedName("Ysolvent0") ) ); @@ -83,7 +83,7 @@ void waxSolventViscosity::correctMu() ( film.regionMesh().lookupObject ( - IOobject::modelName("Ysolvent", waxSolventEvaporation::typeName) + Foam::typedName("Ysolvent") ) ); @@ -116,7 +116,7 @@ waxSolventViscosity::waxSolventViscosity ( IOobject ( - IOobject::modelName("muWax", typeName), + typedName("muWax"), film.regionMesh().time().timeName(), film.regionMesh(), IOobject::NO_READ, @@ -139,7 +139,7 @@ waxSolventViscosity::waxSolventViscosity ( IOobject ( - IOobject::modelName("muSolvent", typeName), + typedName("muSolvent"), film.regionMesh().time().timeName(), film.regionMesh(), IOobject::NO_READ, diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C index 95a9ff5c87..7507a8a4d4 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.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 @@ contactAngleForce::contactAngleForce ( IOobject ( - IOobject::modelName("contactForceMask", typeName), + typedName("contactForceMask"), filmModel_.time().timeName(), filmModel_.regionMesh(), IOobject::NO_READ, @@ -133,7 +133,7 @@ tmp contactAngleForce::correct(volVectorField& U) ( volVectorField::New ( - IOobject::modelName("contactForce", typeName), + typedName("contactForce"), filmModel_.regionMesh(), dimensionedVector(dimForce/dimVolume, Zero) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C index ca373734d0..2f47be1e39 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,7 +63,7 @@ distributionContactAngleForce::distributionContactAngleForce ( volScalarField::New ( - IOobject::modelName("theta", typeName), + typedName("theta"), filmModel_.regionMesh(), dimensionedScalar(dimless, 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C index 588c4f44ac..de3059a2b8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,7 +86,7 @@ perturbedTemperatureDependentContactAngleForce::theta() const ( volScalarField::New ( - IOobject::modelName("theta", typeName), + typedName("theta"), filmModel_.regionMesh(), dimensionedScalar(dimless, 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C index 0205f1f194..6ba2b889cf 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,7 @@ tmp temperatureDependentContactAngleForce::theta() const ( volScalarField::New ( - IOobject::modelName("theta", typeName), + typedName("theta"), filmModel_.regionMesh(), dimensionedScalar(dimless, 0) ) diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C index 09ca294e45..f9e7854662 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C @@ -59,7 +59,7 @@ constantRadiation::constantRadiation ( IOobject ( - IOobject::modelName("qrConst", typeName), + typedName("qrConst"), film.time().timeName(), film.regionMesh(), IOobject::MUST_READ, @@ -71,7 +71,7 @@ constantRadiation::constantRadiation ( IOobject ( - IOobject::modelName("mask", typeName), + typedName("mask"), film.time().timeName(), film.regionMesh(), IOobject::READ_IF_PRESENT, @@ -108,7 +108,7 @@ tmp constantRadiation::Shs() { return volScalarField::Internal::New ( - IOobject::modelName("Shs", typeName), + typedName("Shs"), mask_*qrConst_*filmModel_.coverage()*absorptivity_ ); } @@ -116,7 +116,7 @@ tmp constantRadiation::Shs() { return volScalarField::Internal::New ( - IOobject::modelName("Shs", typeName), + typedName("Shs"), film().regionMesh(), dimensionedScalar(dimMass/pow3(dimTime), 0) ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C index 47ffd33399..5ffcd00ab8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ tmp noRadiation::Shs() { return volScalarField::Internal::New ( - IOobject::modelName("Shs", typeName), + typedName("Shs"), film().regionMesh(), dimensionedScalar(dimMass/pow3(dimTime), 0) ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C index de740c1e6f..713ea411f6 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.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 @@ -97,7 +97,7 @@ tmp primaryRadiation::Shs() { return volScalarField::Internal::New ( - IOobject::modelName("Shs", typeName), + typedName("Shs"), qinFilm_*filmModel_.coverage() ); } diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C index a6279d2d01..bae4efee9a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.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-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,7 @@ tmp standardRadiation::Shs() { return volScalarField::Internal::New ( - IOobject::modelName("Shs", typeName), + typedName("Shs"), beta_*qinFilm_*filmModel_.coverage() *(1 - exp(-kappaBar_*filmModel_.delta()())) ); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C index 2829978c5c..8db81b13e5 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/solidification/solidification.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 @@ -75,7 +75,7 @@ solidification::solidification ( IOobject ( - IOobject::modelName("mass", typeName), + typedName("mass"), film.regionMesh().time().timeName(), film.regionMesh(), IOobject::READ_IF_PRESENT, @@ -88,7 +88,7 @@ solidification::solidification ( IOobject ( - IOobject::modelName("thickness", typeName), + typedName("thickness"), film.regionMesh().time().timeName(), film.regionMesh(), IOobject::NO_READ, diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C index 9898fd8cb5..a70b121877 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C @@ -87,7 +87,7 @@ waxSolventEvaporation::waxSolventEvaporation ( IOobject ( - IOobject::modelName("Wwax", typeName), + typedName("Wwax"), film.regionMesh().time().constant(), film.regionMesh() ), @@ -97,7 +97,7 @@ waxSolventEvaporation::waxSolventEvaporation ( IOobject ( - IOobject::modelName("Wsolvent", typeName), + typedName("Wsolvent"), film.regionMesh().time().constant(), film.regionMesh() ), @@ -107,7 +107,7 @@ waxSolventEvaporation::waxSolventEvaporation ( IOobject ( - IOobject::modelName("Ysolvent0", typeName), + typedName("Ysolvent0"), film.regionMesh().time().constant(), film.regionMesh(), IOobject::MUST_READ, @@ -118,7 +118,7 @@ waxSolventEvaporation::waxSolventEvaporation ( IOobject ( - IOobject::modelName("Ysolvent", typeName), + typedName("Ysolvent"), film.regionMesh().time().timeName(), film.regionMesh(), IOobject::MUST_READ, @@ -195,7 +195,7 @@ void waxSolventEvaporation::correctModel ( IOobject ( - IOobject::modelName("evapRateCoeff", typeName), + typedName("evapRateCoeff"), film.regionMesh().time().timeName(), film.regionMesh(), IOobject::NO_READ, @@ -210,7 +210,7 @@ void waxSolventEvaporation::correctModel ( IOobject ( - IOobject::modelName("evapRateInf", typeName), + typedName("evapRateInf"), film.regionMesh().time().timeName(), film.regionMesh(), IOobject::NO_READ, diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C index eaf5b4d721..75fd5bcb06 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C @@ -597,7 +597,7 @@ tmp thermoSingleLayer::SYi ( volScalarField::Internal::New ( - IOobject::modelName("SY(" + Foam::name(i) + ")", typeName), + typedName("SY(" + Foam::name(i) + ")"), primaryMesh(), dimensionedScalar(dimMass/dimVolume/dimTime, 0) ) @@ -639,7 +639,7 @@ tmp thermoSingleLayer::Sh() const ( volScalarField::Internal::New ( - IOobject::modelName("Sh", typeName), + typedName("Sh"), primaryMesh(), dimensionedScalar(dimEnergy/dimVolume/dimTime, 0) ) diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C index 560fdc3c02..e3af2c127d 100644 --- a/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C +++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C @@ -115,7 +115,7 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver ( IOobject ( - "rigidBodyMotionSolver:meshSolver", + typedName("meshSolver"), mesh.time().constant(), mesh ), diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C index 4389881b48..34c088be54 100644 --- a/src/sampling/meshToMesh/meshToMeshTemplates.C +++ b/src/sampling/meshToMesh/meshToMeshTemplates.C @@ -408,7 +408,7 @@ Foam::meshToMesh::mapSrcToTgt ( IOobject ( - type() + ":interpolate(" + field.name() + ")", + typedName("interpolate(" + field.name() + ")"), tgtMesh.time().timeName(), tgtMesh, IOobject::NO_READ, @@ -588,7 +588,7 @@ Foam::meshToMesh::mapTgtToSrc ( IOobject ( - type() + ":interpolate(" + field.name() + ")", + typedName("interpolate(" + field.name() + ")"), srcMesh.time().timeName(), srcMesh, IOobject::NO_READ, diff --git a/src/twoPhaseModels/interfaceProperties/interfaceProperties.C b/src/twoPhaseModels/interfaceProperties/interfaceProperties.C index 67f27d7a24..cda31a11df 100644 --- a/src/twoPhaseModels/interfaceProperties/interfaceProperties.C +++ b/src/twoPhaseModels/interfaceProperties/interfaceProperties.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 @@ -191,7 +191,7 @@ Foam::interfaceProperties::interfaceProperties ( IOobject ( - "interfaceProperties:K", + typedName("interfaceProperties"), alpha1_.time().timeName(), alpha1_.mesh() ),