From 65f3050b35bbcc910ecb4c28ed0fa6aabbcef4bd Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Tue, 13 Jun 2023 10:00:19 +0100 Subject: [PATCH] thermophysicalModels: Renamed he*Thermo classes The he*Thermo classes have been renamed to match their corresponding basic thermo classes. E.g., rhoThermo now corresponds to RhoThermo, rather than heRhoThermo. --- .../dynamicCode/fluidMulticomponentThermo | 2 +- .../fluidMulticomponentThermoTemplate.C | 11 +- etc/codeTemplates/dynamicCode/fluidThermo | 2 +- .../dynamicCode/fluidThermoTemplate.C | 9 +- etc/codeTemplates/dynamicCode/psiThermo | 2 +- .../dynamicCode/psiuMulticomponentThermo | 2 +- .../psiuMulticomponentThermoTemplate.C | 7 +- etc/codeTemplates/dynamicCode/solidThermo | 2 +- .../dynamicCode/solidThermoTemplate.C | 7 +- .../compileTemplate/compileTemplate.C | 7 -- src/thermophysicalModels/basic/Make/files | 3 +- .../heThermo.C => basicThermo/BasicThermo.C} | 87 ++++++++------ .../heThermo.H => basicThermo/BasicThermo.H} | 54 +++------ .../BasicThermoName.C} | 4 +- .../basic/basicThermo/NamedThermo.H | 77 ++++++++++++ .../basic/basicThermo/basicThermo.H | 2 +- .../{heLiquidThermo.C => LiquidThermo.C} | 20 ++-- .../{heLiquidThermo.H => LiquidThermo.H} | 29 +++-- .../basic/liquidThermo/liquidThermo.H | 9 +- .../basic/liquidThermo/liquidThermos.C | 11 +- .../psiThermo/{hePsiThermo.C => PsiThermo.C} | 36 +++--- .../psiThermo/{hePsiThermo.H => PsiThermo.H} | 29 +++-- .../basic/psiThermo/psiThermo.C | 2 +- .../basic/psiThermo/psiThermo.H | 9 +- .../basic/psiThermo/psiThermos.C | 3 +- .../rhoThermo/{heRhoThermo.C => RhoThermo.C} | 36 +++--- .../rhoThermo/{heRhoThermo.H => RhoThermo.H} | 29 +++-- .../basic/rhoThermo/rhoThermo.C | 2 +- .../basic/rhoThermo/rhoThermo.H | 9 +- .../basic/rhoThermo/rhoThermos.C | 3 +- ...ntThermo.C => FluidMulticomponentThermo.C} | 22 ++-- ...ntThermo.H => FluidMulticomponentThermo.H} | 30 ++--- .../fluidMulticomponentThermo.H | 1 + ...mponentThermo.C => MulticomponentThermo.C} | 110 +++++++++--------- ...mponentThermo.H => MulticomponentThermo.H} | 29 +++-- .../multicomponentThermo.H | 1 + .../psiMulticomponentThermo.H | 15 +-- .../psiMulticomponentThermos.C | 9 +- ...PsiThermo.C => PsiuMulticomponentThermo.C} | 100 ++++++++-------- ...PsiThermo.H => PsiuMulticomponentThermo.H} | 31 ++--- .../psiuMulticomponentThermo.C | 5 +- .../psiuMulticomponentThermo.H | 9 +- .../psiuMulticomponentThermoI.H | 2 +- .../psiuMulticomponentThermos.C | 7 +- .../rhoMulticomponentThermo.H | 15 +-- .../rhoMulticomponentThermos.C | 9 +- .../{heSolidThermo.C => SolidThermo.C} | 42 +++---- .../{heSolidThermo.H => SolidThermo.H} | 30 ++--- .../solidThermo/solidThermo/solidThermo.C | 13 +-- .../solidThermo/solidThermo/solidThermo.H | 9 +- .../solidThermo/solidThermo/solidThermos.C | 3 +- .../specie/include/makeThermo.H | 11 +- 52 files changed, 512 insertions(+), 496 deletions(-) rename src/thermophysicalModels/basic/{heThermo/heThermo.C => basicThermo/BasicThermo.C} (85%) rename src/thermophysicalModels/basic/{heThermo/heThermo.H => basicThermo/BasicThermo.H} (92%) rename src/thermophysicalModels/basic/{heThermo/heThermoName.C => basicThermo/BasicThermoName.C} (94%) create mode 100644 src/thermophysicalModels/basic/basicThermo/NamedThermo.H rename src/thermophysicalModels/basic/liquidThermo/{heLiquidThermo.C => LiquidThermo.C} (81%) rename src/thermophysicalModels/basic/liquidThermo/{heLiquidThermo.H => LiquidThermo.H} (81%) rename src/thermophysicalModels/basic/psiThermo/{hePsiThermo.C => PsiThermo.C} (87%) rename src/thermophysicalModels/basic/psiThermo/{hePsiThermo.H => PsiThermo.H} (82%) rename src/thermophysicalModels/basic/rhoThermo/{heRhoThermo.C => RhoThermo.C} (88%) rename src/thermophysicalModels/basic/rhoThermo/{heRhoThermo.H => RhoThermo.H} (82%) rename src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/{heFluidMulticomponentThermo.C => FluidMulticomponentThermo.C} (80%) rename src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/{heFluidMulticomponentThermo.H => FluidMulticomponentThermo.H} (80%) rename src/thermophysicalModels/multicomponentThermo/multicomponentThermo/{heMulticomponentThermo.C => MulticomponentThermo.C} (71%) rename src/thermophysicalModels/multicomponentThermo/multicomponentThermo/{heMulticomponentThermo.H => MulticomponentThermo.H} (92%) rename src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/{heheuPsiThermo.C => PsiuMulticomponentThermo.C} (77%) rename src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/{heheuPsiThermo.H => PsiuMulticomponentThermo.H} (86%) rename src/thermophysicalModels/solidThermo/solidThermo/{heSolidThermo.C => SolidThermo.C} (86%) rename src/thermophysicalModels/solidThermo/solidThermo/{heSolidThermo.H => SolidThermo.H} (83%) diff --git a/etc/codeTemplates/dynamicCode/fluidMulticomponentThermo b/etc/codeTemplates/dynamicCode/fluidMulticomponentThermo index e402b49227..7c42883911 100644 --- a/etc/codeTemplates/dynamicCode/fluidMulticomponentThermo +++ b/etc/codeTemplates/dynamicCode/fluidMulticomponentThermo @@ -19,7 +19,7 @@ type heRhoThermo ); -typeBase +typeRenamed ( hePsiThermo psiMulticomponentThermo heRhoThermo rhoMulticomponentThermo diff --git a/etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C b/etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C index d4e35d5e3d..b05ac2269a 100644 --- a/etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C +++ b/etc/codeTemplates/dynamicCode/fluidMulticomponentThermoTemplate.C @@ -37,15 +37,12 @@ License #include "${transport}Transport.H" // psi/rho -#include "${typeBase}.H" #include "${type}.H" // Mixture #include "${mixture}.H" #include "thermo.H" -#include "heMulticomponentThermo.H" -#include "heFluidMulticomponentThermo.H" #include "typedefThermo.H" #include "makeThermo.H" @@ -88,7 +85,7 @@ namespace Foam defineThermo ( - ${typeBase}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); @@ -96,15 +93,15 @@ namespace Foam addThermo ( fluidMulticomponentThermo, - ${typeBase}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); addThermo ( - ${typeBase}, - ${typeBase}, + ${type}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); diff --git a/etc/codeTemplates/dynamicCode/fluidThermo b/etc/codeTemplates/dynamicCode/fluidThermo index 1c540b085e..1e364e0ba0 100644 --- a/etc/codeTemplates/dynamicCode/fluidThermo +++ b/etc/codeTemplates/dynamicCode/fluidThermo @@ -19,7 +19,7 @@ type heRhoThermo ); -typeBase +typeRenamed ( hePsiThermo psiThermo heRhoThermo rhoThermo diff --git a/etc/codeTemplates/dynamicCode/fluidThermoTemplate.C b/etc/codeTemplates/dynamicCode/fluidThermoTemplate.C index 9aef83243a..c34d7b844a 100644 --- a/etc/codeTemplates/dynamicCode/fluidThermoTemplate.C +++ b/etc/codeTemplates/dynamicCode/fluidThermoTemplate.C @@ -37,7 +37,6 @@ License #include "${transport}Transport.H" // psi/rho -#include "${typeBase}.H" #include "${type}.H" // Mixture @@ -86,7 +85,7 @@ namespace Foam defineThermo ( - ${typeBase}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); @@ -94,15 +93,15 @@ namespace Foam addThermo ( fluidThermo, - ${typeBase}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); addThermo ( - ${typeBase}, - ${typeBase}, + ${type}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); diff --git a/etc/codeTemplates/dynamicCode/psiThermo b/etc/codeTemplates/dynamicCode/psiThermo index e8f8f7d982..a886a0a232 100644 --- a/etc/codeTemplates/dynamicCode/psiThermo +++ b/etc/codeTemplates/dynamicCode/psiThermo @@ -18,7 +18,7 @@ type hePsiThermo ); -typeBase +typeRenamed ( hePsiThermo psiThermo ); diff --git a/etc/codeTemplates/dynamicCode/psiuMulticomponentThermo b/etc/codeTemplates/dynamicCode/psiuMulticomponentThermo index cb06aefc92..62720d1ada 100644 --- a/etc/codeTemplates/dynamicCode/psiuMulticomponentThermo +++ b/etc/codeTemplates/dynamicCode/psiuMulticomponentThermo @@ -18,7 +18,7 @@ type heheuPsiThermo ); -typeBase +typeRenamed ( heheuPsiThermo psiuMulticomponentThermo ); diff --git a/etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C b/etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C index c7290e69e5..7272d99235 100644 --- a/etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C +++ b/etc/codeTemplates/dynamicCode/psiuMulticomponentThermoTemplate.C @@ -37,7 +37,6 @@ License #include "${transport}Transport.H" // psi/rho -#include "${typeBase}.H" #include "${type}.H" // Mixture @@ -86,15 +85,15 @@ namespace Foam defineThermo ( - ${typeBase}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); addThermo ( - ${typeBase}, - ${typeBase}, + ${type}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); diff --git a/etc/codeTemplates/dynamicCode/solidThermo b/etc/codeTemplates/dynamicCode/solidThermo index ca1ffc4462..ffc3c42b8c 100644 --- a/etc/codeTemplates/dynamicCode/solidThermo +++ b/etc/codeTemplates/dynamicCode/solidThermo @@ -18,7 +18,7 @@ type heSolidThermo ); -typeBase +typeRenamed ( heSolidThermo solidThermo ); diff --git a/etc/codeTemplates/dynamicCode/solidThermoTemplate.C b/etc/codeTemplates/dynamicCode/solidThermoTemplate.C index c7290e69e5..7272d99235 100644 --- a/etc/codeTemplates/dynamicCode/solidThermoTemplate.C +++ b/etc/codeTemplates/dynamicCode/solidThermoTemplate.C @@ -37,7 +37,6 @@ License #include "${transport}Transport.H" // psi/rho -#include "${typeBase}.H" #include "${type}.H" // Mixture @@ -86,15 +85,15 @@ namespace Foam defineThermo ( - ${typeBase}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); addThermo ( - ${typeBase}, - ${typeBase}, + ${type}, + ${type}, ${mixture}, ${transport}Transport${energy}${thermo}Thermo${equationOfState}${specie} ); diff --git a/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C b/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C index cc9832189c..951aba28e4 100644 --- a/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C +++ b/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C @@ -99,13 +99,6 @@ void Foam::compileTemplate::setFilterVariable } dynCode.setFilterVariable(name, type); - - const word typeBase(name + "Base"); - if (context.dict().found(typeBase)) - { - const HashTable typeToBaseMap(context.dict().lookup(typeBase)); - dynCode.setFilterVariable(typeBase, typeToBaseMap[type]); - } } diff --git a/src/thermophysicalModels/basic/Make/files b/src/thermophysicalModels/basic/Make/files index 22684aaddc..9edb4bbfa7 100644 --- a/src/thermophysicalModels/basic/Make/files +++ b/src/thermophysicalModels/basic/Make/files @@ -1,4 +1,5 @@ basicThermo/basicThermo.C +basicThermo/BasicThermoName.C pureThermo/pureThermo.C @@ -21,6 +22,4 @@ derivedFvPatchFields/gradientEnergy/gradientEnergyCalculatedTemperatureFvPatchSc derivedFvPatchFields/mixedEnergy/mixedEnergyFvPatchScalarField.C derivedFvPatchFields/mixedEnergy/mixedEnergyCalculatedTemperatureFvPatchScalarField.C -heThermo/heThermoName.C - LIB = $(FOAM_LIBBIN)/libfluidThermophysicalModels diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/basicThermo/BasicThermo.C similarity index 85% rename from src/thermophysicalModels/basic/heThermo/heThermo.C rename to src/thermophysicalModels/basic/basicThermo/BasicThermo.C index fbfcd9abc4..135a17ddbc 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermo.C +++ b/src/thermophysicalModels/basic/basicThermo/BasicThermo.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "heThermo.H" +#include "BasicThermo.H" #include "gradientEnergyFvPatchScalarField.H" #include "mixedEnergyFvPatchScalarField.H" @@ -32,7 +32,7 @@ License template template Foam::tmp -Foam::heThermo::volScalarFieldProperty +Foam::BasicThermo::volScalarFieldProperty ( const word& psiName, const dimensionSet& psiDim, @@ -84,7 +84,7 @@ Foam::heThermo::volScalarFieldProperty template template Foam::tmp -Foam::heThermo::cellSetProperty +Foam::BasicThermo::cellSetProperty ( Mixture mixture, Method psiMethod, @@ -113,7 +113,7 @@ Foam::heThermo::cellSetProperty template template Foam::tmp -Foam::heThermo::patchFieldProperty +Foam::BasicThermo::patchFieldProperty ( Mixture mixture, Method psiMethod, @@ -141,7 +141,7 @@ Foam::heThermo::patchFieldProperty template Foam::UIndirectList -Foam::heThermo::cellSetScalarList +Foam::BasicThermo::cellSetScalarList ( const volScalarField& psi, const labelList& cells @@ -153,7 +153,7 @@ Foam::heThermo::cellSetScalarList template Foam::UniformField -Foam::heThermo::cellSetScalarList +Foam::BasicThermo::cellSetScalarList ( const uniformGeometricScalarField& psi, const labelList& @@ -164,7 +164,7 @@ Foam::heThermo::cellSetScalarList template -void Foam::heThermo:: +void Foam::BasicThermo:: heBoundaryCorrection(volScalarField& h) { volScalarField::Boundary& hBf = h.boundaryFieldRef(); @@ -188,7 +188,7 @@ heBoundaryCorrection(volScalarField& h) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::heThermo::heThermo +Foam::BasicThermo::BasicThermo ( const fvMesh& mesh, const word& phaseName @@ -256,12 +256,7 @@ Foam::heThermo::heThermo // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template -Foam::heThermo::~heThermo() -{} - - -template -Foam::namedHeThermo::~namedHeThermo() +Foam::BasicThermo::~BasicThermo() {} @@ -269,7 +264,7 @@ Foam::namedHeThermo::~namedHeThermo() template const Foam::volScalarField& -Foam::heThermo::Cpv() const +Foam::BasicThermo::Cpv() const { if (MixtureType::thermoType::enthalpy()) { @@ -283,7 +278,8 @@ Foam::heThermo::Cpv() const template -Foam::tmp Foam::heThermo::he +Foam::tmp +Foam::BasicThermo::he ( const volScalarField& p, const volScalarField& T @@ -302,7 +298,8 @@ Foam::tmp Foam::heThermo::he template -Foam::tmp Foam::heThermo::he +Foam::tmp +Foam::BasicThermo::he ( const scalarField& T, const labelList& cells @@ -320,7 +317,8 @@ Foam::tmp Foam::heThermo::he template -Foam::tmp Foam::heThermo::he +Foam::tmp +Foam::BasicThermo::he ( const scalarField& T, const label patchi @@ -339,7 +337,7 @@ Foam::tmp Foam::heThermo::he template Foam::tmp -Foam::heThermo::hs() const +Foam::BasicThermo::hs() const { return volScalarFieldProperty ( @@ -354,7 +352,8 @@ Foam::heThermo::hs() const template -Foam::tmp Foam::heThermo::hs +Foam::tmp +Foam::BasicThermo::hs ( const volScalarField& p, const volScalarField& T @@ -373,7 +372,8 @@ Foam::tmp Foam::heThermo::hs template -Foam::tmp Foam::heThermo::hs +Foam::tmp +Foam::BasicThermo::hs ( const scalarField& T, const labelList& cells @@ -391,7 +391,8 @@ Foam::tmp Foam::heThermo::hs template -Foam::tmp Foam::heThermo::hs +Foam::tmp +Foam::BasicThermo::hs ( const scalarField& T, const label patchi @@ -410,7 +411,7 @@ Foam::tmp Foam::heThermo::hs template Foam::tmp -Foam::heThermo::ha() const +Foam::BasicThermo::ha() const { return volScalarFieldProperty ( @@ -425,7 +426,8 @@ Foam::heThermo::ha() const template -Foam::tmp Foam::heThermo::ha +Foam::tmp +Foam::BasicThermo::ha ( const volScalarField& p, const volScalarField& T @@ -444,7 +446,8 @@ Foam::tmp Foam::heThermo::ha template -Foam::tmp Foam::heThermo::ha +Foam::tmp +Foam::BasicThermo::ha ( const scalarField& T, const labelList& cells @@ -462,7 +465,8 @@ Foam::tmp Foam::heThermo::ha template -Foam::tmp Foam::heThermo::ha +Foam::tmp +Foam::BasicThermo::ha ( const scalarField& T, const label patchi @@ -481,7 +485,7 @@ Foam::tmp Foam::heThermo::ha template Foam::tmp -Foam::heThermo::hc() const +Foam::BasicThermo::hc() const { return volScalarFieldProperty ( @@ -494,7 +498,8 @@ Foam::heThermo::hc() const template -Foam::tmp Foam::heThermo::Cp +Foam::tmp +Foam::BasicThermo::Cp ( const scalarField& T, const label patchi @@ -512,7 +517,8 @@ Foam::tmp Foam::heThermo::Cp template -Foam::tmp Foam::heThermo::Cv +Foam::tmp +Foam::BasicThermo::Cv ( const scalarField& T, const label patchi @@ -530,7 +536,8 @@ Foam::tmp Foam::heThermo::Cv template -Foam::tmp Foam::heThermo::gamma +Foam::tmp +Foam::BasicThermo::gamma ( const scalarField& T, const label patchi @@ -549,14 +556,15 @@ Foam::tmp Foam::heThermo::gamma template Foam::tmp -Foam::heThermo::gamma() const +Foam::BasicThermo::gamma() const { return volScalarField::New("gamma", Cp_/Cv_); } template -Foam::tmp Foam::heThermo::Cpv +Foam::tmp +Foam::BasicThermo::Cpv ( const scalarField& T, const label patchi @@ -575,7 +583,7 @@ Foam::tmp Foam::heThermo::Cpv template Foam::tmp -Foam::heThermo::THE +Foam::BasicThermo::THE ( const volScalarField& h, const volScalarField& p, @@ -596,7 +604,8 @@ Foam::heThermo::THE template -Foam::tmp Foam::heThermo::THE +Foam::tmp +Foam::BasicThermo::THE ( const scalarField& h, const scalarField& T0, @@ -616,7 +625,8 @@ Foam::tmp Foam::heThermo::THE template -Foam::tmp Foam::heThermo::THE +Foam::tmp +Foam::BasicThermo::THE ( const scalarField& h, const scalarField& T0, @@ -637,7 +647,7 @@ Foam::tmp Foam::heThermo::THE template Foam::tmp -Foam::heThermo::W() const +Foam::BasicThermo::W() const { return volScalarFieldProperty ( @@ -650,7 +660,8 @@ Foam::heThermo::W() const template -Foam::tmp Foam::heThermo::W +Foam::tmp +Foam::BasicThermo::W ( const label patchi ) const @@ -665,7 +676,7 @@ Foam::tmp Foam::heThermo::W template -bool Foam::heThermo::read() +bool Foam::BasicThermo::read() { if (physicalProperties::read()) { diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.H b/src/thermophysicalModels/basic/basicThermo/BasicThermo.H similarity index 92% rename from src/thermophysicalModels/basic/heThermo/heThermo.H rename to src/thermophysicalModels/basic/basicThermo/BasicThermo.H index 666ea88d2d..89b98426ee 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermo.H +++ b/src/thermophysicalModels/basic/basicThermo/BasicThermo.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::heThermo + Foam::BasicThermo Description Thermo implementation and storage of energy and heat capacities. Provides @@ -30,12 +30,12 @@ Description the primitive thermo model. SourceFiles - heThermo.C + BasicThermo.C \*---------------------------------------------------------------------------*/ -#ifndef heThermo_H -#define heThermo_H +#ifndef BasicThermo_H +#define BasicThermo_H #include "volFields.H" #include "physicalProperties.H" @@ -47,20 +47,20 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class heThermoName Declaration + Class BasicThermoName Declaration \*---------------------------------------------------------------------------*/ -TemplateName(heThermo); +TemplateName(BasicThermo); /*---------------------------------------------------------------------------*\ - Class heThermo Declaration + Class BasicThermo Declaration \*---------------------------------------------------------------------------*/ template -class heThermo +class BasicThermo : - public heThermoName, + public BasicThermoName, public physicalProperties, public MixtureType, public BasicThermoType @@ -142,20 +142,20 @@ public: //- Disambiguate debug switch used by derivations - using heThermoName::debug; + using BasicThermoName::debug; // Constructors //- Construct from mesh and phase name - heThermo(const fvMesh&, const word& phaseName); + BasicThermo(const fvMesh&, const word& phaseName); //- Disallow default bitwise copy construction - heThermo(const heThermo&) = delete; + BasicThermo(const BasicThermo&) = delete; //- Destructor - virtual ~heThermo(); + virtual ~BasicThermo(); // Member Functions @@ -374,32 +374,6 @@ public: }; -/*---------------------------------------------------------------------------*\ - Class namedHeThermo Declaration -\*---------------------------------------------------------------------------*/ - -template -class namedHeThermo -: - public HeThermo -{ -public: - - //- Runtime type information - TypeName("heThermo"); - - - // Constructors - - //- Inherit constructors - using HeThermo::HeThermo; - - - //- Destructor - virtual ~namedHeThermo(); -}; - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam @@ -407,7 +381,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "heThermo.C" + #include "BasicThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/heThermo/heThermoName.C b/src/thermophysicalModels/basic/basicThermo/BasicThermoName.C similarity index 94% rename from src/thermophysicalModels/basic/heThermo/heThermoName.C rename to src/thermophysicalModels/basic/basicThermo/BasicThermoName.C index 51610c7ad2..3149a92e62 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermoName.C +++ b/src/thermophysicalModels/basic/basicThermo/BasicThermoName.C @@ -23,13 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "heThermo.H" +#include "BasicThermo.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(heThermoName, 0); + defineTypeNameAndDebug(BasicThermoName, 0); } diff --git a/src/thermophysicalModels/basic/basicThermo/NamedThermo.H b/src/thermophysicalModels/basic/basicThermo/NamedThermo.H new file mode 100644 index 0000000000..252a1a671e --- /dev/null +++ b/src/thermophysicalModels/basic/basicThermo/NamedThermo.H @@ -0,0 +1,77 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2023 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::NamedThermo + +Description + Final wrapper around a derived thermo. Adds type info. + +\*---------------------------------------------------------------------------*/ + +#ifndef NamedThermo_H +#define NamedThermo_H + +#include "typeInfo.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class NamedThermo Declaration +\*---------------------------------------------------------------------------*/ + +template +class NamedThermo +: + public BaseThermo +{ +public: + + //- Runtime type information + TypeName("NamedThermo"); + + + // Constructors + + //- Inherit constructors + using BaseThermo::BaseThermo; + + + //- Destructor + virtual ~NamedThermo() + {} +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H index aa8f936486..2e2954ee99 100644 --- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H +++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H @@ -49,7 +49,7 @@ Description obtaining a single copy of all the implementation classes it needs to form a complete implementation. The use of virtual inheritance does not result in additional constructor calls propagating further down the hierarchy - (into heThermo and similar) because all virtually inherited interface + (into BasicThermo and similar) because all virtually inherited interface classes are default constructable. SourceFiles diff --git a/src/thermophysicalModels/basic/liquidThermo/heLiquidThermo.C b/src/thermophysicalModels/basic/liquidThermo/LiquidThermo.C similarity index 81% rename from src/thermophysicalModels/basic/liquidThermo/heLiquidThermo.C rename to src/thermophysicalModels/basic/liquidThermo/LiquidThermo.C index 8f736be75c..74dd4e671b 100644 --- a/src/thermophysicalModels/basic/liquidThermo/heLiquidThermo.C +++ b/src/thermophysicalModels/basic/liquidThermo/LiquidThermo.C @@ -23,40 +23,40 @@ License \*---------------------------------------------------------------------------*/ -#include "heLiquidThermo.H" +#include "LiquidThermo.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heLiquidThermo::heLiquidThermo +template +Foam::LiquidThermo::LiquidThermo ( const fvMesh& mesh, const word& phaseName ) : - HeThermo(mesh, phaseName) + BaseThermo(mesh, phaseName) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heLiquidThermo::~heLiquidThermo() +template +Foam::LiquidThermo::~LiquidThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template +template Foam::tmp -Foam::heLiquidThermo::sigma() const +Foam::LiquidThermo::sigma() const { return this->volScalarFieldProperty ( "sigma", dimForce/dimLength, - &HeThermo::mixtureType::thermoMixture, - &HeThermo::mixtureType::thermoMixtureType::sigma, + &BaseThermo::mixtureType::thermoMixture, + &BaseThermo::mixtureType::thermoMixtureType::sigma, this->p_, this->T_ ); diff --git a/src/thermophysicalModels/basic/liquidThermo/heLiquidThermo.H b/src/thermophysicalModels/basic/liquidThermo/LiquidThermo.H similarity index 81% rename from src/thermophysicalModels/basic/liquidThermo/heLiquidThermo.H rename to src/thermophysicalModels/basic/liquidThermo/LiquidThermo.H index 76f67f1b08..8e57439365 100644 --- a/src/thermophysicalModels/basic/liquidThermo/heLiquidThermo.H +++ b/src/thermophysicalModels/basic/liquidThermo/LiquidThermo.H @@ -22,21 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::heLiquidThermo + Foam::LiquidThermo Description Liquid thermo implementation SourceFiles - heLiquidThermo.C + LiquidThermo.C \*---------------------------------------------------------------------------*/ -#ifndef heLiquidThermo_H -#define heLiquidThermo_H +#ifndef LiquidThermo_H +#define LiquidThermo_H -#include "liquidThermo.H" -#include "heThermo.H" +#include "BasicThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,27 +43,27 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class heLiquidThermo Declaration + Class LiquidThermo Declaration \*---------------------------------------------------------------------------*/ -template -class heLiquidThermo +template +class LiquidThermo : - public HeThermo + public BaseThermo { public: // Constructors //- Construct from mesh and phase name - heLiquidThermo(const fvMesh&, const word& phaseName); + LiquidThermo(const fvMesh&, const word& phaseName); //- Disallow default bitwise copy construction - heLiquidThermo(const heLiquidThermo&) = delete; + LiquidThermo(const LiquidThermo&) = delete; //- Destructor - virtual ~heLiquidThermo(); + virtual ~LiquidThermo(); // Member Functions @@ -76,7 +75,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const heLiquidThermo&) = delete; + void operator=(const LiquidThermo&) = delete; }; @@ -87,7 +86,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "heLiquidThermo.C" + #include "LiquidThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/liquidThermo/liquidThermo.H b/src/thermophysicalModels/basic/liquidThermo/liquidThermo.H index 6a58121ab9..50bc067945 100644 --- a/src/thermophysicalModels/basic/liquidThermo/liquidThermo.H +++ b/src/thermophysicalModels/basic/liquidThermo/liquidThermo.H @@ -38,6 +38,7 @@ SourceFiles #ifndef liquidThermo_H #define liquidThermo_H +#include "LiquidThermo.H" #include "rhoThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,10 +46,6 @@ SourceFiles namespace Foam { -template class heThermo; -template class heRhoThermo; -template class heLiquidThermo; - /*---------------------------------------------------------------------------*\ Class liquidThermo Declaration \*---------------------------------------------------------------------------*/ @@ -69,8 +66,8 @@ public: //- The derived type template - using heThermoType = - heLiquidThermo>>; + using DerivedThermoType = + LiquidThermo>>; //- Runtime type information diff --git a/src/thermophysicalModels/basic/liquidThermo/liquidThermos.C b/src/thermophysicalModels/basic/liquidThermo/liquidThermos.C index 3128940438..ced93601f1 100644 --- a/src/thermophysicalModels/basic/liquidThermo/liquidThermos.C +++ b/src/thermophysicalModels/basic/liquidThermo/liquidThermos.C @@ -23,18 +23,15 @@ License \*---------------------------------------------------------------------------*/ -#include "liquidPropertiesSelector.H" - -#include "sensibleInternalEnergy.H" -#include "sensibleEnthalpy.H" +#include "liquidThermo.H" #include "pureMixture.H" +#include "liquidPropertiesSelector.H" +#include "sensibleInternalEnergy.H" +#include "sensibleEnthalpy.H" #include "thermo.H" -#include "liquidThermo.H" -#include "heRhoThermo.H" -#include "heLiquidThermo.H" #include "makeThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/PsiThermo.C similarity index 87% rename from src/thermophysicalModels/basic/psiThermo/hePsiThermo.C rename to src/thermophysicalModels/basic/psiThermo/PsiThermo.C index 08c06d2cbf..01c60c147a 100644 --- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.C +++ b/src/thermophysicalModels/basic/psiThermo/PsiThermo.C @@ -23,12 +23,12 @@ License \*---------------------------------------------------------------------------*/ -#include "hePsiThermo.H" +#include "PsiThermo.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::hePsiThermo::calculate() +template +void Foam::PsiThermo::calculate() { const scalarField& hCells = this->he_; const scalarField& pCells = this->p_; @@ -44,10 +44,10 @@ void Foam::hePsiThermo::calculate() { auto composition = this->cellComposition(celli); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -108,10 +108,10 @@ void Foam::hePsiThermo::calculate() { auto composition = this->patchFaceComposition(patchi, facei); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -131,10 +131,10 @@ void Foam::hePsiThermo::calculate() { auto composition = this->patchFaceComposition(patchi, facei); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -154,14 +154,14 @@ void Foam::hePsiThermo::calculate() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::hePsiThermo::hePsiThermo +template +Foam::PsiThermo::PsiThermo ( const fvMesh& mesh, const word& phaseName ) : - HeThermo(mesh, phaseName) + BaseThermo(mesh, phaseName) { calculate(); @@ -172,17 +172,17 @@ Foam::hePsiThermo::hePsiThermo // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::hePsiThermo::~hePsiThermo() +template +Foam::PsiThermo::~PsiThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::hePsiThermo::correct() +template +void Foam::PsiThermo::correct() { - if (HeThermo::debug) + if (BaseThermo::debug) { InfoInFunction << endl; } @@ -192,7 +192,7 @@ void Foam::hePsiThermo::correct() calculate(); - if (HeThermo::debug) + if (BaseThermo::debug) { Info<< " Finished" << endl; } diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H b/src/thermophysicalModels/basic/psiThermo/PsiThermo.H similarity index 82% rename from src/thermophysicalModels/basic/psiThermo/hePsiThermo.H rename to src/thermophysicalModels/basic/psiThermo/PsiThermo.H index 7d61e3841b..9747aebef7 100644 --- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo.H +++ b/src/thermophysicalModels/basic/psiThermo/PsiThermo.H @@ -22,21 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::hePsiThermo + Foam::PsiThermo Description Thermo implementation based on compressibility SourceFiles - hePsiThermo.C + PsiThermo.C \*---------------------------------------------------------------------------*/ -#ifndef hePsiThermo_H -#define hePsiThermo_H +#ifndef PsiThermo_H +#define PsiThermo_H -#include "psiThermo.H" -#include "heThermo.H" +#include "BasicThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,13 +43,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class hePsiThermo Declaration + Class PsiThermo Declaration \*---------------------------------------------------------------------------*/ -template -class hePsiThermo +template +class PsiThermo : - public HeThermo + public Thermo { // Private Member Functions @@ -62,14 +61,14 @@ public: // Constructors //- Construct from mesh and phase name - hePsiThermo(const fvMesh&, const word& phaseName); + PsiThermo(const fvMesh&, const word& phaseName); //- Disallow default bitwise copy construction - hePsiThermo(const hePsiThermo&) = delete; + PsiThermo(const PsiThermo&) = delete; //- Destructor - virtual ~hePsiThermo(); + virtual ~PsiThermo(); // Member Functions @@ -81,7 +80,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const hePsiThermo&) = delete; + void operator=(const PsiThermo&) = delete; }; @@ -92,7 +91,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "hePsiThermo.C" + #include "PsiThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo.C b/src/thermophysicalModels/basic/psiThermo/psiThermo.C index 1be1da7f55..e8c8ebdb69 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermo.C +++ b/src/thermophysicalModels/basic/psiThermo/psiThermo.C @@ -33,7 +33,7 @@ namespace Foam defineRunTimeSelectionTable(psiThermo, fvMesh); } -const Foam::word Foam::psiThermo::heThermoName("hePsiThermo"); +const Foam::word Foam::psiThermo::derivedThermoName("hePsiThermo"); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo.H b/src/thermophysicalModels/basic/psiThermo/psiThermo.H index fea7bd4907..4c1c631367 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermo.H +++ b/src/thermophysicalModels/basic/psiThermo/psiThermo.H @@ -38,6 +38,7 @@ SourceFiles #ifndef psiThermo_H #define psiThermo_H +#include "PsiThermo.H" #include "fluidThermo.H" #include "pureThermo.H" @@ -46,9 +47,6 @@ SourceFiles namespace Foam { -template class heThermo; -template class hePsiThermo; - /*---------------------------------------------------------------------------*\ Class psiThermo Declaration \*---------------------------------------------------------------------------*/ @@ -72,10 +70,11 @@ public: //- The derived type template - using heThermoType = hePsiThermo>; + using DerivedThermoType = + PsiThermo>; //- The derived name - static const word heThermoName; + static const word derivedThermoName; //- Runtime type information diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermos.C b/src/thermophysicalModels/basic/psiThermo/psiThermos.C index 0b396c0847..61e6f3f7d4 100644 --- a/src/thermophysicalModels/basic/psiThermo/psiThermos.C +++ b/src/thermophysicalModels/basic/psiThermo/psiThermos.C @@ -24,10 +24,11 @@ License \*---------------------------------------------------------------------------*/ #include "psiThermo.H" -#include "hePsiThermo.H" + #include "pureMixture.H" #include "forGases.H" + #include "makeFluidThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/RhoThermo.C similarity index 88% rename from src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C rename to src/thermophysicalModels/basic/rhoThermo/RhoThermo.C index 2908a53ac1..c569910bf6 100644 --- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.C +++ b/src/thermophysicalModels/basic/rhoThermo/RhoThermo.C @@ -23,12 +23,12 @@ License \*---------------------------------------------------------------------------*/ -#include "heRhoThermo.H" +#include "RhoThermo.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::heRhoThermo::calculate() +template +void Foam::RhoThermo::calculate() { const scalarField& hCells = this->he(); const scalarField& pCells = this->p_; @@ -45,10 +45,10 @@ void Foam::heRhoThermo::calculate() { auto composition = this->cellComposition(celli); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -114,10 +114,10 @@ void Foam::heRhoThermo::calculate() { auto composition = this->patchFaceComposition(patchi, facei); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -138,10 +138,10 @@ void Foam::heRhoThermo::calculate() { auto composition = this->patchFaceComposition(patchi, facei); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -162,14 +162,14 @@ void Foam::heRhoThermo::calculate() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heRhoThermo::heRhoThermo +template +Foam::RhoThermo::RhoThermo ( const fvMesh& mesh, const word& phaseName ) : - HeThermo(mesh, phaseName) + BaseThermo(mesh, phaseName) { calculate(); } @@ -177,24 +177,24 @@ Foam::heRhoThermo::heRhoThermo // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heRhoThermo::~heRhoThermo() +template +Foam::RhoThermo::~RhoThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::heRhoThermo::correct() +template +void Foam::RhoThermo::correct() { - if (HeThermo::debug) + if (BaseThermo::debug) { InfoInFunction << endl; } calculate(); - if (HeThermo::debug) + if (BaseThermo::debug) { Info<< " Finished" << endl; } diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/RhoThermo.H similarity index 82% rename from src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H rename to src/thermophysicalModels/basic/rhoThermo/RhoThermo.H index 9cc4b12ea2..e82b57afcf 100644 --- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo.H +++ b/src/thermophysicalModels/basic/rhoThermo/RhoThermo.H @@ -22,21 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::heRhoThermo + Foam::RhoThermo Description Thermo implementation based on density SourceFiles - heRhoThermo.C + RhoThermo.C \*---------------------------------------------------------------------------*/ -#ifndef heRhoThermo_H -#define heRhoThermo_H +#ifndef RhoThermo_H +#define RhoThermo_H -#include "rhoThermo.H" -#include "heThermo.H" +#include "BasicThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,13 +43,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class heRhoThermo Declaration + Class RhoThermo Declaration \*---------------------------------------------------------------------------*/ -template -class heRhoThermo +template +class RhoThermo : - public HeThermo + public BaseThermo { // Private Member Functions @@ -63,14 +62,14 @@ public: // Constructors //- Construct from mesh and phase name - heRhoThermo(const fvMesh&, const word& phaseName); + RhoThermo(const fvMesh&, const word& phaseName); //- Disallow default bitwise copy construction - heRhoThermo(const heRhoThermo&) = delete; + RhoThermo(const RhoThermo&) = delete; //- Destructor - virtual ~heRhoThermo(); + virtual ~RhoThermo(); // Member Functions @@ -82,7 +81,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const heRhoThermo&) = delete; + void operator=(const RhoThermo&) = delete; }; @@ -93,7 +92,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "heRhoThermo.C" + #include "RhoThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C index 9d1e2e34b1..087aacf294 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.C @@ -33,7 +33,7 @@ namespace Foam defineRunTimeSelectionTable(rhoThermo, fvMesh); } -const Foam::word Foam::rhoThermo::heThermoName("heRhoThermo"); +const Foam::word Foam::rhoThermo::derivedThermoName("heRhoThermo"); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H index 2fa56bc695..d7b6491f36 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermo.H @@ -38,6 +38,7 @@ SourceFiles #ifndef rhoThermo_H #define rhoThermo_H +#include "RhoThermo.H" #include "fluidThermo.H" #include "pureThermo.H" @@ -46,9 +47,6 @@ SourceFiles namespace Foam { -template class heThermo; -template class heRhoThermo; - /*---------------------------------------------------------------------------*\ Class rhoThermo Declaration \*---------------------------------------------------------------------------*/ @@ -72,10 +70,11 @@ public: //- The derived type template - using heThermoType = heRhoThermo>; + using DerivedThermoType = + RhoThermo>; //- The derived name - static const word heThermoName; + static const word derivedThermoName; //- Runtime type information diff --git a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C index 622c626026..0f61bbcd76 100644 --- a/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C +++ b/src/thermophysicalModels/basic/rhoThermo/rhoThermos.C @@ -24,12 +24,13 @@ License \*---------------------------------------------------------------------------*/ #include "rhoThermo.H" -#include "heRhoThermo.H" + #include "pureMixture.H" #include "forGases.H" #include "forLiquids.H" #include "forTabulated.H" + #include "makeFluidThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/heFluidMulticomponentThermo.C b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/FluidMulticomponentThermo.C similarity index 80% rename from src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/heFluidMulticomponentThermo.C rename to src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/FluidMulticomponentThermo.C index f18dc9a74e..2a2d42a093 100644 --- a/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/heFluidMulticomponentThermo.C +++ b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/FluidMulticomponentThermo.C @@ -23,33 +23,33 @@ License \*---------------------------------------------------------------------------*/ -#include "heFluidMulticomponentThermo.H" +#include "FluidMulticomponentThermo.H" #include "fvMesh.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heFluidMulticomponentThermo::heFluidMulticomponentThermo +template +Foam::FluidMulticomponentThermo::FluidMulticomponentThermo ( const fvMesh& mesh, const word& phaseName ) : - HeThermo(mesh, phaseName) + BaseThermo(mesh, phaseName) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heFluidMulticomponentThermo::~heFluidMulticomponentThermo() +template +Foam::FluidMulticomponentThermo::~FluidMulticomponentThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -Foam::scalar Foam::heFluidMulticomponentThermo::mui +template +Foam::scalar Foam::FluidMulticomponentThermo::mui ( const label speciei, const scalar p, @@ -60,9 +60,9 @@ Foam::scalar Foam::heFluidMulticomponentThermo::mui } -template +template Foam::tmp -Foam::heFluidMulticomponentThermo::mui +Foam::FluidMulticomponentThermo::mui ( const label speciei, const volScalarField& p, @@ -73,7 +73,7 @@ Foam::heFluidMulticomponentThermo::mui ( "mu", dimMass/dimLength/dimTime, - &HeThermo::mixtureType::thermoType::mu, + &BaseThermo::mixtureType::thermoType::mu, speciei, p, T diff --git a/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/heFluidMulticomponentThermo.H b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/FluidMulticomponentThermo.H similarity index 80% rename from src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/heFluidMulticomponentThermo.H rename to src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/FluidMulticomponentThermo.H index e77fc3ba49..daba3c9f91 100644 --- a/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/heFluidMulticomponentThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/FluidMulticomponentThermo.H @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::heFluidMulticomponentThermo + Foam::FluidMulticomponentThermo Description Fluid multi-component thermo implementation SourceFiles - heFluidMulticomponentThermo.C + FluidMulticomponentThermo.C \*---------------------------------------------------------------------------*/ -#ifndef heFluidMulticomponentThermo_H -#define heFluidMulticomponentThermo_H +#ifndef FluidMulticomponentThermo_H +#define FluidMulticomponentThermo_H -#include "heThermo.H" +#include "BasicThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -43,30 +43,30 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class heFluidMulticomponentThermo Declaration + Class FluidMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ -template -class heFluidMulticomponentThermo +template +class FluidMulticomponentThermo : - public HeThermo + public BaseThermo { public: // Constructors //- Construct from mesh and phase name - heFluidMulticomponentThermo(const fvMesh&, const word& phaseName); + FluidMulticomponentThermo(const fvMesh&, const word& phaseName); //- Disallow default bitwise copy construction - heFluidMulticomponentThermo + FluidMulticomponentThermo ( - const heFluidMulticomponentThermo& + const FluidMulticomponentThermo& ) = delete; //- Destructor - virtual ~heFluidMulticomponentThermo(); + virtual ~FluidMulticomponentThermo(); // Member Functions @@ -93,7 +93,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const heFluidMulticomponentThermo&) = delete; + void operator=(const FluidMulticomponentThermo&) = delete; }; @@ -104,7 +104,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * #ifdef NoRepository - #include "heFluidMulticomponentThermo.C" + #include "FluidMulticomponentThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.H b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.H index daeb7cf92c..a82cdcebb3 100644 --- a/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/fluidMulticomponentThermo/fluidMulticomponentThermo.H @@ -40,6 +40,7 @@ SourceFiles #include "fluidThermo.H" #include "multicomponentThermo.H" +#include "FluidMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/heMulticomponentThermo.C b/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.C similarity index 71% rename from src/thermophysicalModels/multicomponentThermo/multicomponentThermo/heMulticomponentThermo.C rename to src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.C index ee747c9298..1e0afda134 100644 --- a/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/heMulticomponentThermo.C +++ b/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.C @@ -23,15 +23,15 @@ License \*---------------------------------------------------------------------------*/ -#include "heMulticomponentThermo.H" +#include "MulticomponentThermo.H" #include "fvMesh.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template +template template Foam::tmp -Foam::heMulticomponentThermo::volScalarFieldPropertyi +Foam::MulticomponentThermo::volScalarFieldPropertyi ( const word& psiName, const dimensionSet& psiDim, @@ -40,7 +40,7 @@ Foam::heMulticomponentThermo::volScalarFieldPropertyi const Args& ... args ) const { - const typename HeThermo::mixtureType::thermoType& thermo = + const typename BaseThermo::mixtureType::thermoType& thermo = this->specieThermo(speciei); tmp tPsi @@ -78,10 +78,10 @@ Foam::heMulticomponentThermo::volScalarFieldPropertyi } -template +template template Foam::tmp -Foam::heMulticomponentThermo::scalarFieldPropertyi +Foam::MulticomponentThermo::scalarFieldPropertyi ( Method psiMethod, const label speciei, @@ -89,7 +89,7 @@ Foam::heMulticomponentThermo::scalarFieldPropertyi const Args& ... args ) const { - const typename HeThermo::mixtureType::thermoType& thermo = + const typename BaseThermo::mixtureType::thermoType& thermo = this->specieThermo(speciei); tmp tPsi(new scalarField(arg.size())); @@ -107,28 +107,28 @@ Foam::heMulticomponentThermo::scalarFieldPropertyi // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heMulticomponentThermo::heMulticomponentThermo +template +Foam::MulticomponentThermo::MulticomponentThermo ( const fvMesh& mesh, const word& phaseName ) : - HeThermo(mesh, phaseName) + BaseThermo(mesh, phaseName) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heMulticomponentThermo::~heMulticomponentThermo() +template +Foam::MulticomponentThermo::~MulticomponentThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -Foam::scalar Foam::heMulticomponentThermo::Wi +template +Foam::scalar Foam::MulticomponentThermo::Wi ( const label speciei ) const @@ -137,8 +137,8 @@ Foam::scalar Foam::heMulticomponentThermo::Wi } -template -Foam::scalar Foam::heMulticomponentThermo::hfi +template +Foam::scalar Foam::MulticomponentThermo::hfi ( const label speciei ) const @@ -147,8 +147,8 @@ Foam::scalar Foam::heMulticomponentThermo::hfi } -template -Foam::scalar Foam::heMulticomponentThermo::rhoi +template +Foam::scalar Foam::MulticomponentThermo::rhoi ( const label speciei, const scalar p, @@ -159,9 +159,9 @@ Foam::scalar Foam::heMulticomponentThermo::rhoi } -template +template Foam::tmp -Foam::heMulticomponentThermo::rhoi +Foam::MulticomponentThermo::rhoi ( const label speciei, const volScalarField& p, @@ -172,7 +172,7 @@ Foam::heMulticomponentThermo::rhoi ( "rho", dimDensity, - &HeThermo::mixtureType::thermoType::rho, + &BaseThermo::mixtureType::thermoType::rho, speciei, p, T @@ -180,8 +180,8 @@ Foam::heMulticomponentThermo::rhoi } -template -Foam::scalar Foam::heMulticomponentThermo::Cpi +template +Foam::scalar Foam::MulticomponentThermo::Cpi ( const label speciei, const scalar p, @@ -192,9 +192,9 @@ Foam::scalar Foam::heMulticomponentThermo::Cpi } -template +template Foam::tmp -Foam::heMulticomponentThermo::Cpi +Foam::MulticomponentThermo::Cpi ( const label speciei, const volScalarField& p, @@ -205,7 +205,7 @@ Foam::heMulticomponentThermo::Cpi ( "Cp", dimEnergy/dimMass/dimTemperature, - &HeThermo::mixtureType::thermoType::Cp, + &BaseThermo::mixtureType::thermoType::Cp, speciei, p, T @@ -213,8 +213,8 @@ Foam::heMulticomponentThermo::Cpi } -template -Foam::scalar Foam::heMulticomponentThermo::hei +template +Foam::scalar Foam::MulticomponentThermo::hei ( const label speciei, const scalar p, @@ -225,8 +225,8 @@ Foam::scalar Foam::heMulticomponentThermo::hei } -template -Foam::tmp Foam::heMulticomponentThermo::hei +template +Foam::tmp Foam::MulticomponentThermo::hei ( const label speciei, const scalarField& p, @@ -235,7 +235,7 @@ Foam::tmp Foam::heMulticomponentThermo::hei { return scalarFieldPropertyi ( - &HeThermo::mixtureType::thermoType::HE, + &BaseThermo::mixtureType::thermoType::HE, speciei, p, T @@ -243,9 +243,9 @@ Foam::tmp Foam::heMulticomponentThermo::hei } -template +template Foam::tmp -Foam::heMulticomponentThermo::hei +Foam::MulticomponentThermo::hei ( const label speciei, const volScalarField& p, @@ -256,7 +256,7 @@ Foam::heMulticomponentThermo::hei ( "he", dimEnergy/dimMass, - &HeThermo::mixtureType::thermoType::HE, + &BaseThermo::mixtureType::thermoType::HE, speciei, p, T @@ -264,8 +264,8 @@ Foam::heMulticomponentThermo::hei } -template -Foam::scalar Foam::heMulticomponentThermo::hsi +template +Foam::scalar Foam::MulticomponentThermo::hsi ( const label speciei, const scalar p, @@ -276,8 +276,8 @@ Foam::scalar Foam::heMulticomponentThermo::hsi } -template -Foam::tmp Foam::heMulticomponentThermo::hsi +template +Foam::tmp Foam::MulticomponentThermo::hsi ( const label speciei, const scalarField& p, @@ -286,7 +286,7 @@ Foam::tmp Foam::heMulticomponentThermo::hsi { return scalarFieldPropertyi ( - &HeThermo::mixtureType::thermoType::Hs, + &BaseThermo::mixtureType::thermoType::Hs, speciei, p, T @@ -294,9 +294,9 @@ Foam::tmp Foam::heMulticomponentThermo::hsi } -template +template Foam::tmp -Foam::heMulticomponentThermo::hsi +Foam::MulticomponentThermo::hsi ( const label speciei, const volScalarField& p, @@ -307,7 +307,7 @@ Foam::heMulticomponentThermo::hsi ( "hs", dimEnergy/dimMass, - &HeThermo::mixtureType::thermoType::Hs, + &BaseThermo::mixtureType::thermoType::Hs, speciei, p, T @@ -315,8 +315,8 @@ Foam::heMulticomponentThermo::hsi } -template -Foam::scalar Foam::heMulticomponentThermo::hai +template +Foam::scalar Foam::MulticomponentThermo::hai ( const label speciei, const scalar p, @@ -327,8 +327,8 @@ Foam::scalar Foam::heMulticomponentThermo::hai } -template -Foam::tmp Foam::heMulticomponentThermo::hai +template +Foam::tmp Foam::MulticomponentThermo::hai ( const label speciei, const scalarField& p, @@ -337,7 +337,7 @@ Foam::tmp Foam::heMulticomponentThermo::hai { return scalarFieldPropertyi ( - &HeThermo::mixtureType::thermoType::Ha, + &BaseThermo::mixtureType::thermoType::Ha, speciei, p, T @@ -345,9 +345,9 @@ Foam::tmp Foam::heMulticomponentThermo::hai } -template +template Foam::tmp -Foam::heMulticomponentThermo::hai +Foam::MulticomponentThermo::hai ( const label speciei, const volScalarField& p, @@ -358,7 +358,7 @@ Foam::heMulticomponentThermo::hai ( "ha", dimEnergy/dimMass, - &HeThermo::mixtureType::thermoType::Ha, + &BaseThermo::mixtureType::thermoType::Ha, speciei, p, T @@ -366,8 +366,8 @@ Foam::heMulticomponentThermo::hai } -template -Foam::scalar Foam::heMulticomponentThermo::kappai +template +Foam::scalar Foam::MulticomponentThermo::kappai ( const label speciei, const scalar p, @@ -378,9 +378,9 @@ Foam::scalar Foam::heMulticomponentThermo::kappai } -template +template Foam::tmp -Foam::heMulticomponentThermo::kappai +Foam::MulticomponentThermo::kappai ( const label speciei, const volScalarField& p, @@ -391,7 +391,7 @@ Foam::heMulticomponentThermo::kappai ( "kappa", dimPower/dimLength/dimTemperature, - &HeThermo::mixtureType::thermoType::kappa, + &BaseThermo::mixtureType::thermoType::kappa, speciei, p, T diff --git a/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/heMulticomponentThermo.H b/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.H similarity index 92% rename from src/thermophysicalModels/multicomponentThermo/multicomponentThermo/heMulticomponentThermo.H rename to src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.H index de073717c1..33cbad4eda 100644 --- a/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/heMulticomponentThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/MulticomponentThermo.H @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::heMulticomponentThermo + Foam::MulticomponentThermo Description Multi-component thermo implementation SourceFiles - heMulticomponentThermo.C + MulticomponentThermo.C \*---------------------------------------------------------------------------*/ -#ifndef heMulticomponentThermo_H -#define heMulticomponentThermo_H +#ifndef MulticomponentThermo_H +#define MulticomponentThermo_H -#include "heThermo.H" +#include "BasicThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -43,13 +43,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class heMulticomponentThermo Declaration + Class MulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ -template -class heMulticomponentThermo +template +class MulticomponentThermo : - public HeThermo + public BaseThermo { protected: @@ -82,17 +82,14 @@ public: // Constructors //- Construct from mesh and phase name - heMulticomponentThermo(const fvMesh&, const word& phaseName); + MulticomponentThermo(const fvMesh&, const word& phaseName); //- Disallow default bitwise copy construction - heMulticomponentThermo - ( - const heMulticomponentThermo& - ) = delete; + MulticomponentThermo(const MulticomponentThermo&) = delete; //- Destructor - virtual ~heMulticomponentThermo(); + virtual ~MulticomponentThermo(); // Member Functions @@ -240,7 +237,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * #ifdef NoRepository - #include "heMulticomponentThermo.C" + #include "MulticomponentThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/multicomponentThermo.H b/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/multicomponentThermo.H index ce62636eb5..c5dcf132b9 100644 --- a/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/multicomponentThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/multicomponentThermo/multicomponentThermo.H @@ -39,6 +39,7 @@ SourceFiles #define multicomponentThermo_H #include "basicThermo.H" +#include "MulticomponentThermo.H" #include "speciesTable.H" #include "GeometricFieldListSlicer.H" diff --git a/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.H b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.H index 82e85404de..a0c15ed1a9 100644 --- a/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermo.H @@ -47,11 +47,6 @@ SourceFiles namespace Foam { -template class heThermo; -template class hePsiThermo; -template class heMulticomponentThermo; -template class heFluidMulticomponentThermo; - /*---------------------------------------------------------------------------*\ Class psiMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ @@ -73,14 +68,14 @@ public: //- The derived type template - using heThermoType = - heFluidMulticomponentThermo + using DerivedThermoType = + FluidMulticomponentThermo < - heMulticomponentThermo + MulticomponentThermo < - hePsiThermo + PsiThermo < - heThermo + BasicThermo > > >; diff --git a/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C index 2c5ed92b36..5ebbeec4d8 100644 --- a/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C +++ b/src/thermophysicalModels/multicomponentThermo/psiMulticomponentThermo/psiMulticomponentThermos.C @@ -23,17 +23,14 @@ License \*---------------------------------------------------------------------------*/ +#include "psiMulticomponentThermo.H" + #include "coefficientMulticomponentMixture.H" #include "coefficientWilkeMulticomponentMixture.H" #include "singleComponentMixture.H" -#include "psiThermo.H" -#include "psiMulticomponentThermo.H" -#include "hePsiThermo.H" -#include "heMulticomponentThermo.H" -#include "heFluidMulticomponentThermo.H" - #include "forGases.H" + #include "makeFluidMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.C b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/PsiuMulticomponentThermo.C similarity index 77% rename from src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.C rename to src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/PsiuMulticomponentThermo.C index c556af20fa..6fca2dd026 100644 --- a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.C +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/PsiuMulticomponentThermo.C @@ -23,14 +23,14 @@ License \*---------------------------------------------------------------------------*/ -#include "heheuPsiThermo.H" +#include "PsiuMulticomponentThermo.H" #include "fvMesh.H" #include "fixedValueFvPatchFields.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::heheuPsiThermo::calculate() +template +void Foam::PsiuMulticomponentThermo::calculate() { const scalarField& hCells = this->he_; const scalarField& heuCells = this->heu_; @@ -48,10 +48,10 @@ void Foam::heheuPsiThermo::calculate() { auto composition = this->cellComposition(celli); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -127,10 +127,10 @@ void Foam::heheuPsiThermo::calculate() { auto composition = this->patchFaceComposition(patchi, facei); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -149,10 +149,10 @@ void Foam::heheuPsiThermo::calculate() { auto composition = this->patchFaceComposition(patchi, facei); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -175,14 +175,14 @@ void Foam::heheuPsiThermo::calculate() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heheuPsiThermo::heheuPsiThermo +template +Foam::PsiuMulticomponentThermo::PsiuMulticomponentThermo ( const fvMesh& mesh, const word& phaseName ) : - HeThermo(mesh, phaseName), + BaseThermo(mesh, phaseName), Tu_ ( IOobject @@ -199,7 +199,7 @@ Foam::heheuPsiThermo::heheuPsiThermo ( IOobject ( - HeThermo::mixtureType::thermoType::heName() + 'u', + BaseThermo::mixtureType::thermoType::heName() + 'u', mesh.time().name(), mesh, IOobject::NO_READ, @@ -207,10 +207,10 @@ Foam::heheuPsiThermo::heheuPsiThermo ), this->volScalarFieldProperty ( - HeThermo::mixtureType::thermoType::heName() + 'u', + BaseThermo::mixtureType::thermoType::heName() + 'u', dimEnergy/dimMass, - &HeThermo::mixtureType::reactants, - &HeThermo::mixtureType::thermoMixtureType::HE, + &BaseThermo::mixtureType::reactants, + &BaseThermo::mixtureType::thermoMixtureType::HE, this->p_, this->Tu_ ), @@ -227,17 +227,17 @@ Foam::heheuPsiThermo::heheuPsiThermo // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heheuPsiThermo::~heheuPsiThermo() +template +Foam::PsiuMulticomponentThermo::~PsiuMulticomponentThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::heheuPsiThermo::correct() +template +void Foam::PsiuMulticomponentThermo::correct() { - if (HeThermo::debug) + if (BaseThermo::debug) { InfoInFunction << endl; } @@ -247,16 +247,16 @@ void Foam::heheuPsiThermo::correct() calculate(); - if (HeThermo::debug) + if (BaseThermo::debug) { Info<< " Finished" << endl; } } -template +template Foam::tmp -Foam::heheuPsiThermo::heu +Foam::PsiuMulticomponentThermo::heu ( const scalarField& Tu, const labelList& cells @@ -264,8 +264,8 @@ Foam::heheuPsiThermo::heu { return this->cellSetProperty ( - &HeThermo::mixtureType::reactants, - &HeThermo::mixtureType::thermoMixtureType::HE, + &BaseThermo::mixtureType::reactants, + &BaseThermo::mixtureType::thermoMixtureType::HE, cells, UIndirectList(this->p_, cells), Tu @@ -273,9 +273,9 @@ Foam::heheuPsiThermo::heu } -template +template Foam::tmp -Foam::heheuPsiThermo::heu +Foam::PsiuMulticomponentThermo::heu ( const scalarField& Tu, const label patchi @@ -283,8 +283,8 @@ Foam::heheuPsiThermo::heu { return this->patchFieldProperty ( - &HeThermo::mixtureType::reactants, - &HeThermo::mixtureType::thermoMixtureType::HE, + &BaseThermo::mixtureType::reactants, + &BaseThermo::mixtureType::thermoMixtureType::HE, patchi, this->p_.boundaryField()[patchi], Tu @@ -292,16 +292,16 @@ Foam::heheuPsiThermo::heu } -template +template Foam::tmp -Foam::heheuPsiThermo::Tb() const +Foam::PsiuMulticomponentThermo::Tb() const { return this->volScalarFieldProperty ( "Tb", dimTemperature, - &HeThermo::mixtureType::products, - &HeThermo::mixtureType::thermoMixtureType::THE, + &BaseThermo::mixtureType::products, + &BaseThermo::mixtureType::thermoMixtureType::THE, this->he_, this->p_, this->T_ @@ -309,25 +309,25 @@ Foam::heheuPsiThermo::Tb() const } -template +template Foam::tmp -Foam::heheuPsiThermo::psiu() const +Foam::PsiuMulticomponentThermo::psiu() const { return this->volScalarFieldProperty ( "psiu", this->psi_.dimensions(), - &HeThermo::mixtureType::reactants, - &HeThermo::mixtureType::thermoMixtureType::psi, + &BaseThermo::mixtureType::reactants, + &BaseThermo::mixtureType::thermoMixtureType::psi, this->p_, this->Tu_ ); } -template +template Foam::tmp -Foam::heheuPsiThermo::psib() const +Foam::PsiuMulticomponentThermo::psib() const { const volScalarField Tb(this->Tb()); @@ -335,33 +335,33 @@ Foam::heheuPsiThermo::psib() const ( "psib", this->psi_.dimensions(), - &HeThermo::mixtureType::products, - &HeThermo::mixtureType::thermoMixtureType::psi, + &BaseThermo::mixtureType::products, + &BaseThermo::mixtureType::thermoMixtureType::psi, this->p_, Tb ); } -template +template Foam::tmp -Foam::heheuPsiThermo::muu() const +Foam::PsiuMulticomponentThermo::muu() const { return this->volScalarFieldProperty ( "muu", dimDynamicViscosity, - &HeThermo::mixtureType::reactants, - &HeThermo::mixtureType::transportMixtureType::mu, + &BaseThermo::mixtureType::reactants, + &BaseThermo::mixtureType::transportMixtureType::mu, this->p_, this->Tu_ ); } -template +template Foam::tmp -Foam::heheuPsiThermo::mub() const +Foam::PsiuMulticomponentThermo::mub() const { const volScalarField Tb(this->Tb()); @@ -369,8 +369,8 @@ Foam::heheuPsiThermo::mub() const ( "mub", dimDynamicViscosity, - &HeThermo::mixtureType::products, - &HeThermo::mixtureType::transportMixtureType::mu, + &BaseThermo::mixtureType::products, + &BaseThermo::mixtureType::transportMixtureType::mu, this->p_, Tb ); diff --git a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.H b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/PsiuMulticomponentThermo.H similarity index 86% rename from src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.H rename to src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/PsiuMulticomponentThermo.H index e2a6d67f8d..1790667160 100644 --- a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/heheuPsiThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/PsiuMulticomponentThermo.H @@ -22,21 +22,21 @@ License along with OpenFOAM. If not, see . Class - Foam::heheuPsiThermo + Foam::PsiuMulticomponentThermo Description Thermo implementation based on compressibility with additional unburnt thermodynamic state SourceFiles - heheuPsiThermo.C + PsiuMulticomponentThermo.C \*---------------------------------------------------------------------------*/ -#ifndef heheuPsiThermo_H -#define heheuPsiThermo_H +#ifndef PsiuMulticomponentThermo_H +#define PsiuMulticomponentThermo_H -#include "heThermo.H" +#include "BasicThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,13 +44,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class heheuPsiThermo Declaration + Class PsiuMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ -template -class heheuPsiThermo +template +class PsiuMulticomponentThermo : - public HeThermo + public BaseThermo { // Private Data @@ -72,14 +72,17 @@ public: // Constructors //- Construct from mesh and phase name - heheuPsiThermo(const fvMesh&, const word& phaseName); + PsiuMulticomponentThermo(const fvMesh&, const word& phaseName); //- Disallow default bitwise copy construction - heheuPsiThermo(const heheuPsiThermo&) = delete; + PsiuMulticomponentThermo + ( + const PsiuMulticomponentThermo& + ) = delete; //- Destructor - virtual ~heheuPsiThermo(); + virtual ~PsiuMulticomponentThermo(); // Member Functions @@ -149,7 +152,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const heheuPsiThermo&) = delete; + void operator=(const PsiuMulticomponentThermo&) = delete; }; @@ -160,7 +163,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * #ifdef NoRepository - #include "heheuPsiThermo.C" + #include "PsiuMulticomponentThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.C b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.C index 5bc0f76fdc..0056dccbe0 100644 --- a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.C +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.C @@ -37,7 +37,10 @@ namespace Foam defineRunTimeSelectionTable(psiuMulticomponentThermo, fvMesh); } -const Foam::word Foam::psiuMulticomponentThermo::heThermoName("heheuPsiThermo"); +const Foam::word Foam::psiuMulticomponentThermo::derivedThermoName +( + "heheuPsiThermo" +); // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.H b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.H index eb4c6bcf8b..4cbfc94bdb 100644 --- a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermo.H @@ -40,6 +40,7 @@ SourceFiles #define psiuMulticomponentThermo_H #include "psiThermo.H" +#include "PsiuMulticomponentThermo.H" #include "speciesTable.H" #include "GeometricFieldListSlicer.H" @@ -48,9 +49,6 @@ SourceFiles namespace Foam { -template class heThermo; -template class heheuPsiThermo; - /*---------------------------------------------------------------------------*\ Class psiuMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ @@ -86,10 +84,11 @@ public: //- The derived type template - using heThermoType = heheuPsiThermo>; + using DerivedThermoType = + PsiuMulticomponentThermo>; //- The derived name - static const word heThermoName; + static const word derivedThermoName; //- Runtime type information diff --git a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermoI.H b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermoI.H index f50b315acf..09760d4a10 100644 --- a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermoI.H +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermoI.H @@ -23,8 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#include "FieldListSlice.H" #include "psiuMulticomponentThermo.H" +#include "FieldListSlice.H" // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermos.C b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermos.C index 08926b1811..dedea9383e 100644 --- a/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermos.C +++ b/src/thermophysicalModels/multicomponentThermo/psiuMulticomponentThermo/psiuMulticomponentThermos.C @@ -23,16 +23,15 @@ License \*---------------------------------------------------------------------------*/ +#include "psiuMulticomponentThermo.H" + #include "egrMixture.H" #include "homogeneousMixture.H" #include "inhomogeneousMixture.H" #include "veryInhomogeneousMixture.H" -#include "psiThermo.H" -#include "psiuMulticomponentThermo.H" -#include "heheuPsiThermo.H" - #include "forAbsoluteGases.H" + #include "makeThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.H b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.H index 7931836805..7afa64f81b 100644 --- a/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.H +++ b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermo.H @@ -47,11 +47,6 @@ SourceFiles namespace Foam { -template class heThermo; -template class heRhoThermo; -template class heMulticomponentThermo; -template class heFluidMulticomponentThermo; - /*---------------------------------------------------------------------------*\ Class rhoMulticomponentThermo Declaration \*---------------------------------------------------------------------------*/ @@ -73,14 +68,14 @@ public: //- The derived type template - using heThermoType = - heFluidMulticomponentThermo + using DerivedThermoType = + FluidMulticomponentThermo < - heMulticomponentThermo + MulticomponentThermo < - heRhoThermo + RhoThermo < - heThermo + BasicThermo > > >; diff --git a/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C index 296139c516..62deb11d03 100644 --- a/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C +++ b/src/thermophysicalModels/multicomponentThermo/rhoMulticomponentThermo/rhoMulticomponentThermos.C @@ -23,20 +23,17 @@ License \*---------------------------------------------------------------------------*/ +#include "rhoMulticomponentThermo.H" + #include "coefficientMulticomponentMixture.H" #include "coefficientWilkeMulticomponentMixture.H" #include "valueMulticomponentMixture.H" #include "singleComponentMixture.H" -#include "rhoThermo.H" -#include "rhoMulticomponentThermo.H" -#include "heRhoThermo.H" -#include "heMulticomponentThermo.H" -#include "heFluidMulticomponentThermo.H" - #include "forGases.H" #include "forLiquids.H" #include "forTabulated.H" + #include "makeFluidMulticomponentThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.C similarity index 86% rename from src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C rename to src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.C index 8603353aea..a715c64a6b 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.C @@ -23,12 +23,12 @@ License \*---------------------------------------------------------------------------*/ -#include "heSolidThermo.H" +#include "SolidThermo.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::heSolidThermo::calculate() +template +void Foam::SolidThermo::calculate() { const bool isotropic = this->isotropic(); @@ -46,10 +46,10 @@ void Foam::heSolidThermo::calculate() { auto composition = this->cellComposition(celli); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -117,10 +117,10 @@ void Foam::heSolidThermo::calculate() { auto composition = this->patchFaceComposition(patchi, facei); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -148,10 +148,10 @@ void Foam::heSolidThermo::calculate() { auto composition = this->patchFaceComposition(patchi, facei); - const typename HeThermo::mixtureType::thermoMixtureType& + const typename BaseThermo::mixtureType::thermoMixtureType& thermoMixture = this->thermoMixture(composition); - const typename HeThermo::mixtureType::transportMixtureType& + const typename BaseThermo::mixtureType::transportMixtureType& transportMixture = this->transportMixture(composition, thermoMixture); @@ -179,19 +179,19 @@ void Foam::heSolidThermo::calculate() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::heSolidThermo::heSolidThermo +template +Foam::SolidThermo::SolidThermo ( const fvMesh& mesh, const word& phaseName ) : - HeThermo(mesh, phaseName), + BaseThermo(mesh, phaseName), Kappa_ ( IOobject ( - HeThermo::phasePropertyName("Kappa", phaseName), + BaseThermo::phasePropertyName("Kappa", phaseName), mesh.time().name(), mesh, IOobject::NO_READ, @@ -207,33 +207,33 @@ Foam::heSolidThermo::heSolidThermo // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::heSolidThermo::~heSolidThermo() +template +Foam::SolidThermo::~SolidThermo() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::heSolidThermo::correct() +template +void Foam::SolidThermo::correct() { - if (HeThermo::debug) + if (BaseThermo::debug) { InfoInFunction << endl; } calculate(); - if (HeThermo::debug) + if (BaseThermo::debug) { Info<< " Finished" << endl; } } -template +template const Foam::volVectorField& -Foam::heSolidThermo::Kappa() const +Foam::SolidThermo::Kappa() const { return Kappa_; } diff --git a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.H similarity index 83% rename from src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H rename to src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.H index c45881a8ee..e9fe4e99c8 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.H +++ b/src/thermophysicalModels/solidThermo/solidThermo/SolidThermo.H @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::heSolidThermo + Foam::SolidThermo Description Thermo implementation for a solid SourceFiles - heSolidThermo.C + SolidThermo.C \*---------------------------------------------------------------------------*/ -#ifndef heSolidThermo_H -#define heSolidThermo_H +#ifndef SolidThermo_H +#define SolidThermo_H -#include "heThermo.H" +#include "BasicThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -43,13 +43,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class heSolidThermo Declaration + Class SolidThermo Declaration \*---------------------------------------------------------------------------*/ -template -class heSolidThermo +template +class SolidThermo : - public HeThermo + public BaseThermo { protected: @@ -70,14 +70,14 @@ public: // Constructors //- Construct from mesh and phase name - heSolidThermo(const fvMesh&, const word& phaseName); + SolidThermo(const fvMesh&, const word& phaseName); //- Disallow default bitwise copy construction - heSolidThermo(const heSolidThermo&) = delete; + SolidThermo(const SolidThermo&) = delete; //- Destructor - virtual ~heSolidThermo(); + virtual ~SolidThermo(); // Member Functions @@ -88,7 +88,7 @@ public: //- Return true if thermal conductivity is isotropic virtual bool isotropic() const { - return HeThermo::mixtureType::thermoType::isotropic; + return BaseThermo::mixtureType::thermoType::isotropic; } //- Anisotropic thermal conductivity [W/m/K] @@ -98,7 +98,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const heSolidThermo&) = delete; + void operator=(const SolidThermo&) = delete; }; @@ -109,7 +109,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "heSolidThermo.C" + #include "SolidThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C index 4a0c79bb89..0aa347aff0 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.C @@ -34,7 +34,7 @@ namespace Foam defineRunTimeSelectionTable(solidThermo, fvMesh); } -const Foam::word Foam::solidThermo::heThermoName("heSolidThermo"); +const Foam::word Foam::solidThermo::derivedThermoName("heSolidThermo"); // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -86,17 +86,6 @@ Foam::autoPtr Foam::solidThermo::New } -// Foam::autoPtr Foam::solidThermo::New -// ( -// const fvMesh& mesh, -// const dictionary& dict, -// const word& phaseName -// ) -// { -// return basicThermo::New(mesh, dict, phaseName); -// } - - // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::solidThermo::~solidThermo() diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H index 152e55839b..919f02bfc3 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermo.H @@ -39,6 +39,7 @@ SourceFiles #define solidThermo_H #include "pureThermo.H" +#include "SolidThermo.H" #include "uniformGeometricFields.H" #include "fvScalarMatrix.H" @@ -47,9 +48,6 @@ SourceFiles namespace Foam { -template class heThermo; -template class heSolidThermo; - /*---------------------------------------------------------------------------*\ Class solidThermo Declaration \*---------------------------------------------------------------------------*/ @@ -73,10 +71,11 @@ public: //- The derived type template - using heThermoType = heSolidThermo>; + using DerivedThermoType = + SolidThermo>; //- The derived name - static const word heThermoName; + static const word derivedThermoName; //- Runtime type information diff --git a/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C b/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C index 389b1f98f8..ac03ecd6ba 100644 --- a/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C +++ b/src/thermophysicalModels/solidThermo/solidThermo/solidThermos.C @@ -24,10 +24,11 @@ License \*---------------------------------------------------------------------------*/ #include "solidThermo.H" -#include "heSolidThermo.H" + #include "pureMixture.H" #include "forSolids.H" + #include "makeThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/include/makeThermo.H b/src/thermophysicalModels/specie/include/makeThermo.H index 3986f3bf5b..d009a36399 100644 --- a/src/thermophysicalModels/specie/include/makeThermo.H +++ b/src/thermophysicalModels/specie/include/makeThermo.H @@ -33,6 +33,7 @@ Description #define makeThermo_H #include "basicThermo.H" +#include "NamedThermo.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -40,14 +41,14 @@ Description #define defineThermo(BaseThermo, Mixture, ThermoPhysics) \ \ typedef \ - namedHeThermo>> \ - BaseThermo##HeThermo##Mixture##ThermoPhysics; \ + NamedThermo>> \ + BaseThermo##Mixture##ThermoPhysics; \ \ defineTemplateTypeNameAndDebugWithName \ ( \ - BaseThermo##HeThermo##Mixture##ThermoPhysics, \ + BaseThermo##Mixture##ThermoPhysics, \ ( \ - BaseThermo::heThermoName + "<" \ + BaseThermo::derivedThermoName + "<" \ + Mixture::typeName() + ">" \ ).c_str(), \ 0 \ @@ -59,7 +60,7 @@ Description addToRunTimeSelectionTable \ ( \ SelectThermo, \ - BaseThermo##HeThermo##Mixture##ThermoPhysics, \ + BaseThermo##Mixture##ThermoPhysics, \ fvMesh \ );