typeInfo: Added typedName functions to supersede the modelName function in IOobject

The typedName functions prepend the typeName to the object/field name to make a
unique name within the context of model or type.

Within a type which includes a typeName the typedName function can be called
with just the name of the object, e.g. within the kEpsilon model

    typeName("G")

generates the name

    kEpsilon:G

To create a typed name within another context the type name can be obtained from
the type specified in the function instantiation, e.g.

    Foam::typedName<viscosityModel>("nu")

generates the name

    viscosityModel:nu

This supersedes the modelName functionality provided in IOobject which could
only be used for IOobjects which provide the typeName, whereas typedName can be
used for any type providing a typeName.

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<frictionalStressModel>("nu"),
             phase.group()
         ),
         dimensionedScalar(dimTime, 0.5)*pf*sin(phi_)

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<frictionalStressModel>("nu"),
                 phase.group()
             ),
             phase.mesh(),

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<frictionalStressModel>("nu"),
                 phase.group()
             ),
             phase.mesh(),

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<viscosityModel>("nu"),
             Theta.group()
         ),
         da*sqrt(Theta)

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<viscosityModel>("nu"),
             Theta.group()
         ),
         da*sqrt(Theta)*

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<viscosityModel>("nu"),
             Theta.group()
         ),
         da*sqrt(Theta)

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::volScalarField> Foam::kineticTheoryModels::noneViscosity::nu
     (
         IOobject::groupName
         (
-            IOobject::modelName("nu", viscosityModel::typeName),
+            Foam::typedName<viscosityModel>("nu"),
             Theta.group()
         ),
         alpha1.mesh(),

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()
         ),

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()
         ),

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()
         ),

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()
         ),

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()
         ),

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()
         ),

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()
                 ),

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(),

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<BasicMomentumTransportModel>::rd
 {
     return volScalarField::Internal::New
     (
-        modelName("rd"),
+        typedName("rd"),
         min
         (
             this->nuEff()()
@@ -70,7 +70,7 @@ SpalartAllmarasDDES<BasicMomentumTransportModel>::fd
 {
     return volScalarField::Internal::New
     (
-        modelName("fd"),
+        typedName("fd"),
         1 - tanh(pow3(8*rd(magGradU)))
     );
 }
@@ -89,7 +89,7 @@ SpalartAllmarasDDES<BasicMomentumTransportModel>::dTilda
 {
     return volScalarField::Internal::New
     (
-        modelName("dTilda"),
+        typedName("dTilda"),
         max
         (
             this->y_

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<volScalarField::Internal> dTilda
         (

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<volScalarField> SpalartAllmarasDES<BasicMomentumTransportModel>::chi() const
 {
     return volScalarField::New
     (
-        modelName("chi"),
+        typedName("chi"),
         nuTilda_/this->nu()
     );
 }
@@ -56,7 +56,7 @@ tmp<volScalarField> SpalartAllmarasDES<BasicMomentumTransportModel>::fv1
     const volScalarField chi3("chi3", pow3(chi));
     return volScalarField::New
     (
-        modelName("fv1"),
+        typedName("fv1"),
         chi3/(chi3 + pow3(Cv1_))
     );
 }
@@ -72,7 +72,7 @@ SpalartAllmarasDES<BasicMomentumTransportModel>::fv2
 {
     return volScalarField::Internal::New
     (
-        modelName("fv2"),
+        typedName("fv2"),
         1.0 - chi/(1.0 + chi*fv1)
     );
 }
@@ -87,7 +87,7 @@ SpalartAllmarasDES<BasicMomentumTransportModel>::Omega
 {
     return volScalarField::Internal::New
     (
-        modelName("Omega"),
+        typedName("Omega"),
         sqrt(2.0)*mag(skew(gradU))
     );
 }
@@ -105,7 +105,7 @@ SpalartAllmarasDES<BasicMomentumTransportModel>::Stilda
 {
     return volScalarField::Internal::New
     (
-        modelName("Stilda"),
+        typedName("Stilda"),
         max
         (
             Omega
@@ -126,7 +126,7 @@ tmp<volScalarField::Internal> SpalartAllmarasDES<BasicMomentumTransportModel>::r
 {
     return volScalarField::Internal::New
     (
-        modelName("r"),
+        typedName("r"),
         min
         (
             nur
@@ -153,11 +153,11 @@ SpalartAllmarasDES<BasicMomentumTransportModel>::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<BasicMomentumTransportModel>::dTilda
 {
     return volScalarField::Internal::New
     (
-        modelName("dTilda"),
+        typedName("dTilda"),
         min(CDES_*this->delta()(), y_)
     );
 }
@@ -186,11 +186,11 @@ void SpalartAllmarasDES<BasicMomentumTransportModel>::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<volScalarField> SpalartAllmarasDES<BasicMomentumTransportModel>::k() const
     (
         volScalarField::New
         (
-            modelName("k"),
+            typedName("k"),
             sqr(this->nut()/ck_/dTildaExtrapolated)
         )
     );

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<volScalarField> chi() const;
 
         tmp<volScalarField> fv1(const volScalarField& chi) const;

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<BasicMomentumTransportModel>::IDDESalpha() const
 {
     return volScalarField::Internal::New
     (
-        modelName("alpha"),
+        typedName("alpha"),
         max(0.25 - this->y_()/IDDESDelta_.hmax(), scalar(-5))
     );
 }
@@ -55,7 +55,7 @@ SpalartAllmarasIDDES<BasicMomentumTransportModel>::ft
 {
     return volScalarField::Internal::New
     (
-        modelName("ft"),
+        typedName("ft"),
         tanh(pow3(sqr(ct_)*rd(this->nut_, magGradU)))
     );
 }
@@ -70,7 +70,7 @@ SpalartAllmarasIDDES<BasicMomentumTransportModel>::fl
 {
     return volScalarField::Internal::New
     (
-        modelName("fl"),
+        typedName("fl"),
         tanh(pow(sqr(cl_)*rd(this->nu(), magGradU), 10))
     );
 }
@@ -86,7 +86,7 @@ SpalartAllmarasIDDES<BasicMomentumTransportModel>::rd
 {
     return volScalarField::Internal::New
     (
-        modelName("rd"),
+        typedName("rd"),
         min
         (
             nur
@@ -112,7 +112,7 @@ SpalartAllmarasIDDES<BasicMomentumTransportModel>::fd
 {
     return volScalarField::Internal::New
     (
-        modelName("fd"),
+        typedName("fd"),
         1 - tanh(pow3(8*rd(this->nuEff(), magGradU)))
     );
 }
@@ -133,17 +133,17 @@ SpalartAllmarasIDDES<BasicMomentumTransportModel>::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<volScalarField::Internal> 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<BasicMomentumTransportModel>::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<BasicMomentumTransportModel>::dTilda
     (
         volScalarField::Internal::New
         (
-            modelName("fAmp"),
+            typedName("fAmp"),
             1 - max(ft(magGradU), fl(magGradU))
         )
     );
@@ -176,7 +176,7 @@ SpalartAllmarasIDDES<BasicMomentumTransportModel>::dTilda
     (
         volScalarField::Internal::New
         (
-            modelName("fRestore"),
+            typedName("fRestore"),
             max(fHill - 1, scalar(0))*fAmp
         )
     );
@@ -184,7 +184,7 @@ SpalartAllmarasIDDES<BasicMomentumTransportModel>::dTilda
     // IGNORING ft2 terms
     const volScalarField::Internal Psi
     (
-        modelName("Psi"),
+        typedName("Psi"),
         sqrt
         (
             min
@@ -201,7 +201,7 @@ SpalartAllmarasIDDES<BasicMomentumTransportModel>::dTilda
 
     return volScalarField::Internal::New
     (
-        modelName("dTilda"),
+        typedName("dTilda"),
         max
         (
             dimensionedScalar(dimLength, small),

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<volScalarField::Internal> dTilda
         (

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<BasicMomentumTransportModel>::correct()
 
     volScalarField::Internal divU
     (
-        modelName("divU"),
+        typedName("divU"),
         fvc::div(fvc::absolute(this->phi(), U))()
     );
 
     tmp<volTensorField> 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<BasicMomentumTransportModel>::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)))
     );
 

src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H

@@ -84,10 +84,6 @@ class RNGkEpsilon
 :
     public eddyViscosity<RASModel<BasicMomentumTransportModel>>
 {
-    // Private Member Functions
-
-        using IOobject::modelName;
-
 
 protected:
 

src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.C

@@ -41,7 +41,7 @@ namespace RASModels
 template<class BasicMomentumTransportModel>
 tmp<volScalarField> SpalartAllmaras<BasicMomentumTransportModel>::chi() const
 {
-    return volScalarField::New(modelName("chi"), nuTilda_/this->nu());
+    return volScalarField::New(typedName("chi"), nuTilda_/this->nu());
 }
 
 
@@ -51,8 +51,8 @@ tmp<volScalarField> SpalartAllmaras<BasicMomentumTransportModel>::fv1
     const volScalarField& chi
 ) const
 {
-    const volScalarField chi3(modelName("chi3"), pow3(chi));
+    const volScalarField chi3(typedName("chi3"), pow3(chi));
-    return volScalarField::New(modelName("fv1"), chi3/(chi3 + pow3(Cv1_)));
+    return volScalarField::New(typedName("fv1"), chi3/(chi3 + pow3(Cv1_)));
 }
 
 
@@ -65,7 +65,7 @@ tmp<volScalarField::Internal> SpalartAllmaras<BasicMomentumTransportModel>::fv2
 {
     return volScalarField::Internal::New
     (
-        modelName("fv2"),
+        typedName("fv2"),
         1.0 - chi/(1.0 + chi*fv1)
     );
 }
@@ -81,13 +81,13 @@ SpalartAllmaras<BasicMomentumTransportModel>::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<volScalarField::Internal> SpalartAllmaras<BasicMomentumTransportModel>::fw
 {
     const volScalarField::Internal r
     (
-        modelName("r"),
+        typedName("r"),
         min
         (
             nuTilda_()
@@ -124,11 +124,11 @@ tmp<volScalarField::Internal> SpalartAllmaras<BasicMomentumTransportModel>::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)
     );
 }

src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.H

@@ -87,10 +87,6 @@ class SpalartAllmaras
 :
     public eddyViscosity<RASModel<BasicMomentumTransportModel>>
 {
-    // Private Member Functions
-
-        using IOobject::modelName;
-
 
 protected:
 

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<volScalarField::Internal> kOmega2006<BasicMomentumTransportModel>::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<BasicMomentumTransportModel>::correct()
 
     volScalarField::Internal divU
     (
-        modelName("divU"),
+        typedName("divU"),
         fvc::div(fvc::absolute(this->phi(), U))().v()
     );
 

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<volScalarField::Internal> beta(const volTensorField& gradU) const;

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<class BasicMomentumTransportModel>
 void realizableKE<BasicMomentumTransportModel>::correctNut()
 {
     const volTensorField gradU(fvc::grad(this->U_));
-    const volScalarField S2(modelName("S2"), 2*magSqr(dev(symm(gradU))));
+    const volScalarField S2(typedName("S2"), 2*magSqr(dev(symm(gradU))));
-    const volScalarField magS(modelName("magS"), sqrt(S2));
+    const volScalarField magS(typedName("magS"), sqrt(S2));
 
     correctNut(gradU, S2, magS);
 }
@@ -267,21 +267,21 @@ void realizableKE<BasicMomentumTransportModel>::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 S2(typedName("S2"), 2*magSqr(dev(symm(gradU))));
-    const volScalarField magS(modelName("magS"), sqrt(S2));
+    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))
     );
 

src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H

@@ -79,10 +79,6 @@ class realizableKE
 :
     public eddyViscosity<RASModel<BasicMomentumTransportModel>>
 {
-    // Private Member Functions
-
-        using IOobject::modelName;
-
 
 protected:
 

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<BasicMomentumTransportModel>::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)))
     );
 

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)
         )

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(),

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<BasicMomentumTransportModel>::lambdaThixotropic
         (
             IOobject::groupName
             (
-                IOobject::modelName("lambda", typeName),
+                typedName("lambda"),
                 alphaRhoPhi.group()
             ),
             this->runTime_.timeName(),
@@ -90,7 +90,7 @@ lambdaThixotropic<BasicMomentumTransportModel>::lambdaThixotropic
         (
             IOobject::groupName
             (
-                IOobject::modelName("nu", typeName),
+                typedName("nu"),
                 alphaRhoPhi.group()
             ),
             this->runTime_.timeName(),

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

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 <model>:<name>
-        template<class Name>
-        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 <model>:<name>
-            inline word modelName(const char* name) const;
-
             const fileName& rootPath() const;
 
             const fileName& caseName(const bool global) const;

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<class Name>
-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<class Stream>
 inline Stream& Foam::IOobject::writeBanner(Stream& os, bool noHint)
 {

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<class Name>                                                       \
+    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<class Name>                                                       \
+    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 <typeName>:<name>
+template<class TypeName, class Name>
+inline word typedName(Name name)
+{
+    return (TypeName::typeName + ':') + name;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam

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()
     );
 }

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()
     );
 }

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)
     );

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,

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::volScalarField::Internal> Foam::fv::damping::forceCoeff() const
         (
             IOobject
             (
-                type() + ":forceCoeff",
+                typedName("forceCoeff"),
                 mesh().time().timeName(),
                 mesh()
             ),
@@ -152,7 +152,7 @@ Foam::tmp<Foam::volScalarField::Internal> Foam::fv::damping::forceCoeff() const
         (
             IOobject
             (
-                type() + ":forceCoeff",
+                typedName("forceCoeff"),
                 mesh().time().timeName(),
                 mesh()
             ),

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
     {

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<volScalarField> tHtc =
         volScalarField::New
         (
-            type() + ":htc",
+            typedName("htc"),
             mesh(),
             dimPower/dimTemperature/dimArea,
             zeroGradientFvPatchScalarField::typeName

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,

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::volScalarField> Foam::fv::heatTransferModel::AoV() const
 {
     if (!AoVPtr_.valid())
     {
-        return volScalarField::New(type() + ":AoV", mesh_, AoV_);
+        return volScalarField::New(typedName("AoV"), mesh_, AoV_);
     }
     else
     {

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,

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<CloudType>::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)
     {

src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C

@@ -158,7 +158,7 @@ tmp<volScalarField> 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<volScalarField> kinematicSingleLayer::sigma() const
     (
         volScalarField::New
         (
-            type() + ":sigma",
+            typedName("sigma"),
             regionMesh(),
             dimensionedScalar(dimMass/sqr(dimTime), 0),
             extrapolatedCalculatedFvPatchScalarField::typeName
@@ -1086,7 +1086,7 @@ tmp<volScalarField::Internal> 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<volVectorField::Internal> kinematicSingleLayer::SU() const
     (
         volVectorField::Internal::New
         (
-            IOobject::modelName("SU", typeName),
+            typedName("SU"),
             primaryMesh(),
             dimensionedVector(dimDensity*dimVelocity/dimTime, Zero)
         )
@@ -1135,7 +1135,7 @@ tmp<volScalarField::Internal> kinematicSingleLayer::Sh() const
 {
     return volScalarField::Internal::New
     (
-        IOobject::modelName("Sh", typeName),
+        typedName("Sh"),
         primaryMesh(),
         dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
     );

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<volVectorField::Internal> laminar::Us() const
     (
         volVectorField::Internal::New
         (
-            IOobject::modelName("Us", typeName),
+            typedName("Us"),
             1.5*filmModel_.U()
         )
     );

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,

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<uniformDimensionedScalarField>
         (
-            IOobject::modelName("Wwax", waxSolventEvaporation::typeName)
+            Foam::typedName<waxSolventEvaporation>("Wwax")
         )
     );
 
@@ -67,7 +67,7 @@ void waxSolventViscosity::correctMu()
     (
         film.regionMesh().lookupObject<uniformDimensionedScalarField>
         (
-            IOobject::modelName("Wsolvent", waxSolventEvaporation::typeName)
+            Foam::typedName<waxSolventEvaporation>("Wsolvent")
         )
     );
 
@@ -75,7 +75,7 @@ void waxSolventViscosity::correctMu()
     (
         film.regionMesh().lookupObject<uniformDimensionedScalarField>
         (
-            IOobject::modelName("Ysolvent0", waxSolventEvaporation::typeName)
+            Foam::typedName<waxSolventEvaporation>("Ysolvent0")
         )
     );
 
@@ -83,7 +83,7 @@ void waxSolventViscosity::correctMu()
     (
         film.regionMesh().lookupObject<volScalarField>
         (
-            IOobject::modelName("Ysolvent", waxSolventEvaporation::typeName)
+            Foam::typedName<waxSolventEvaporation>("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,

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<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
     (
         volVectorField::New
         (
-            IOobject::modelName("contactForce", typeName),
+            typedName("contactForce"),
             filmModel_.regionMesh(),
             dimensionedVector(dimForce/dimVolume, Zero)
         )

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)
         )

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)
         )

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<volScalarField> temperatureDependentContactAngleForce::theta() const
     (
         volScalarField::New
         (
-            IOobject::modelName("theta", typeName),
+            typedName("theta"),
             filmModel_.regionMesh(),
             dimensionedScalar(dimless, 0)
         )

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<volScalarField::Internal> constantRadiation::Shs()
     {
         return volScalarField::Internal::New
         (
-            IOobject::modelName("Shs", typeName),
+            typedName("Shs"),
             mask_*qrConst_*filmModel_.coverage()*absorptivity_
         );
     }
@@ -116,7 +116,7 @@ tmp<volScalarField::Internal> constantRadiation::Shs()
     {
         return volScalarField::Internal::New
         (
-            IOobject::modelName("Shs", typeName),
+            typedName("Shs"),
             film().regionMesh(),
             dimensionedScalar(dimMass/pow3(dimTime), 0)
         );

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<volScalarField::Internal> noRadiation::Shs()
 {
     return volScalarField::Internal::New
     (
-        IOobject::modelName("Shs", typeName),
+        typedName("Shs"),
         film().regionMesh(),
         dimensionedScalar(dimMass/pow3(dimTime), 0)
     );

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<volScalarField::Internal> primaryRadiation::Shs()
 {
     return volScalarField::Internal::New
     (
-        IOobject::modelName("Shs", typeName),
+        typedName("Shs"),
         qinFilm_*filmModel_.coverage()
     );
 }

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<volScalarField::Internal> standardRadiation::Shs()
 {
     return volScalarField::Internal::New
     (
-        IOobject::modelName("Shs", typeName),
+        typedName("Shs"),
         beta_*qinFilm_*filmModel_.coverage()
        *(1 - exp(-kappaBar_*filmModel_.delta()()))
     );

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,

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,

src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C

@@ -597,7 +597,7 @@ tmp<volScalarField::Internal> 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<volScalarField::Internal> thermoSingleLayer::Sh() const
     (
         volScalarField::Internal::New
         (
-            IOobject::modelName("Sh", typeName),
+            typedName("Sh"),
             primaryMesh(),
             dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
         )

src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C

@@ -115,7 +115,7 @@ Foam::rigidBodyMeshMotionSolver::rigidBodyMeshMotionSolver
             (
                 IOobject
                 (
-                    "rigidBodyMotionSolver:meshSolver",
+                    typedName("meshSolver"),
                     mesh.time().constant(),
                     mesh
                 ),

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,

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()
         ),