basicThermo: Renamed thermo:psi -> psi, thermo:mu -> mu and thermo:kappa -> kappa

The basic thermophysical properties are now considered fundamental and complex
models like kineticTheoryModel using these names for some other purpose must
disambiguate using typedName to prepend the model name to the field name.

This change standardises, rationalises and simplifies the specification of
fvSchemes and boundary conditions.

thermo:rho will also be renamed rho in a subsequent commit to complete this
rationalisation.

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C

@@ -41,8 +41,8 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
     mixedFvPatchScalarField(p, iF),
     UName_("U"),
     rhoName_("rho"),
-    psiName_("thermo:psi"),
+    psiName_("psi"),
-    muName_("thermo:mu"),
+    muName_("mu"),
     accommodationCoeff_(1.0),
     Twall_(p.size(), 0.0),
     gamma_(1.4)
@@ -63,8 +63,8 @@ Foam::smoluchowskiJumpTFvPatchScalarField::smoluchowskiJumpTFvPatchScalarField
     mixedFvPatchScalarField(p, iF, dict, false),
     UName_(dict.lookupOrDefault<word>("U", "U")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
-    muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
     accommodationCoeff_(dict.lookup<scalar>("accommodationCoeff")),
     Twall_("Twall", dict, p.size()),
     gamma_(dict.lookupOrDefault<scalar>("gamma", 1.4))
@@ -227,8 +227,8 @@ void Foam::smoluchowskiJumpTFvPatchScalarField::write(Ostream& os) const
 
     writeEntryIfDifferent<word>(os, "U", "U", UName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+    writeEntryIfDifferent<word>(os, "psi", "psi", psiName_);
-    writeEntryIfDifferent<word>(os, "mu", "thermo:mu", muName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
 
     writeEntry(os, "accommodationCoeff", accommodationCoeff_);
     writeEntry(os, "Twall", Twall_);

applications/solvers/compressible/rhoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.H

@@ -59,10 +59,10 @@ class smoluchowskiJumpTFvPatchScalarField
         //- Density field name, default = "rho"
         word rhoName_;
 
-        //- Compressibility field name, default = "thermo:psi"
+        //- Compressibility field name, default = "psi"
         word psiName_;
 
-        //- Dynamic viscosity field name, default = "thermo:mu"
+        //- Dynamic viscosity field name, default = "mu"
         word muName_;
 
         //- Accommodation coefficient

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C

@@ -41,8 +41,8 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
     mixedFixedValueSlipFvPatchVectorField(p, iF),
     TName_("T"),
     rhoName_("rho"),
-    psiName_("thermo:psi"),
+    psiName_("psi"),
-    muName_("thermo:mu"),
+    muName_("mu"),
     tauMCName_("tauMC"),
     accommodationCoeff_(1.0),
     Uwall_(p.size(), vector(0.0, 0.0, 0.0)),
@@ -61,8 +61,8 @@ Foam::maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
     mixedFixedValueSlipFvPatchVectorField(p, iF),
     TName_(dict.lookupOrDefault<word>("T", "T")),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
-    muName_(dict.lookupOrDefault<word>("mu", "thermo:mu")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
     tauMCName_(dict.lookupOrDefault<word>("tauMC", "tauMC")),
     accommodationCoeff_(dict.lookup<scalar>("accommodationCoeff")),
     Uwall_("Uwall", dict, p.size()),
@@ -241,8 +241,8 @@ void Foam::maxwellSlipUFvPatchVectorField::write(Ostream& os) const
     fvPatchVectorField::write(os);
     writeEntryIfDifferent<word>(os, "T", "T", TName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+    writeEntryIfDifferent<word>(os, "psi", "psi", psiName_);
-    writeEntryIfDifferent<word>(os, "mu", "thermo:mu", muName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
     writeEntryIfDifferent<word>(os, "tauMC", "tauMC", tauMCName_);
 
     writeEntry(os, "accommodationCoeff", accommodationCoeff_);

applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.H

@@ -60,10 +60,10 @@ class maxwellSlipUFvPatchVectorField
         //- Density field name, default = "rho"
         word rhoName_;
 
-        //- Compressibility field name, default = "thermo:psi"
+        //- Compressibility field name, default = "psi"
         word psiName_;
 
-        //- Dynamic viscosity field name, default = "thermo:mu"
+        //- Dynamic viscosity field name, default = "mu"
         word muName_;
 
         //- tauMC field name, default = "tauMC"

applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.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
@@ -38,7 +38,7 @@ Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField
 :
     fixedValueFvPatchScalarField(p, iF),
     pName_("p"),
-    psiName_("thermo:psi")
+    psiName_("psi")
 {}
 
 
@@ -51,7 +51,7 @@ Foam::fixedRhoFvPatchScalarField::fixedRhoFvPatchScalarField
 :
     fixedValueFvPatchScalarField(p, iF, dict),
     pName_(dict.lookupOrDefault<word>("p", "p")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi"))
+    psiName_(dict.lookupOrDefault<word>("psi", "psi"))
 {}
 
 
@@ -107,7 +107,7 @@ void Foam::fixedRhoFvPatchScalarField::write(Ostream& os) const
     fvPatchScalarField::write(os);
 
     writeEntryIfDifferent<word>(os, "p", "p", this->pName_);
-    writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+    writeEntryIfDifferent<word>(os, "psi", "psi", psiName_);
     writeEntry(os, "value", *this);
 }
 

applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.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
@@ -45,7 +45,7 @@ Usage
     \table
         Property     | Description                | Required    | Default value
         p            | Pressure field name        | no          | p
-        psi          | Compressibility field name | no          | thermo:psi
+        psi          | Compressibility field name | no          | psi
     \endtable
 
     Example of the boundary condition specification:
@@ -84,7 +84,7 @@ class fixedRhoFvPatchScalarField
         //- Pressure field name, default = "p"
         word pName_;
 
-        //- Compressibility field name, default = "thermo:psi"
+        //- Compressibility field name, default = "psi"
         word psiName_;
 
 

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C

@@ -25,7 +25,7 @@ License
 
 #include "JohnsonJacksonParticleSlipFvPatchVectorField.H"
 #include "addToRunTimeSelectionTable.H"
-#include "phaseSystem.H"
+#include "kineticTheoryModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -144,7 +144,11 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs()
     (
         patch().lookupPatchField<volScalarField, scalar>
         (
-            IOobject::groupName("gs0", phase.name())
+            IOobject::groupName
+            (
+                Foam::typedName<RASModels::kineticTheoryModel>("gs0"),
+                phase.name()
+            )
         )
     );
 

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C

@@ -25,7 +25,7 @@ License
 
 #include "JohnsonJacksonParticleThetaFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
-#include "phaseSystem.H"
+#include "kineticTheoryModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -172,7 +172,11 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
     (
         patch().lookupPatchField<volScalarField, scalar>
         (
-            IOobject::groupName("gs0", phase.name())
+            IOobject::groupName
+            (
+                Foam::typedName<RASModels::kineticTheoryModel>("gs0"),
+                phase.name()
+            )
         )
     );
 
@@ -180,7 +184,11 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs()
     (
         patch().lookupPatchField<volScalarField, scalar>
         (
-            IOobject::groupName("kappa", phase.name())
+            IOobject::groupName
+            (
+                Foam::typedName<RASModels::kineticTheoryModel>("kappa"),
+                phase.name()
+            )
         )
     );
 

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C

@@ -167,7 +167,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
     (
         IOobject
         (
-            IOobject::groupName("lambda", phase_.name()),
+            IOobject::groupName(typedName("lambda"), phase_.name()),
             U.time().timeName(),
             U.mesh(),
             IOobject::NO_READ,
@@ -181,7 +181,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
     (
         IOobject
         (
-            IOobject::groupName("gs0", phase_.name()),
+            IOobject::groupName(typedName("gs0"), phase_.name()),
             U.time().timeName(),
             U.mesh(),
             IOobject::NO_READ,
@@ -195,7 +195,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
     (
         IOobject
         (
-            IOobject::groupName("kappa", phase_.name()),
+            IOobject::groupName(typedName("kappa"), phase_.name()),
             U.time().timeName(),
             U.mesh(),
             IOobject::NO_READ,
@@ -209,7 +209,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
     (
         IOobject
         (
-            IOobject::groupName("nuFric", phase_.name()),
+            IOobject::groupName(typedName("nuFric"), phase_.name()),
             U.time().timeName(),
             U.mesh(),
             IOobject::NO_READ,

src/finiteVolume/cfdTools/general/porosityModel/DarcyForchheimer/DarcyForchheimer.C

@@ -57,7 +57,7 @@ Foam::porosityModels::DarcyForchheimer::DarcyForchheimer
     D_(cellZoneIDs_.size()),
     F_(cellZoneIDs_.size()),
     rhoName_(coeffs_.lookupOrDefault<word>("rho", "rho")),
-    muName_(coeffs_.lookupOrDefault<word>("mu", "thermo:mu")),
+    muName_(coeffs_.lookupOrDefault<word>("mu", "mu")),
     nuName_(coeffs_.lookupOrDefault<word>("nu", "nu"))
 {
     adjustNegativeResistance(dXYZ_);

src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C

@@ -60,7 +60,7 @@ inletOutletTotalTemperatureFvPatchScalarField
 :
     inletOutletFvPatchScalarField(p, iF),
     UName_(dict.lookupOrDefault<word>("U", "U")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
     gamma_(dict.lookup<scalar>("gamma")),
     T0_("T0", dict, p.size())
 {

src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.H

@@ -34,7 +34,7 @@ Usage
         Property     | Description             | Required    | Default value
         U            | velocity field name     | no          | U
         phi          | flux field name         | no          | phi
-        psi          | compressibility field name |  no      | thermo:psi
+        psi          | compressibility field name |  no      | psi
         gamma        | heat capacity ration (Cp/Cv) | yes    |
         inletValue   | reverse flow (inlet) value | yes      |
         T0           | static temperature [K]  | yes         |

src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C

@@ -40,7 +40,7 @@ supersonicFreestreamFvPatchVectorField
     mixedFvPatchVectorField(p, iF),
     TName_("T"),
     pName_("p"),
-    psiName_("thermo:psi"),
+    psiName_("psi"),
     UInf_(Zero),
     pInf_(0),
     TInf_(0),
@@ -63,7 +63,7 @@ supersonicFreestreamFvPatchVectorField
     mixedFvPatchVectorField(p, iF, dict, false),
     TName_(dict.lookupOrDefault<word>("T", "T")),
     pName_(dict.lookupOrDefault<word>("p", "p")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
     UInf_(dict.lookup("UInf")),
     pInf_(dict.lookup<scalar>("pInf")),
     TInf_(dict.lookup<scalar>("TInf")),
@@ -280,7 +280,7 @@ void Foam::supersonicFreestreamFvPatchVectorField::write(Ostream& os) const
     fvPatchVectorField::write(os);
     writeEntryIfDifferent<word>(os, "T", "T", TName_);
     writeEntryIfDifferent<word>(os, "p", "p", pName_);
-    writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+    writeEntryIfDifferent<word>(os, "psi", "psi", psiName_);
     writeEntry(os, "UInf", UInf_);
     writeEntry(os, "pInf", pInf_);
     writeEntry(os, "TInf", TInf_);

src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.H

@@ -38,7 +38,7 @@ Usage
         Property     | Description             | Required    | Default value
         T            | Temperature field name  | no          | T
         p            | Pressure field name     | no          | p
-        psi          | Compressibility field name | no       | thermo:psi
+        psi          | Compressibility field name | no       | psi
         UInf         | free-stream velocity    | yes         |
         pInf         | free-stream pressure    | yes         |
         TInf         | free-stream temperature | yes         |
@@ -93,7 +93,7 @@ class supersonicFreestreamFvPatchVectorField
         //- Name of pressure field, default = "p"
         word pName_;
 
-        //- Name of compressibility field field, default = "thermo:psi"
+        //- Name of compressibility field field, default = "psi"
         word psiName_;
 
         //- Velocity of the free stream

src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.C

@@ -40,7 +40,7 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     UName_("U"),
     phiName_("phi"),
-    psiName_("thermo:psi"),
+    psiName_("psi"),
     gamma_(0.0),
     T0_(p.size(), 0.0)
 {}
@@ -56,7 +56,7 @@ Foam::totalTemperatureFvPatchScalarField::totalTemperatureFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF, dict, false),
     UName_(dict.lookupOrDefault<word>("U", "U")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
     gamma_(dict.lookup<scalar>("gamma")),
     T0_("T0", dict, p.size())
 {
@@ -179,7 +179,7 @@ void Foam::totalTemperatureFvPatchScalarField::write(Ostream& os) const
     fvPatchScalarField::write(os);
     writeEntryIfDifferent<word>(os, "U", "U", UName_);
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
-    writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+    writeEntryIfDifferent<word>(os, "psi", "psi", psiName_);
     writeEntry(os, "gamma", gamma_);
     writeEntry(os, "T0", T0_);
     writeEntry(os, "value", *this);

src/finiteVolume/fields/fvPatchFields/derived/totalTemperature/totalTemperatureFvPatchScalarField.H

@@ -32,7 +32,7 @@ Usage
         Property     | Description             | Required    | Default value
         U            | Velocity field name     | no          | U
         phi          | Flux field name         | no          | phi
-        psi          | Compressibility field name | no       | thermo:psi
+        psi          | Compressibility field name | no       | psi
         gamma        | ratio of specific heats (Cp/Cv) | yes |
         T0           | reference temperature   | yes         |
     \endtable

src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.C

@@ -38,7 +38,7 @@ transonicEntrainmentPressureFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF),
     rhoName_("rho"),
-    psiName_("thermo:psi"),
+    psiName_("psi"),
     phiName_("phi"),
     gamma_(0),
     Mb_(0),
@@ -56,7 +56,7 @@ transonicEntrainmentPressureFvPatchScalarField
 :
     mixedFvPatchScalarField(p, iF, dict, false),
     rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
     phiName_(dict.lookupOrDefault<word>("phi", "phi")),
     gamma_(dict.lookup<scalar>("gamma")),
     Mb_(dict.lookupOrDefault<scalar>("Mb", 0.5)),
@@ -210,7 +210,7 @@ void Foam::transonicEntrainmentPressureFvPatchScalarField::write
 {
     fvPatchScalarField::write(os);
     writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-    writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+    writeEntryIfDifferent<word>(os, "psi", "psi", psiName_);
     writeEntryIfDifferent<word>(os, "phi", "phi", phiName_);
     writeEntry(os, "Mb", Mb_);
     writeEntry(os, "gamma", gamma_);

src/finiteVolume/fields/fvPatchFields/derived/transonicEntrainmentPressure/transonicEntrainmentPressureFvPatchScalarField.H

@@ -32,7 +32,7 @@ Usage
     \table
         Property     | Description                 | Required | Default value
         rho          | Density field name          | no       | rho
-        psi          | Compressibility field name  | no       | thermo:psi
+        psi          | Compressibility field name  | no       | psi
         gamma        | Heat capacity ratio (cp/Cv) | yes      |
         Mb           | Blending Mach No            | no       | 0.5
         phi          | Flux field name             | no       | phi
@@ -82,7 +82,7 @@ class transonicEntrainmentPressureFvPatchScalarField
         //- Name of density field field, default = "rho"
         const word rhoName_;
 
-        //- Name of compressibility field, default = "thermo:psi"
+        //- Name of compressibility field, default = "psi"
         const word psiName_;
 
         //- Name of the flux field

src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.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 @@ Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 )
 :
     advectiveFvPatchField<Type>(p, iF),
-    psiName_("thermo:psi"),
+    psiName_("psi"),
     gamma_(0.0)
 {}
 
@@ -55,7 +55,7 @@ Foam::waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 )
 :
     advectiveFvPatchField<Type>(p, iF, dict),
-    psiName_(dict.lookupOrDefault<word>("psi", "thermo:psi")),
+    psiName_(dict.lookupOrDefault<word>("psi", "psi")),
     gamma_(dict.lookup<scalar>("gamma"))
 {}
 
@@ -131,7 +131,7 @@ void Foam::waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
 
     writeEntryIfDifferent<word>(os, "phi", "phi", this->phiName_);
     writeEntryIfDifferent<word>(os, "rho", "rho", this->rhoName_);
-    writeEntryIfDifferent<word>(os, "psi", "thermo:psi", psiName_);
+    writeEntryIfDifferent<word>(os, "psi", "psi", psiName_);
 
     writeEntry(os, "gamma", gamma_);
 

src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.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
@@ -50,7 +50,7 @@ Usage
         Property     | Description             | Required    | Default value
         phi          | flux field name         | no          | phi
         rho          | density field name      | no          | rho
-        psi          | compressibility field name | no       | thermo:psi
+        psi          | compressibility field name | no       | psi
         gamma        | ratio of specific heats (Cp/Cv) | yes |
     \endtable
 

src/regionModels/surfaceFilmModels/momentumSurfaceFilm/momentumSurfaceFilm.C

@@ -809,7 +809,7 @@ Foam::regionModels::momentumSurfaceFilm::momentumSurfaceFilm
         IOobject
         (
             // Must have same name as rho to enable mapping
-            IOobject::groupName("thermo:mu", phaseName_),
+            IOobject::groupName("mu", phaseName_),
             time().timeName(),
             regionMesh(),
             IOobject::NO_READ,

src/thermophysicalModels/basic/basicThermo/basicThermo.C

@@ -289,7 +289,7 @@ Foam::basicThermo::implementation::implementation
     (
         IOobject
         (
-            phasePropertyName("thermo:kappa", phaseName),
+            phasePropertyName("kappa", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::READ_IF_PRESENT,

src/thermophysicalModels/basic/psiThermo/psiThermo.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
@@ -46,7 +46,7 @@ Foam::psiThermo::implementation::implementation
     (
         IOobject
         (
-            phasePropertyName("thermo:psi", phaseName),
+            phasePropertyName("psi", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -60,7 +60,7 @@ Foam::psiThermo::implementation::implementation
     (
         IOobject
         (
-            phasePropertyName("thermo:mu", phaseName),
+            phasePropertyName("mu", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,

src/thermophysicalModels/basic/rhoThermo/rhoThermo.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
@@ -60,7 +60,7 @@ Foam::rhoThermo::implementation::implementation
     (
         IOobject
         (
-            phasePropertyName("thermo:psi", phaseName),
+            phasePropertyName("psi", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
@@ -74,7 +74,7 @@ Foam::rhoThermo::implementation::implementation
     (
         IOobject
         (
-            phasePropertyName("thermo:mu", phaseName),
+            phasePropertyName("mu", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,

tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/T

@@ -36,7 +36,6 @@ boundaryField
         value           uniform 297;
         T0              uniform 297;
         rho             none;
-        psi             thermo:psi;
         gamma           1.4;
     }
 

tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0.orig/p

@@ -29,7 +29,7 @@ boundaryField
     {
         type            waveTransmissive;
         field           p;
-        psi             thermo:psi;
+        psi             psi;
         fieldInf        101325;
         gamma           1.4;
         lInf            0.025;
@@ -42,7 +42,7 @@ boundaryField
         value           uniform 101325;
         p0              uniform 101325;
         rho             none;
-        psi             thermo:psi;
+        psi             psi;
         gamma           1.4;
     }
 

tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/T

@@ -1240,7 +1240,6 @@ boundaryField
     freestream
     {
         type            totalTemperature;
-        psi             thermo:psi;
         gamma           1.4;
         T0              uniform 297;
         value           nonuniform List<scalar>

tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/0/p

@@ -1232,7 +1232,7 @@ boundaryField
     {
         type            waveTransmissive;
         field           p;
-        psi             thermo:psi;
+        psi             psi;
         gamma           1.4;
         fieldInf        101325;
         lInf            0.025;
@@ -1270,7 +1270,7 @@ boundaryField
     {
         type            totalPressure;
         rho             none;
-        psi             thermo:psi;
+        psi             psi;
         gamma           1.4;
         p0              uniform 101325;
         value           nonuniform List<scalar>

tutorials/modules/compressibleVoF/climbingRod/system/fvSchemes

@@ -38,7 +38,7 @@ divSchemes
 
     div(((alpha.liquid*thermo:rho.liquid)*sigma.liquid))   Gauss linear;
     div((((alpha.liquid*thermo:rho.liquid)*nuM)*grad(U)))   Gauss linear;
-    div((((alpha.liquid*thermo:rho.liquid)*(thermo:mu.liquid|thermo:rho.liquid))*dev2(T(grad(U))))) Gauss linear;
+    div((((alpha.liquid*thermo:rho.liquid)*(mu.liquid|thermo:rho.liquid))*dev2(T(grad(U))))) Gauss linear;
 
     div((((alpha.air*thermo:rho.air)*nuEff.air)*dev2(T(grad(U))))) Gauss linear;
     div((((alpha.liquid*thermo:rho.liquid)*nuEff.liquid)*dev2(T(grad(U))))) Gauss linear;

tutorials/modules/compressibleVoF/cylinder/constant/cloudProperties

@@ -39,10 +39,10 @@ solution
     {
         thermo:rho.air  cell;
         U               cellPoint;
-        thermo:mu.air   cell;
+        mu.air          cell;
         T.air           cell;
         Cp.air          cell;
-        thermo:kappa.air cell;
+        kappa.air       cell;
         p               cell;
     }
 

tutorials/modules/fluid/aerofoilNACA0012/0/p

@@ -25,7 +25,6 @@ boundaryField
     {
         type            waveTransmissive;
         field           p;
-        psi             thermo:psi;
         gamma           1.4;
         fieldInf        $pOut;
         lInf            5;

tutorials/modules/fluid/forwardStep/0/p

@@ -29,7 +29,6 @@ boundaryField
     {
         type            waveTransmissive;
         field           p;
-        psi             thermo:psi;
         gamma           1.4;
         fieldInf        1;
         lInf            3;

tutorials/modules/fluid/nacaAirfoil/0/p

@@ -28,7 +28,6 @@ boundaryField
     {
         type            waveTransmissive;
         field           p;
-        psi             thermo:psi;
         gamma           1.3;
         fieldInf        100000;
         lInf            1;

tutorials/modules/fluid/pitzDaily/0/p

@@ -27,7 +27,6 @@ boundaryField
     outlet
     {
         type            waveTransmissive;
-        psi             thermo:psi;
         gamma           1.3;
         fieldInf        1e5;
         lInf            0.3;

tutorials/modules/fluid/prism/0/p

@@ -29,7 +29,6 @@ boundaryField
     {
         type            waveTransmissive;
         field           p;
-        psi             thermo:psi;
         gamma           1.3;
         fieldInf        100000;
         lInf            1;

tutorials/modules/multicomponentFluid/aachenBomb/constant/cloudProperties

@@ -39,10 +39,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/modules/multicomponentFluid/cylinder/constant/cloudProperties

@@ -39,10 +39,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/modules/multicomponentFluid/filter/constant/cloudProperties

@@ -39,10 +39,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/modules/multicomponentFluid/hotBoxes/constant/cloudProperties

@@ -39,10 +39,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/modules/multicomponentFluid/parcelInBox/constant/cloudProperties

@@ -39,10 +39,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/modules/multicomponentFluid/simplifiedSiwek/constant/coalCloudProperties

@@ -39,10 +39,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
         G               cell;
     }

tutorials/modules/multicomponentFluid/simplifiedSiwek/constant/limestoneCloudProperties

@@ -36,10 +36,10 @@ solution
     interpolationSchemes
     {
         rho             cell;
-        thermo:mu       cell;
+        mu              cell;
         U               cellPoint;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
         T               cell;
         G               cell;

tutorials/modules/multicomponentFluid/splashPanel/constant/cloudProperties

@@ -39,10 +39,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/modules/multicomponentFluid/verticalChannel/constant/cloudProperties

@@ -39,10 +39,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/modules/multicomponentFluid/verticalChannelLTS/constant/cloudProperties

@@ -42,10 +42,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/modules/multicomponentFluid/verticalChannelSteady/constant/cloudProperties

@@ -42,10 +42,10 @@ solution
     {
         rho             cell;
         U               cellPoint;
-        thermo:mu       cell;
+        mu              cell;
         T               cell;
         Cp              cell;
-        thermo:kappa    cell;
+        kappa           cell;
         p               cell;
     }
 

tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig

@@ -130,13 +130,13 @@ functions
         objects
         (
             thermo:rho.gas
-            thermo:mu.gas
+            mu.gas
-            thermo:psi.gas
+            psi.gas
-            thermo:alpha.gas
+            kappa.gas
             thermo:rho.liquid
-            thermo:mu.liquid
+            mu.liquid
-            thermo:psi.liquid
+            psi.liquid
-            thermo:alpha.liquid
+            kappa.liquid
             h.liquid
             h.gas
         );