diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 58de0b6f779223725a3af748d44407c9a78ae15f..e6c26f52cb7c9f4d99e550e8cf54050802948323 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -36,14 +36,14 @@ Description
#include "IFstream.H"
#include "OSspecific.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "absoluteEnthalpy.H"
#include "janafThermo.H"
#include "perfectGas.H"
using namespace Foam;
-typedef specieThermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
+typedef species::thermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index dde7e8678a9882ee74f918776b35157ab81db21b..57f7aad30842a8fba7b22a97f5445c113dd2e02f 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -35,7 +35,7 @@ Description
#include "OSspecific.H"
#include "IOmanip.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "absoluteEnthalpy.H"
#include "janafThermo.H"
#include "perfectGas.H"
@@ -43,7 +43,7 @@ Description
using namespace Foam;
-typedef specieThermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
+typedef species::thermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Main program:
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index 8cf23718981fbeb74f1588a9b4a482f2db30caa5..3a11369da7c1d3af2722baaaab0085d0bd3089c9 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -38,14 +38,14 @@ Description
#include "OSspecific.H"
#include "IOmanip.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "absoluteEnthalpy.H"
#include "janafThermo.H"
#include "perfectGas.H"
using namespace Foam;
-typedef specieThermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
+typedef species::thermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 728897c88a628c8910058f774585e74f250e8b6c..0b00e865cac760089b60662b90830d22d8d8d327 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -35,7 +35,7 @@ Description
#include "IFstream.H"
#include "OSspecific.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "absoluteEnthalpy.H"
#include "janafThermo.H"
#include "perfectGas.H"
@@ -43,7 +43,7 @@ Description
using namespace Foam;
-typedef specieThermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
+typedef species::thermo<janafThermo<perfectGas>, absoluteEnthalpy> thermo;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/etc/controlDict b/etc/controlDict
index f1451c59d7d942d0f0ad4c72ae372a8aeedb1a50..c4cf09edb23d802eccb94d4c4be452dc8b354d20 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -510,30 +510,30 @@ DebugSwitches
gradientUnburntEnthalpy 0;
granularPressureModel 0;
hCombustionThermo 0;
- hMixtureThermo<homogeneousMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
- hMixtureThermo<inhomogeneousMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hMixtureThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
- hMixtureThermo<multiComponentMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
+ hMixtureThermo<homogeneousMixture<constTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hMixtureThermo<homogeneousMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
+ hMixtureThermo<inhomogeneousMixture<constTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hMixtureThermo<inhomogeneousMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
+ hMixtureThermo<multiComponentMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
hMixtureThermo<reactingMixture> 0;
- hMixtureThermo<veryInhomogeneousMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
- hThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
+ hMixtureThermo<veryInhomogeneousMixture<constTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
+ hThermo<pureMixture<constTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hThermo<pureMixture<sutherlandTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hThermo<pureMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
harmonic 0;
heatTransferModel 0;
hexCellLooper 0;
hexRef8 0;
hhuCombustionThermo 0;
- hhuMixtureThermo<egrMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hhuMixtureThermo<egrMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
- hhuMixtureThermo<homogeneousMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hhuMixtureThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
- hhuMixtureThermo<inhomogeneousMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hhuMixtureThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
- hhuMixtureThermo<veryInhomogeneousMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>>> 0;
- hhuMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>> 0;
+ hhuMixtureThermo<egrMixture<constTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hhuMixtureThermo<egrMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
+ hhuMixtureThermo<homogeneousMixture<constTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hhuMixtureThermo<homogeneousMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
+ hhuMixtureThermo<inhomogeneousMixture<constTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hhuMixtureThermo<inhomogeneousMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
+ hhuMixtureThermo<veryInhomogeneousMixture<constTransport<thermo<hConstThermo<perfectGas>>>>> 0;
+ hhuMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>>> 0;
hierarchical 0;
hollowConeInjector 0;
iC3H8O 0;
@@ -711,9 +711,9 @@ DebugSwitches
processor 0;
processorLduInterface 0;
processorLduInterfaceField 0;
- pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>>>> 0;
- pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>> 0;
- pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>> 0;
+ pureMixture<constTransport<thermo<hConstThermo<perfectGas>>>> 0;
+ pureMixture<sutherlandTransport<thermo<hConstThermo<perfectGas>>>> 0;
+ pureMixture<sutherlandTransport<thermo<janafThermo<perfectGas>>>> 0;
quadratic 0;
quadraticFit 0;
quadraticLinearFit 0;
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
index 386680807e276dfcaac612f1b806a14e8649f939..7ad5ded31eb07b7e5f096dbfc4b6eeba786e4354 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/temperatureThermoBaffle/temperatureThermoBaffleFvPatchScalarField.H
@@ -58,7 +58,7 @@ Description
<pureSolidMixture
<constIsoSolidTransport
<constSolidRad
- <specieThermo
+ <thermo
<hConstThermo<incompressible>,sensibleEnthalpy>
>
>
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index d25c9c1ef494b691b9a514df0814f90f6b516ff2..079ffd7d34fd02f28f3a22178f6e46277c11fd93 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -105,6 +105,7 @@ public:
//- Selector
static autoPtr<basicThermo> New(const fvMesh&);
+
//- Destructor
virtual ~basicThermo();
diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
index d1b7f23bdfb9f3431bd403089986596c87a42188..7f33cdfdd328137c6cb95cd62db332451dc470e3 100644
--- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H
@@ -80,6 +80,7 @@ public:
//- Selector
static autoPtr<fluidThermo> New(const fvMesh&);
+
//- Destructor
virtual ~fluidThermo();
diff --git a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
index 41ab0bdf667e6086c72db9eb01027554914e1b77..abdd0a81bc996bf6e5db328ec63961b8162350ce 100644
--- a/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
+++ b/src/thermophysicalModels/basic/fluidThermo/makeThermo.H
@@ -44,7 +44,7 @@ typedef Cthermo \
< \
Transport \
< \
- specieThermo \
+ species::thermo \
< \
Thermo \
< \
@@ -64,13 +64,13 @@ defineTemplateTypeNameAndDebugWithName \
#Mixture \
"<" \
#Transport \
- "<specieThermo<" \
+ "<" \
#Thermo \
"<" \
#EqnOfState \
">," \
#Type \
- ">>>>", \
+ ">>>", \
0 \
); \
\
@@ -93,7 +93,7 @@ addToRunTimeSelectionTable \
\
typedef polynomialTransport \
< \
- specieThermo \
+ species::thermo \
< \
hPolynomialThermo \
< \
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
index af89aec73a7c433d77ab1ae350304b75c4033833..a35994147f170d675c202f5453e9fc1e033007ff 100644
--- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
@@ -41,7 +41,7 @@ Description
#include "janafThermo.H"
#include "sensibleInternalEnergy.H"
#include "sensibleEnthalpy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H b/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H
index 54bda34f2b98cafe7413a9122e949ff43221cda3..91fa87ea8df8157a2d8dffccf15e256499ada6bb 100644
--- a/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H
@@ -39,19 +39,19 @@ Description
#define makeBasicMixture(Mixture,Transport,Type,Thermo,EqnOfState) \
\
typedef \
- Mixture<Transport<specieThermo<Thermo<EqnOfState>, Type> > > \
+ Mixture<Transport<species::thermo<Thermo<EqnOfState>, Type> > > \
Mixture##Transport##Type##Thermo##EqnOfState; \
\
defineTemplateTypeNameAndDebugWithName \
(Mixture##Transport##Type##Thermo##EqnOfState, \
- #Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">,"#Type">>>", 0)
+ #Mixture"<"#Transport"<"#Thermo"<"#EqnOfState">,"#Type">>", 0)
#define makeBasicPolyMixture(Mixture,Order,Type) \
\
typedef polynomialTransport \
< \
- specieThermo \
+ species::thermo \
< \
hPolynomialThermo \
< \
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
index b5a48fc315479656918a4a463f52a721a69e4e08..c997caab4b9b5adf801a3050db8a909aca1a77c0 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
@@ -33,7 +33,7 @@ License
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
#include "sensibleInternalEnergy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
diff --git a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C
index 0329b3661977f527d59984a77e00fe91645cbf2c..879ff13360af6a786fa677e2cdb9ae8677101253 100644
--- a/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C
+++ b/src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C
@@ -32,33 +32,54 @@ Foam::autoPtr<Foam::psiThermo> Foam::psiThermo::New
const fvMesh& mesh
)
{
- // get model name, but do not register the dictionary
- // otherwise it is registered in the database twice
- const word modelType
+ IOdictionary thermoDict
(
- IOdictionary
+ IOobject
(
- IOobject
- (
- "thermophysicalProperties",
- mesh.time().constant(),
- mesh,
- IOobject::MUST_READ_IF_MODIFIED,
- IOobject::NO_WRITE,
- false
- )
- ).lookup("thermoType")
+ "thermophysicalProperties",
+ mesh.time().constant(),
+ mesh,
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE,
+ false
+ )
);
- Info<< "Selecting thermodynamics package " << modelType << endl;
+ word thermoTypeName;
+
+ if (thermoDict.isDict("thermoType"))
+ {
+ const dictionary& thermoTypeDict(thermoDict.subDict("thermoType"));
+
+ word type(thermoTypeDict.lookup("type"));
+ word mixture(thermoTypeDict.lookup("mixture"));
+ word transport(thermoTypeDict.lookup("transport"));
+ word thermo(thermoTypeDict.lookup("thermo"));
+ word equationOfState(thermoTypeDict.lookup("equationOfState"));
+ word energy(thermoTypeDict.lookup("energy"));
+
+ thermoTypeName =
+ type + '<'
+ + mixture + '<'
+ + transport + '<'
+ + thermo + '<'
+ + equationOfState + ">,"
+ + energy + ">>>";
+ }
+ else
+ {
+ thermoTypeName = word(thermoDict.lookup("thermoType"));
+ }
+
+ Info<< "Selecting thermodynamics package " << thermoTypeName << endl;
fvMeshConstructorTable::iterator cstrIter =
- fvMeshConstructorTablePtr_->find(modelType);
+ fvMeshConstructorTablePtr_->find(thermoTypeName);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorIn("psiThermo::New(const fvMesh&)")
- << "Unknown psiThermo type " << modelType << nl << nl
+ << "Unknown psiThermo type " << thermoTypeName << nl << nl
<< "Valid psiThermo types are:" << nl
<< fvMeshConstructorTablePtr_->sortedToc() << nl
<< exit(FatalError);
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
index b39ad010d4478c0c6380eec98585fb46b7a0a352..d33dadce50bfd46d50798f91e92f3b320f0b63a4 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
+++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
@@ -34,7 +34,7 @@ License
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
#include "sensibleInternalEnergy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
diff --git a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
index 9f2de27639e276c7cada42de52a0c5f5fb640c91..c0f38eb8f0c242285780c89bb18aad3cb2e3f07e 100644
--- a/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/makeReactionThermo.H
@@ -41,7 +41,7 @@ typedef MixtureThermo \
< \
Transport \
< \
- specieThermo \
+ species::thermo \
< \
Thermo \
< \
@@ -62,13 +62,13 @@ defineTemplateTypeNameAndDebugWithName \
#Mixture \
"<" \
#Transport \
- "<specieThermo<" \
+ "<" \
#Thermo \
"<" \
#EqnOfState \
">," \
#Type \
- ">>>>", \
+ ">>>", \
0 \
); \
\
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index 3583588e0065e438a19e17a062c5809e418098c8..e307aedf5ab81a13c8aee770fccc9378996e01da 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -71,20 +71,20 @@ Foam::multiComponentMixture<ThermoType>::multiComponentMixture
(
const dictionary& thermoDict,
const wordList& specieNames,
- const HashPtrTable<ThermoType>& specieThermoData,
+ const HashPtrTable<ThermoType>& thermoData,
const fvMesh& mesh
)
:
basicMultiComponentMixture(thermoDict, specieNames, mesh),
speciesData_(species_.size()),
- mixture_("mixture", *specieThermoData[specieNames[0]])
+ mixture_("mixture", *thermoData[specieNames[0]])
{
forAll(species_, i)
{
speciesData_.set
(
i,
- new ThermoType(*specieThermoData[species_[i]])
+ new ThermoType(*thermoData[species_[i]])
);
}
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
index 50164015b0ad34ce551576118ceacb1e5faf3d9a..4017a5fd13b8c39d40ed6aa14898e1f8ef175bbc 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
@@ -87,7 +87,7 @@ public:
(
const dictionary&,
const wordList& specieNames,
- const HashPtrTable<ThermoType>& specieThermoData,
+ const HashPtrTable<ThermoType>& thermoData,
const fvMesh&
);
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C
index 159a1e8ef038f4d3255996e8f1f0280cc7d145d2..96bc651bb0a656f3d8ccc650a5130b8426bfc83a 100644
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C
@@ -33,7 +33,7 @@ License
#include "hConstThermo.H"
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
diff --git a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C b/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
index bf42991d9cd6d887a46a0d9378ef1898cdca53af..f915f5a6d43b46be8f228bdeae2778abb3455662 100644
--- a/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
@@ -34,7 +34,7 @@ License
#include "hConstThermo.H"
#include "janafThermo.H"
#include "absoluteEnthalpy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
diff --git a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C
index 38e50afd57e1303ebc15057e21c2a9a96cd44088..b31ed3e253ab43276f22c04d6d07f3aad7b4553f 100644
--- a/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C
@@ -34,7 +34,7 @@ License
#include "hConstThermo.H"
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
diff --git a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H
index 9f15c3fe0f7d9553275f25b5a61e0d56d4f31cfd..7c5090a99a5adb3c0198b8d16542ccc825386a06 100644
--- a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H
+++ b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H
@@ -44,7 +44,7 @@ Description
#include "constSolidRad.H"
#include "sensibleEnthalpy.H"
-#include "specieThermo.H"
+#include "thermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,7 +55,7 @@ namespace Foam
<
constSolidRad
<
- specieThermo
+ species::thermo
<
hConstThermo
<
@@ -72,7 +72,7 @@ namespace Foam
<
constSolidRad
<
- specieThermo
+ species::thermo
<
hExponentialThermo
<
diff --git a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C b/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C
index 6d7ffa538f15eb2ddf22083bc756b4da0e2fd47c..0b7e68e328b96bc0950fa13df2b9557f3803a282 100644
--- a/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C
+++ b/src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C
@@ -43,7 +43,7 @@ License
#include "sensibleEnthalpy.H"
#include "sensibleInternalEnergy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "heThermo.H"
diff --git a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C
index 67c91ab806fff24c5cfd19f20c4f58e80d81fc3f..49618c74417c7420dfba80aaadf7311c9f5157f0 100644
--- a/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C
+++ b/src/thermophysicalModels/solidThermo/mixtures/basicSolidMixture/basicSolidMixtures.C
@@ -43,7 +43,7 @@ Description
#include "sensibleInternalEnergy.H"
#include "sensibleEnthalpy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "pureSolidMixture.H"
#include "multiComponentSolidMixture.H"
diff --git a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
index 6ff422db118ff538a9252bb0ed0cf014009a08a0..ca08fb88e835e868613460330ab929255e0b9cfa 100644
--- a/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
+++ b/src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
@@ -49,7 +49,7 @@ typedef Cthermo \
< \
Radiation \
< \
- specieThermo \
+ species::thermo \
< \
Thermo \
< \
@@ -73,14 +73,13 @@ defineTemplateTypeNameAndDebugWithName \
#Transport \
"<" \
#Radiation \
- "<specieThermo<" \
+ "<" \
#Thermo \
"<" \
#Rho \
">," \
#Type \
- ">>>>" \
- ">", \
+ ">>>>", \
0 \
); \
\
@@ -91,7 +90,7 @@ typedef Mixture \
< \
Radiation \
< \
- specieThermo \
+ species::thermo \
< \
Thermo \
< \
@@ -113,13 +112,13 @@ defineTemplateTypeNameAndDebugWithName \
#Transport \
"<" \
#Radiation \
- "<specieThermo<" \
+ "<" \
#Thermo \
"<" \
#Rho \
">," \
#Type \
- ">>>>", \
+ ">>>", \
0 \
); \
\
@@ -131,7 +130,7 @@ addToRunTimeSelectionTable \
); \
addToRunTimeSelectionTable \
( \
- basicThermo, \
+ basicThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo##Rho##BaseThermo, \
fvMesh \
); \
diff --git a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
index 53224e8f6f57f63ccab1d93975349fb732ac06ab..d4cefcc05f5d69dabe63b5a74e2af3fefae9e0d3 100644
--- a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
+++ b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H
@@ -37,7 +37,7 @@ Description
#include "hConstThermo.H"
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "sutherlandTransport.H"
#include "constTransport.H"
@@ -52,7 +52,7 @@ namespace Foam
typedef
constTransport
<
- specieThermo
+ species::thermo
<
hConstThermo
<
@@ -65,7 +65,7 @@ namespace Foam
typedef
sutherlandTransport
<
- specieThermo
+ species::thermo
<
janafThermo
<
@@ -78,7 +78,7 @@ namespace Foam
typedef
constTransport
<
- specieThermo
+ species::thermo
<
hConstThermo
<
@@ -91,7 +91,7 @@ namespace Foam
typedef
sutherlandTransport
<
- specieThermo
+ species::thermo
<
janafThermo
<
@@ -104,7 +104,7 @@ namespace Foam
typedef
polynomialTransport
<
- specieThermo
+ species::thermo
<
hPolynomialThermo
<
diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
index a5ed960fa5cd364c4fa15dbb1b9e703cc1522155..be1a76cf004aae77fb26f4e3142e61ae53ee117d 100644
--- a/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
+++ b/src/thermophysicalModels/specie/reaction/reactions/makeReaction.H
@@ -38,7 +38,7 @@ Description
#include "ReversibleReaction.H"
#include "NonEquilibriumReversibleReaction.H"
-#include "specieThermo.H"
+#include "thermo.H"
#include "sutherlandTransport.H"
#include "janafThermo.H"
diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
index 0e3501a4b743d507eb35adea9f6fb06926b84482..378a39c059302236dc4124d5db69732079173a9b 100644
--- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
+++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H
@@ -37,7 +37,7 @@ SourceFiles
#ifndef eConstThermo_H
#define eConstThermo_H
-#include "specieThermo.H"
+#include "thermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C b/src/thermophysicalModels/specie/thermo/thermo/thermo.C
similarity index 78%
rename from src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C
rename to src/thermophysicalModels/specie/thermo/thermo/thermo.C
index 87718f7b2fae22df73a1fe1edb2cd7b72b080364..400c2d4a88f8f646fbbc51057b3ed09916e2469b 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.C
@@ -23,31 +23,31 @@ License
\*---------------------------------------------------------------------------*/
-#include "specieThermo.H"
+#include "thermo.H"
#include "IOstreams.H"
/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
template<class Thermo, template<class> class Type>
-const Foam::scalar Foam::specieThermo<Thermo, Type>::tol_ = 1.0e-4;
+const Foam::scalar Foam::species::thermo<Thermo, Type>::tol_ = 1.0e-4;
template<class Thermo, template<class> class Type>
-const int Foam::specieThermo<Thermo, Type>::maxIter_ = 100;
+const int Foam::species::thermo<Thermo, Type>::maxIter_ = 100;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo, template<class> class Type>
-Foam::specieThermo<Thermo, Type>::specieThermo(Istream& is)
+Foam::species::thermo<Thermo, Type>::thermo(Istream& is)
:
Thermo(is)
{
- is.check("specieThermo<Thermo, Type>::specieThermo(Istream&)");
+ is.check("thermo<Thermo, Type>::thermo(Istream&)");
}
template<class Thermo, template<class> class Type>
-Foam::specieThermo<Thermo, Type>::specieThermo(const dictionary& dict)
+Foam::species::thermo<Thermo, Type>::thermo(const dictionary& dict)
:
Thermo(dict)
{}
@@ -56,7 +56,7 @@ Foam::specieThermo<Thermo, Type>::specieThermo(const dictionary& dict)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Thermo, template<class> class Type>
-void Foam::specieThermo<Thermo, Type>::write(Ostream& os) const
+void Foam::species::thermo<Thermo, Type>::write(Ostream& os) const
{
Thermo::write(os);
}
@@ -65,14 +65,14 @@ void Foam::specieThermo<Thermo, Type>::write(Ostream& os) const
// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * //
template<class Thermo, template<class> class Type>
-Foam::Ostream& Foam::operator<<
+Foam::Ostream& Foam::species::operator<<
(
- Ostream& os, const specieThermo<Thermo, Type>& st
+ Ostream& os, const thermo<Thermo, Type>& st
)
{
os << static_cast<const Thermo&>(st);
- os.check("Ostream& operator<<(Ostream&, const specieThermo&)");
+ os.check("Ostream& operator<<(Ostream&, const thermo&)");
return os;
}
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
similarity index 84%
rename from src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
rename to src/thermophysicalModels/specie/thermo/thermo/thermo.H
index 6d5e1fd86ae5e4ba07c1cd1ca3fcf542baa053b9..07c84553e6bb5e3de874baf9eb6a3a7cb88898cb 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermo.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::specieThermo
+ Foam::thermo
Description
Basic thermodynamics type based on the use of fitting functions for
@@ -30,68 +30,70 @@ Description
properties are derived from these primitive functions.
SourceFiles
- specieThermoI.H
- specieThermo.C
+ thermoI.H
+ thermo.C
\*---------------------------------------------------------------------------*/
-#ifndef specieThermo_H
-#define specieThermo_H
+#ifndef thermo_H
+#define thermo_H
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
+namespace species
+{
// Forward declaration of friend functions and operators
-template<class Thermo, template<class> class Type> class specieThermo;
+template<class Thermo, template<class> class Type> class thermo;
template<class Thermo, template<class> class Type>
-inline specieThermo<Thermo, Type> operator+
+inline thermo<Thermo, Type> operator+
(
- const specieThermo<Thermo, Type>&,
- const specieThermo<Thermo, Type>&
+ const thermo<Thermo, Type>&,
+ const thermo<Thermo, Type>&
);
template<class Thermo, template<class> class Type>
-inline specieThermo<Thermo, Type> operator-
+inline thermo<Thermo, Type> operator-
(
- const specieThermo<Thermo, Type>&,
- const specieThermo<Thermo, Type>&
+ const thermo<Thermo, Type>&,
+ const thermo<Thermo, Type>&
);
template<class Thermo, template<class> class Type>
-inline specieThermo<Thermo, Type> operator*
+inline thermo<Thermo, Type> operator*
(
const scalar,
- const specieThermo<Thermo, Type>&
+ const thermo<Thermo, Type>&
);
template<class Thermo, template<class> class Type>
-inline specieThermo<Thermo, Type> operator==
+inline thermo<Thermo, Type> operator==
(
- const specieThermo<Thermo, Type>&,
- const specieThermo<Thermo, Type>&
+ const thermo<Thermo, Type>&,
+ const thermo<Thermo, Type>&
);
template<class Thermo, template<class> class Type>
Ostream& operator<<
(
Ostream&,
- const specieThermo<Thermo, Type>&
+ const thermo<Thermo, Type>&
);
/*---------------------------------------------------------------------------*\
- Class specieThermo Declaration
+ Class thermo Declaration
\*---------------------------------------------------------------------------*/
template<class Thermo, template<class> class Type>
-class specieThermo
+class thermo
:
public Thermo,
- public Type<specieThermo<Thermo, Type> >
+ public Type<thermo<Thermo, Type> >
{
// Private data
@@ -112,9 +114,9 @@ class specieThermo
scalar f,
scalar p,
scalar T0,
- scalar (specieThermo::*F)(const scalar, const scalar) const,
- scalar (specieThermo::*dFdT)(const scalar, const scalar) const,
- scalar (specieThermo::*limit)(const scalar) const
+ scalar (thermo::*F)(const scalar, const scalar) const,
+ scalar (thermo::*dFdT)(const scalar, const scalar) const,
+ scalar (thermo::*limit)(const scalar) const
) const;
@@ -123,16 +125,16 @@ public:
// Constructors
//- construct from components
- inline specieThermo(const Thermo& sp);
+ inline thermo(const Thermo& sp);
//- Construct from Istream
- specieThermo(Istream&);
+ thermo(Istream&);
//- Construct from dictionary
- specieThermo(const dictionary& dict);
+ thermo(const dictionary& dict);
//- Construct as named copy
- inline specieThermo(const word& name, const specieThermo&);
+ inline thermo(const word& name, const thermo&);
// Member Functions
@@ -330,36 +332,36 @@ public:
// Member operators
- inline void operator+=(const specieThermo&);
- inline void operator-=(const specieThermo&);
+ inline void operator+=(const thermo&);
+ inline void operator-=(const thermo&);
inline void operator*=(const scalar);
// Friend operators
- friend specieThermo operator+ <Thermo, Type>
+ friend thermo operator+ <Thermo, Type>
(
- const specieThermo&,
- const specieThermo&
+ const thermo&,
+ const thermo&
);
- friend specieThermo operator- <Thermo, Type>
+ friend thermo operator- <Thermo, Type>
(
- const specieThermo&,
- const specieThermo&
+ const thermo&,
+ const thermo&
);
- friend specieThermo operator* <Thermo, Type>
+ friend thermo operator* <Thermo, Type>
(
const scalar s,
- const specieThermo&
+ const thermo&
);
- friend specieThermo operator== <Thermo, Type>
+ friend thermo operator== <Thermo, Type>
(
- const specieThermo&,
- const specieThermo&
+ const thermo&,
+ const thermo&
);
@@ -368,21 +370,22 @@ public:
friend Ostream& operator<< <Thermo, Type>
(
Ostream&,
- const specieThermo&
+ const thermo&
);
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+} // End namespace species
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#include "specieThermoI.H"
+#include "thermoI.H"
#ifdef NoRepository
-# include "specieThermo.C"
+# include "thermo.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
similarity index 62%
rename from src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H
rename to src/thermophysicalModels/specie/thermo/thermo/thermoI.H
index c18ea8aa27dff3b4fbc5072eb863b5b748207a10..b8642e960b65150a48d930b97c9949b030804445 100644
--- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H
+++ b/src/thermophysicalModels/specie/thermo/thermo/thermoI.H
@@ -23,12 +23,12 @@ License
\*---------------------------------------------------------------------------*/
-#include "specieThermo.H"
+#include "thermo.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Thermo, template<class> class Type>
-inline Foam::specieThermo<Thermo, Type>::specieThermo
+inline Foam::species::thermo<Thermo, Type>::thermo
(
const Thermo& sp
)
@@ -38,15 +38,15 @@ inline Foam::specieThermo<Thermo, Type>::specieThermo
template<class Thermo, template<class> class Type>
-inline Foam::scalar Foam::specieThermo<Thermo, Type>::T
+inline Foam::scalar Foam::species::thermo<Thermo, Type>::T
(
scalar f,
scalar p,
scalar T0,
- scalar (specieThermo<Thermo, Type>::*F)(const scalar, const scalar) const,
- scalar (specieThermo<Thermo, Type>::*dFdT)(const scalar, const scalar)
+ scalar (thermo<Thermo, Type>::*F)(const scalar, const scalar) const,
+ scalar (thermo<Thermo, Type>::*dFdT)(const scalar, const scalar)
const,
- scalar (specieThermo<Thermo, Type>::*limit)(const scalar) const
+ scalar (thermo<Thermo, Type>::*limit)(const scalar) const
) const
{
scalar Test = T0;
@@ -65,12 +65,12 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::T
{
FatalErrorIn
(
- "specieThermo<Thermo, Type>::T(scalar f, scalar T0, "
- "scalar (specieThermo<Thermo, Type>::*F)"
+ "thermo<Thermo, Type>::T(scalar f, scalar T0, "
+ "scalar (thermo<Thermo, Type>::*F)"
"(const scalar) const, "
- "scalar (specieThermo<Thermo, Type>::*dFdT)"
+ "scalar (thermo<Thermo, Type>::*dFdT)"
"(const scalar) const, "
- "scalar (specieThermo<Thermo, Type>::*limit)"
+ "scalar (thermo<Thermo, Type>::*limit)"
"(const scalar) const"
") const"
) << "Maximum number of iterations exceeded"
@@ -86,10 +86,10 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::T
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Thermo, template<class> class Type>
-inline Foam::specieThermo<Thermo, Type>::specieThermo
+inline Foam::species::thermo<Thermo, Type>::thermo
(
const word& name,
- const specieThermo& st
+ const thermo& st
)
:
Thermo(name, st)
@@ -100,23 +100,23 @@ inline Foam::specieThermo<Thermo, Type>::specieThermo
template<class Thermo, template<class> class Type>
inline Foam::word
-Foam::specieThermo<Thermo, Type>::heName()
+Foam::species::thermo<Thermo, Type>::heName()
{
- return Type<specieThermo<Thermo, Type> >::name();
+ return Type<thermo<Thermo, Type> >::name();
}
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::he(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::he(const scalar p, const scalar T) const
{
- return Type<specieThermo<Thermo, Type> >::he(*this, p, T);
+ return Type<thermo<Thermo, Type> >::he(*this, p, T);
}
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::cv(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::cv(const scalar p, const scalar T) const
{
return this->cp(p, T) - this->cpMcv(p, T);
}
@@ -124,15 +124,15 @@ Foam::specieThermo<Thermo, Type>::cv(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::cpv(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::cpv(const scalar p, const scalar T) const
{
- return Type<specieThermo<Thermo, Type> >::cpv(*this, p, T);
+ return Type<thermo<Thermo, Type> >::cpv(*this, p, T);
}
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::gamma(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::gamma(const scalar p, const scalar T) const
{
scalar cp = this->cp(p, T);
return cp/(cp - this->cpMcv(p, T));
@@ -141,15 +141,19 @@ Foam::specieThermo<Thermo, Type>::gamma(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::cpBycpv(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::cpBycpv
+(
+ const scalar p,
+ const scalar T
+) const
{
- return Type<specieThermo<Thermo, Type> >::cpBycpv(*this, p, T);
+ return Type<thermo<Thermo, Type> >::cpBycpv(*this, p, T);
}
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::es(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::es(const scalar p, const scalar T) const
{
return this->hs(p, T) - p*this->W()/this->rho(p, T);
}
@@ -157,7 +161,7 @@ Foam::specieThermo<Thermo, Type>::es(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::ea(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::ea(const scalar p, const scalar T) const
{
return this->ha(p, T) - p*this->W()/this->rho(p, T);
}
@@ -165,7 +169,7 @@ Foam::specieThermo<Thermo, Type>::ea(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::g(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::g(const scalar p, const scalar T) const
{
return this->ha(p, T) - T*this->s(p, T);
}
@@ -173,7 +177,7 @@ Foam::specieThermo<Thermo, Type>::g(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::a(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::a(const scalar p, const scalar T) const
{
return this->ea(p, T) - T*this->s(p, T);
}
@@ -181,7 +185,7 @@ Foam::specieThermo<Thermo, Type>::a(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Cpv(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Cpv(const scalar p, const scalar T) const
{
return this->cpv(p, T)/this->W();
}
@@ -189,7 +193,7 @@ Foam::specieThermo<Thermo, Type>::Cpv(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Cp(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Cp(const scalar p, const scalar T) const
{
return this->cp(p, T)/this->W();
}
@@ -197,7 +201,7 @@ Foam::specieThermo<Thermo, Type>::Cp(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Cv(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Cv(const scalar p, const scalar T) const
{
return this->cv(p, T)/this->W();
}
@@ -205,15 +209,15 @@ Foam::specieThermo<Thermo, Type>::Cv(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::HE(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::HE(const scalar p, const scalar T) const
{
- return Type<specieThermo<Thermo, Type> >::HE(*this, p, T);
+ return Type<thermo<Thermo, Type> >::HE(*this, p, T);
}
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::H(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::H(const scalar p, const scalar T) const
{
return this->h(p, T)/this->W();
}
@@ -221,7 +225,7 @@ Foam::specieThermo<Thermo, Type>::H(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Hs(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Hs(const scalar p, const scalar T) const
{
return this->hs(p, T)/this->W();
}
@@ -229,7 +233,7 @@ Foam::specieThermo<Thermo, Type>::Hs(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Hc() const
+Foam::species::thermo<Thermo, Type>::Hc() const
{
return this->hc()/this->W();
}
@@ -237,7 +241,7 @@ Foam::specieThermo<Thermo, Type>::Hc() const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Ha(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Ha(const scalar p, const scalar T) const
{
return this->ha(p, T)/this->W();
}
@@ -245,7 +249,7 @@ Foam::specieThermo<Thermo, Type>::Ha(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::S(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::S(const scalar p, const scalar T) const
{
return this->s(p, T)/this->W();
}
@@ -253,7 +257,7 @@ Foam::specieThermo<Thermo, Type>::S(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::E(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::E(const scalar p, const scalar T) const
{
return this->e(p, T)/this->W();
}
@@ -261,14 +265,14 @@ Foam::specieThermo<Thermo, Type>::E(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Es(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Es(const scalar p, const scalar T) const
{
return this->es(p, T)/this->W();
}
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Ea(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Ea(const scalar p, const scalar T) const
{
return this->ea(p, T)/this->W();
}
@@ -276,7 +280,7 @@ Foam::specieThermo<Thermo, Type>::Ea(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::G(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::G(const scalar p, const scalar T) const
{
return this->g(p, T)/this->W();
}
@@ -284,7 +288,7 @@ Foam::specieThermo<Thermo, Type>::G(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::A(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::A(const scalar p, const scalar T) const
{
return this->a(p, T)/this->W();
}
@@ -292,7 +296,7 @@ Foam::specieThermo<Thermo, Type>::A(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::K(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::K(const scalar p, const scalar T) const
{
scalar arg = -this->nMoles()*this->g(p, T)/(this->RR*T);
@@ -309,7 +313,7 @@ Foam::specieThermo<Thermo, Type>::K(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Kp(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Kp(const scalar p, const scalar T) const
{
return K(p, T);
}
@@ -317,7 +321,7 @@ Foam::specieThermo<Thermo, Type>::Kp(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
inline Foam::scalar
-Foam::specieThermo<Thermo, Type>::Kc(const scalar p, const scalar T) const
+Foam::species::thermo<Thermo, Type>::Kc(const scalar p, const scalar T) const
{
if (equal(this->nMoles(), SMALL))
{
@@ -331,7 +335,7 @@ Foam::specieThermo<Thermo, Type>::Kc(const scalar p, const scalar T) const
template<class Thermo, template<class> class Type>
-inline Foam::scalar Foam::specieThermo<Thermo, Type>::Kx
+inline Foam::scalar Foam::species::thermo<Thermo, Type>::Kx
(
const scalar p,
const scalar T
@@ -349,7 +353,7 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::Kx
template<class Thermo, template<class> class Type>
-inline Foam::scalar Foam::specieThermo<Thermo, Type>::Kn
+inline Foam::scalar Foam::species::thermo<Thermo, Type>::Kn
(
const scalar p,
const scalar T,
@@ -368,19 +372,19 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::Kn
template<class Thermo, template<class> class Type>
-inline Foam::scalar Foam::specieThermo<Thermo, Type>::THE
+inline Foam::scalar Foam::species::thermo<Thermo, Type>::THE
(
const scalar he,
const scalar p,
const scalar T0
) const
{
- return Type<specieThermo<Thermo, Type> >::THE(*this, he, p, T0);
+ return Type<thermo<Thermo, Type> >::THE(*this, he, p, T0);
}
template<class Thermo, template<class> class Type>
-inline Foam::scalar Foam::specieThermo<Thermo, Type>::THs
+inline Foam::scalar Foam::species::thermo<Thermo, Type>::THs
(
const scalar hs,
const scalar p,
@@ -392,15 +396,15 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::THs
hs,
p,
T0,
- &specieThermo<Thermo, Type>::Hs,
- &specieThermo<Thermo, Type>::Cp,
- &specieThermo<Thermo, Type>::limit
+ &thermo<Thermo, Type>::Hs,
+ &thermo<Thermo, Type>::Cp,
+ &thermo<Thermo, Type>::limit
);
}
template<class Thermo, template<class> class Type>
-inline Foam::scalar Foam::specieThermo<Thermo, Type>::THa
+inline Foam::scalar Foam::species::thermo<Thermo, Type>::THa
(
const scalar ht,
const scalar p,
@@ -412,15 +416,15 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::THa
ht,
p,
T0,
- &specieThermo<Thermo, Type>::Ha,
- &specieThermo<Thermo, Type>::Cp,
- &specieThermo<Thermo, Type>::limit
+ &thermo<Thermo, Type>::Ha,
+ &thermo<Thermo, Type>::Cp,
+ &thermo<Thermo, Type>::limit
);
}
template<class Thermo, template<class> class Type>
-inline Foam::scalar Foam::specieThermo<Thermo, Type>::TEs
+inline Foam::scalar Foam::species::thermo<Thermo, Type>::TEs
(
const scalar es,
const scalar p,
@@ -432,15 +436,15 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::TEs
es,
p,
T0,
- &specieThermo<Thermo, Type>::Es,
- &specieThermo<Thermo, Type>::Cv,
- &specieThermo<Thermo, Type>::limit
+ &thermo<Thermo, Type>::Es,
+ &thermo<Thermo, Type>::Cv,
+ &thermo<Thermo, Type>::limit
);
}
template<class Thermo, template<class> class Type>
-inline Foam::scalar Foam::specieThermo<Thermo, Type>::TEa
+inline Foam::scalar Foam::species::thermo<Thermo, Type>::TEa
(
const scalar e,
const scalar p,
@@ -452,9 +456,9 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::TEa
ea,
p,
T0,
- &specieThermo<Thermo, Type>::Ea,
- &specieThermo<Thermo, Type>::Cv,
- &specieThermo<Thermo, Type>::limit
+ &thermo<Thermo, Type>::Ea,
+ &thermo<Thermo, Type>::Cv,
+ &thermo<Thermo, Type>::limit
);
}
@@ -462,9 +466,9 @@ inline Foam::scalar Foam::specieThermo<Thermo, Type>::TEa
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class Thermo, template<class> class Type>
-inline void Foam::specieThermo<Thermo, Type>::operator+=
+inline void Foam::species::thermo<Thermo, Type>::operator+=
(
- const specieThermo<Thermo, Type>& st
+ const thermo<Thermo, Type>& st
)
{
Thermo::operator+=(st);
@@ -472,9 +476,9 @@ inline void Foam::specieThermo<Thermo, Type>::operator+=
template<class Thermo, template<class> class Type>
-inline void Foam::specieThermo<Thermo, Type>::operator-=
+inline void Foam::species::thermo<Thermo, Type>::operator-=
(
- const specieThermo<Thermo, Type>& st
+ const thermo<Thermo, Type>& st
)
{
Thermo::operator-=(st);
@@ -482,7 +486,7 @@ inline void Foam::specieThermo<Thermo, Type>::operator-=
template<class Thermo, template<class> class Type>
-inline void Foam::specieThermo<Thermo, Type>::operator*=(const scalar s)
+inline void Foam::species::thermo<Thermo, Type>::operator*=(const scalar s)
{
Thermo::operator*=(s);
}
@@ -491,13 +495,13 @@ inline void Foam::specieThermo<Thermo, Type>::operator*=(const scalar s)
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
template<class Thermo, template<class> class Type>
-inline Foam::specieThermo<Thermo, Type> Foam::operator+
+inline Foam::species::thermo<Thermo, Type> Foam::species::operator+
(
- const specieThermo<Thermo, Type>& st1,
- const specieThermo<Thermo, Type>& st2
+ const thermo<Thermo, Type>& st1,
+ const thermo<Thermo, Type>& st2
)
{
- return specieThermo<Thermo, Type>
+ return thermo<Thermo, Type>
(
static_cast<const Thermo&>(st1) + static_cast<const Thermo&>(st2)
);
@@ -505,13 +509,13 @@ inline Foam::specieThermo<Thermo, Type> Foam::operator+
template<class Thermo, template<class> class Type>
-inline Foam::specieThermo<Thermo, Type> Foam::operator-
+inline Foam::species::thermo<Thermo, Type> Foam::species::operator-
(
- const specieThermo<Thermo, Type>& st1,
- const specieThermo<Thermo, Type>& st2
+ const thermo<Thermo, Type>& st1,
+ const thermo<Thermo, Type>& st2
)
{
- return specieThermo<Thermo, Type>
+ return thermo<Thermo, Type>
(
static_cast<const Thermo&>(st1) - static_cast<const Thermo&>(st2)
);
@@ -519,13 +523,13 @@ inline Foam::specieThermo<Thermo, Type> Foam::operator-
template<class Thermo, template<class> class Type>
-inline Foam::specieThermo<Thermo, Type> Foam::operator*
+inline Foam::species::thermo<Thermo, Type> Foam::species::operator*
(
const scalar s,
- const specieThermo<Thermo, Type>& st
+ const thermo<Thermo, Type>& st
)
{
- return specieThermo<Thermo, Type>
+ return thermo<Thermo, Type>
(
s*static_cast<const Thermo&>(st)
);
@@ -533,10 +537,10 @@ inline Foam::specieThermo<Thermo, Type> Foam::operator*
template<class Thermo, template<class> class Type>
-inline Foam::specieThermo<Thermo, Type> Foam::operator==
+inline Foam::species::thermo<Thermo, Type> Foam::species::operator==
(
- const specieThermo<Thermo, Type>& st1,
- const specieThermo<Thermo, Type>& st2
+ const thermo<Thermo, Type>& st1,
+ const thermo<Thermo, Type>& st2
)
{
return st2 - st1;
diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
index 54e0f6603c58561076671968ee9fbcb73b4b5c28..d7a6a98dfec4e6bea089ca0b928c55254b6ab889 100644
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
+thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<janafThermo<perfectGas>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776;
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
index 0d6480a485ef035576462f0cf37ddc272f4b00c6..b622e094b3fa1bc8e70b4e5fac123ae54d80023e 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
+thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<janafThermo<perfectGas>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
index 531e298a20917308ed0b54a95a543e4fa8755517..361194ecf7789dc93da38b290839c5475829cab8 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
+thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<janafThermo<perfectGas>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;
diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
index a70c4ca65c1958c83afe164095a82df2810e2227..abe95b22c9a250e9f7d9db50da0936b258ff0395 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
+thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
solidComponents
(
diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
index 3d2695dfcd827474da7b5b03b5411b35d27547d3..97dd3d9c55acbde58da9492a5e6cb9764dad0144 100644
--- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
index 89b923d01fcce3f4b6a357528f7a0b7043a53f06..133d8db277c58a505548440a843ea9eb08cf14d2 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<sutherlandTransport<janafThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
index c61c83d6bd0d6b6daf17daa85bface79fdb8ada2..ab2183b98c7faa01f807c9461e48c652cb037e13 100644
--- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
// Note: these are the properties for a "normalised" inviscid gas
// for which the speed of sound is 1 m/s at a temperature of 1K
diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
index a228ce4a4f87e6bf0fcfbae6ebf3b856d26f811d..491dee4349791c1e875bdae166382f2e359a7727 100644
--- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
index 7518beeeadb1f7a7a0b5fd2d708ee05b4aac73e9..20c4bf562a45eefa8ed155174e9d72395a78b957 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
index a228ce4a4f87e6bf0fcfbae6ebf3b856d26f811d..491dee4349791c1e875bdae166382f2e359a7727 100644
--- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
index b2540e3d91af97ebb0fb280ed532d5d4ef5f4464..fbeb00f80a93b5e9d2d9eb6da9ed7da197683bf2 100644
--- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
index fa673b9a4d6bf80bbcf7c31c7d7753f3a3a2d657..ac8b4bff371e597427ccdc8ab3e34817c67d62f8 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
index 58aeb4d4fd350ba134849486c1837753f3e45292..30f563b195f1bb60496b8834c158e86860992356 100644
--- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
index fa673b9a4d6bf80bbcf7c31c7d7753f3a3a2d657..ac8b4bff371e597427ccdc8ab3e34817c67d62f8 100644
--- a/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
index fa673b9a4d6bf80bbcf7c31c7d7753f3a3a2d657..ac8b4bff371e597427ccdc8ab3e34817c67d62f8 100644
--- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
index a95c522360b9d17e178b9899a2c439cd807c1cf6..58880fac6e1ea72572695ff7ddccf974ca75155c 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index abc41fb6ce064b8634e4bef5b362dd9fa8a5250f..3b8fb8c661caf0ecb28f74df16a929d43ef3967a 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType heRhoThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
index 152335489611da2689fe9952c1be3193d416044b..48d08d02636244d05bf01faa64d3d930d98ce361 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
index c61c83d6bd0d6b6daf17daa85bface79fdb8ada2..ab2183b98c7faa01f807c9461e48c652cb037e13 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
// Note: these are the properties for a "normalised" inviscid gas
// for which the speed of sound is 1 m/s at a temperature of 1K
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index f409900f934dcb1c4684cac3e499fe91036d3bdb..4aeb09471aef39ff6a16f23032f88ca2d02ca884 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
index e2a082466118c9c0e5a74eac99e87b08eb6d668d..7a1082d21644e4e61ee17326c0d294ae96613ae3 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index e2a082466118c9c0e5a74eac99e87b08eb6d668d..7a1082d21644e4e61ee17326c0d294ae96613ae3 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
index 410aa5f42a635b71b1594cbe0a3dbdcca2d07d76..dcbf833e28f11e5b2742512709527dbe688fe1fe 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -15,8 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
-//thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
+//thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
pRef 100000;
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
index 75386e739434aacc7147df2531a5880c3e4f4d35..8e834a9acd318650b899ed54d67f04ba5e7dedc1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
index 75386e739434aacc7147df2531a5880c3e4f4d35..8e834a9acd318650b899ed54d67f04ba5e7dedc1 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
index 5657d6092f1996084b37cc79b2efdcf2dbfc7c12..eb9d296c1297088d3722eb5fb3bfd457f99bbeb9 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
@@ -110,7 +110,7 @@ dictionaryReplacement
// Solid thermo
- thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
+ thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
mixture
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
index 885c152f4f85ec016999a5e6b84b2c4d1118d26b..345a7b7573277963922914ef7d85352507b64e6d 100644
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
@@ -15,7 +15,17 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+// thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
+
+thermoType
+{
+ type hePsiThermo;
+ mixture pureMixture;
+ transport constTransport;
+ thermo hConstThermo;
+ equationOfState perfectGas;
+ energy sensibleEnthalpy;
+}
pRef 100000;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
index 521cf3b4216fb9f3ef8e04176f1e98449d542777..b61f3fe303d6150b9fbae8f41b73aee4c767c5f7 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
pRef 100000;
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
index 521cf3b4216fb9f3ef8e04176f1e98449d542777..b61f3fe303d6150b9fbae8f41b73aee4c767c5f7 100644
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
pRef 100000;
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 75cf8a4016c338d814f02983aa01e348d32737eb..0eaa169eb16c2c1e6c369d0f5352358f937e1854 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index cdcb5bdf4997a594e44ebf6a3ebe8ebda798ccf6..700acaa920341abcb214ff4a2550f868ce0e97dc 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..700acaa920341abcb214ff4a2550f868ce0e97dc
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
@@ -0,0 +1,120 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..700acaa920341abcb214ff4a2550f868ce0e97dc
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
@@ -0,0 +1,120 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 18f002136af243c0ed0d90a8ed256317fad47b06..27d3b23a53590ed25486497c27ce35b122504492 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
index 3bbae3211369ca18198bc75a2c869e107a66a781..cb1219452b690b4aa8b4e6fe39d1cbbbc69ae528 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<rhoConst>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
index 15b8d00f3de31a50043d21781f934a2285975b33..aea71ab4351c1ef318d9cf8cd5280e31fd434f87 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aea71ab4351c1ef318d9cf8cd5280e31fd434f87
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
@@ -0,0 +1,121 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aea71ab4351c1ef318d9cf8cd5280e31fd434f87
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
@@ -0,0 +1,121 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
index 18f002136af243c0ed0d90a8ed256317fad47b06..27d3b23a53590ed25486497c27ce35b122504492 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
index 75cf8a4016c338d814f02983aa01e348d32737eb..0eaa169eb16c2c1e6c369d0f5352358f937e1854 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
index 15b8d00f3de31a50043d21781f934a2285975b33..aea71ab4351c1ef318d9cf8cd5280e31fd434f87 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aea71ab4351c1ef318d9cf8cd5280e31fd434f87
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
@@ -0,0 +1,121 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aea71ab4351c1ef318d9cf8cd5280e31fd434f87
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
@@ -0,0 +1,121 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
index 18f002136af243c0ed0d90a8ed256317fad47b06..27d3b23a53590ed25486497c27ce35b122504492 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
index 75cf8a4016c338d814f02983aa01e348d32737eb..0eaa169eb16c2c1e6c369d0f5352358f937e1854 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
index 15b8d00f3de31a50043d21781f934a2285975b33..aea71ab4351c1ef318d9cf8cd5280e31fd434f87 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aea71ab4351c1ef318d9cf8cd5280e31fd434f87
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
@@ -0,0 +1,121 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..aea71ab4351c1ef318d9cf8cd5280e31fd434f87
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
@@ -0,0 +1,121 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
index 18f002136af243c0ed0d90a8ed256317fad47b06..27d3b23a53590ed25486497c27ce35b122504492 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
index 75cf8a4016c338d814f02983aa01e348d32737eb..0eaa169eb16c2c1e6c369d0f5352358f937e1854 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
index 5008ddbcebcc9f140c54a17a084a05cdfa9e8f9d..fa34c319f57f107e60a9ecea185adbe167c5e233 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
@@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<specieThermo<hConstThermo<rhoConst>,sensibleEnthalpy>>>>>;
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
mixture
{
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fa34c319f57f107e60a9ecea185adbe167c5e233
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
@@ -0,0 +1,121 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.5;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
deleted file mode 120000
index dc4d3a18ee4b034d4fdd38eef0466567d0d331bb..0000000000000000000000000000000000000000
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../heater/thermophysicalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fa34c319f57f107e60a9ecea185adbe167c5e233
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
@@ -0,0 +1,121 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
+
+mixture
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 12;
+ }
+
+ transport
+ {
+ kappa 80;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.5;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 450;
+ }
+
+ equationOfState
+ {
+ rho 8000;
+ }
+}
+
+solidComponents
+(
+ pmma char
+);
+
+pmmaCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 100;
+ }
+
+ transport
+ {
+ kappa 0.152;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.1;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 1462;
+ }
+
+ equationOfState
+ {
+ rho 1114.0;
+ }
+}
+
+charCoeffs
+{
+ specie
+ {
+ nMoles 1;
+ molWeight 50;
+ }
+
+ transport
+ {
+ kappa 0.4;
+ }
+
+ radiation
+ {
+ sigmaS 0.0;
+ kappaRad 0.0;
+ emissivity 0.0;
+ }
+
+ thermodynamics
+ {
+ Hf 0;
+ Cp 611.0;
+ }
+
+ equationOfState
+ {
+ rho 11.5;
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
index 18f002136af243c0ed0d90a8ed256317fad47b06..27d3b23a53590ed25486497c27ce35b122504492 100644
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType heRhoThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleEnthalpy>>>>;
+thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
mixture
{
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
index c32fa27d2799d0744228af9365b2f112095d779e..7ed447f0648b9b8c237f7a62c9cf28615f142d84 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSchemes
@@ -23,9 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
- grad(p) Gauss linear;
- grad(U) cellLimited Gauss linear 1;
- grad(k) cellLimited Gauss linear 1;
}
divSchemes
@@ -34,7 +31,7 @@ divSchemes
div(phi,U) Gauss upwind;
div(phid,p) Gauss upwind;
div(phi,K) Gauss upwind;
- div(phi,h) Gauss upwind;
+ div(phi,h) Gauss upwind;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,omega) Gauss upwind;