zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2012-09-26 10:32:58 +01:00
parent 6e03b278f0 2801f229fa
commit 227e830c55
69 changed files with 295 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/thermophysicalModels/basic/fluidThermo/makeThermo.H
View File

@ -25,18 +25,19 @@ InClass
Foam::fluidThermo
Description
Macros for creating 'basic' density-based thermo packages
Macros for creating basic fluid thermo packages
\*---------------------------------------------------------------------------*/
#ifndef makeThermo_H
#define makeThermo_H
#include "fluidThermo.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState)\
#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
\
typedef Cthermo \
< \
@ -48,17 +49,20 @@ typedef Cthermo \
< \
Thermo \
< \
EqnOfState<specie> \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
> \
> \
> Cthermo##Mixture##Transport##Type##Thermo##EqnOfState; \
> Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie; \
\
defineTemplateTypeNameAndDebugWithName \
( \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
#Cthermo \
"<" \
#Mixture \
@ -68,6 +72,9 @@ defineTemplateTypeNameAndDebugWithName \
#Thermo \
"<" \
#EqnOfState \
"<" \
#Specie \
">" \
">," \
#Type \
">>>", \
@ -77,55 +84,14 @@ defineTemplateTypeNameAndDebugWithName \
addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
fluidThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState, \
fvMesh \
);
#define makePolyThermo(BaseThermo,Cthermo,Mixture,Order,Type) \
\
typedef polynomialTransport \
< \
species::thermo \
< \
hPolynomialThermo \
< \
icoPolynomial<specie, Order>, \
Order \
>, \
Type \
>, \
Order \
> icoPoly##Order##Type##ThermoPhysics; \
\
typedef Cthermo<Mixture<icoPoly##Order##Type##ThermoPhysics> > \
Cthermo##Mixture##icoPoly##Order##Type##ThermoPhysics; \
\
defineTemplateTypeNameAndDebugWithName \
( \
Cthermo##Mixture##icoPoly##Order##Type##ThermoPhysics, \
#Cthermo"<"#Mixture"<icoPoly"#Order#Type"ThermoPhysics>>", \
0 \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##icoPoly##Order##Type##ThermoPhysics, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
fluidThermo, \
Cthermo##Mixture##icoPoly##Order##Type##ThermoPhysics, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
);

82
src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
View File

@ -68,7 +68,8 @@ makeBasicMixture
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeBasicMixture
@ -77,7 +78,8 @@ makeBasicMixture
sutherlandTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeBasicMixture
@ -86,7 +88,8 @@ makeBasicMixture
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeBasicMixture
@ -95,31 +98,28 @@ makeBasicMixture
constTransport,
sensibleEnthalpy,
hConstThermo,
rhoConst
rhoConst,
specie
);
makeBasicPolyMixture
makeBasicMixture
(
pureMixture,
3,
sensibleEnthalpy
polynomialTransport,
sensibleEnthalpy,
hPolynomialThermo,
icoPolynomial,
specie
);
makeBasicPolyMixture
(
pureMixture,
8,
sensibleEnthalpy
);
makeBasicMixture
(
pureMixture,
constTransport,
sensibleEnthalpy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeBasicMixture
@ -128,7 +128,8 @@ makeBasicMixture
sutherlandTransport,
sensibleEnthalpy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeBasicMixture
@ -137,7 +138,8 @@ makeBasicMixture
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
@ -149,7 +151,8 @@ makeBasicMixture
constTransport,
sensibleInternalEnergy,
eConstThermo,
perfectGas
perfectGas,
specie
);
makeBasicMixture
@ -158,7 +161,8 @@ makeBasicMixture
sutherlandTransport,
sensibleInternalEnergy,
eConstThermo,
perfectGas
perfectGas,
specie
);
makeBasicMixture
@ -167,7 +171,8 @@ makeBasicMixture
constTransport,
sensibleInternalEnergy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeBasicMixture
@ -176,7 +181,8 @@ makeBasicMixture
sutherlandTransport,
sensibleInternalEnergy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeBasicMixture
@ -185,7 +191,8 @@ makeBasicMixture
sutherlandTransport,
sensibleInternalEnergy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeBasicMixture
@ -194,31 +201,28 @@ makeBasicMixture
constTransport,
sensibleInternalEnergy,
hConstThermo,
rhoConst
rhoConst,
specie
);
makeBasicPolyMixture
makeBasicMixture
(
pureMixture,
3,
sensibleInternalEnergy
polynomialTransport,
sensibleInternalEnergy,
hPolynomialThermo,
icoPolynomial,
specie
);
makeBasicPolyMixture
(
pureMixture,
8,
sensibleInternalEnergy
);
makeBasicMixture
(
pureMixture,
constTransport,
sensibleInternalEnergy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeBasicMixture
@ -227,7 +231,8 @@ makeBasicMixture
sutherlandTransport,
sensibleInternalEnergy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeBasicMixture
@ -236,7 +241,8 @@ makeBasicMixture
sutherlandTransport,
sensibleInternalEnergy,
janafThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);

38
src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H
View File

@ -25,6 +25,7 @@ InClass
Foam::basicMixture
Description
Macros for creating 'basic' mixtures for basic fluid thermo packages
\*---------------------------------------------------------------------------*/
@ -32,44 +33,19 @@ Description
#define makeBasicMixture_H
#include "basicMixture.H"
#include "sensibleEnthalpy.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeBasicMixture(Mixture,Transport,Type,Thermo,EqnOfState) \
#define makeBasicMixture(Mixture,Transport,Type,Thermo,EqnOfState,Specie) \
\
typedef \
Mixture<Transport<species::thermo<Thermo<EqnOfState<specie> >, Type> > > \
Mixture##Transport##Type##Thermo##EqnOfState; \
Mixture<Transport<species::thermo<Thermo<EqnOfState<Specie> >, Type> > > \
Mixture##Transport##Type##Thermo##EqnOfState##Specie; \
\
defineTemplateTypeNameAndDebugWithName \
(Mixture##Transport##Type##Thermo##EqnOfState, \
#Mixture"<"#Transport"<"#Thermo"<"#EqnOfState">,"#Type">>", 0)
#define makeBasicPolyMixture(Mixture,Order,Type) \
\
typedef polynomialTransport \
< \
species::thermo \
< \
hPolynomialThermo \
< \
icoPolynomial<specie, Order>, \
Order \
>, \
Type \
>, \
Order \
> icoPoly##Order##Type##ThermoPhysics; \
\
typedef Mixture<icoPoly##Order##Type##ThermoPhysics> \
Mixture##icoPoly##Order##Type##ThermoPhysics; \
\
defineTemplateTypeNameAndDebugWithName \
(Mixture##icoPoly##Order##Type##ThermoPhysics, \
#Mixture"<icoPoly"#Order#Type"ThermoPhysics>", 0)
(Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
#Mixture"<"#Transport"<"#Thermo"<"#EqnOfState"<"#Specie">>,"#Type">>", 0)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

24
src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
View File

@ -56,7 +56,8 @@ makeThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -67,7 +68,8 @@ makeThermo
sutherlandTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -78,7 +80,8 @@ makeThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
@ -92,7 +95,8 @@ makeThermo
constTransport,
sensibleInternalEnergy,
eConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -103,7 +107,8 @@ makeThermo
sutherlandTransport,
sensibleInternalEnergy,
eConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -114,7 +119,8 @@ makeThermo
constTransport,
sensibleInternalEnergy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -125,7 +131,8 @@ makeThermo
sutherlandTransport,
sensibleInternalEnergy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -136,7 +143,8 @@ makeThermo
sutherlandTransport,
sensibleInternalEnergy,
janafThermo,
perfectGas
perfectGas,
specie
);

6
src/thermophysicalModels/basic/psiThermo/psiThermo/psiThermoNew.C
View File

@ -55,15 +55,17 @@ Foam::autoPtr<Foam::psiThermo> Foam::psiThermo::New
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"));
word equationOfState(thermoTypeDict.lookup("equationOfState"));
word specie(thermoTypeDict.lookup("specie"));
thermoTypeName =
type + '<'
+ mixture + '<'
+ transport + '<'
+ thermo + '<'
+ equationOfState + ">,"
+ equationOfState + '<'
+ specie + ">>,"
+ energy + ">>>";
}
else

80
src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
View File

@ -26,10 +26,10 @@ License
#include "rhoThermo.H"
#include "makeThermo.H"
#include "specie.H"
#include "perfectGas.H"
#include "incompressiblePerfectGas.H"
#include "rhoConst.H"
#include "hConstThermo.H"
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
@ -61,7 +61,8 @@ makeThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -72,7 +73,8 @@ makeThermo
sutherlandTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -83,7 +85,8 @@ makeThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -94,25 +97,20 @@ makeThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
rhoConst
rhoConst,
specie
);
makePolyThermo
makeThermo
(
rhoThermo,
heRhoThermo,
pureMixture,
3,
sensibleEnthalpy
);
makePolyThermo
(
rhoThermo,
heRhoThermo,
pureMixture,
8,
sensibleEnthalpy
polynomialTransport,
sensibleEnthalpy,
hPolynomialThermo,
icoPolynomial,
specie
);
makeThermo
@ -123,7 +121,8 @@ makeThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeThermo
@ -134,7 +133,8 @@ makeThermo
sutherlandTransport,
sensibleEnthalpy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeThermo
@ -145,7 +145,8 @@ makeThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
@ -159,7 +160,8 @@ makeThermo
constTransport,
sensibleInternalEnergy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -170,7 +172,8 @@ makeThermo
sutherlandTransport,
sensibleInternalEnergy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -181,7 +184,8 @@ makeThermo
sutherlandTransport,
sensibleInternalEnergy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeThermo
@ -192,25 +196,20 @@ makeThermo
constTransport,
sensibleInternalEnergy,
hConstThermo,
rhoConst
rhoConst,
specie
);
makePolyThermo
makeThermo
(
rhoThermo,
heRhoThermo,
pureMixture,
3,
sensibleInternalEnergy
);
makePolyThermo
(
rhoThermo,
heRhoThermo,
pureMixture,
8,
sensibleInternalEnergy
polynomialTransport,
sensibleInternalEnergy,
hPolynomialThermo,
icoPolynomial,
specie
);
makeThermo
@ -221,7 +220,8 @@ makeThermo
constTransport,
sensibleInternalEnergy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeThermo
@ -232,7 +232,8 @@ makeThermo
sutherlandTransport,
sensibleInternalEnergy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeThermo
@ -243,7 +244,8 @@ makeThermo
sutherlandTransport,
sensibleInternalEnergy,
janafThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);

18
src/thermophysicalModels/reactionThermo/makeReactionThermo.H
View File

@ -31,7 +31,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeReactionThermo(BaseThermo,CThermo,MixtureThermo,Mixture,Transport,Type,Thermo,EqnOfState) \
#define makeReactionThermo(BaseThermo,CThermo,MixtureThermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie) \
\
typedef MixtureThermo \
< \
@ -45,18 +45,21 @@ typedef MixtureThermo \
< \
Thermo \
< \
EqnOfState<specie> \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
> \
> \
> \
> MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState; \
> MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie; \
\
defineTemplateTypeNameAndDebugWithName \
( \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState, \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
#MixtureThermo \
"<" \
#Mixture \
@ -66,6 +69,9 @@ defineTemplateTypeNameAndDebugWithName \
#Thermo \
"<" \
#EqnOfState \
"<" \
#Specie \
">" \
">," \
#Type \
">>>", \
@ -75,14 +81,14 @@ defineTemplateTypeNameAndDebugWithName \
addToRunTimeSelectionTable \
( \
BaseThermo, \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState, \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
CThermo, \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState, \
MixtureThermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
)

30
src/thermophysicalModels/reactionThermo/psiReactionThermo/hePsiReactionThermo/hePsiReactionThermos.C
View File

@ -28,13 +28,12 @@ License
#include "psiReactionThermo.H"
#include "hePsiReactionThermo.H"
#include "specie.H"
#include "perfectGas.H"
#include "hConstThermo.H"
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
#include "thermo.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
@ -65,7 +64,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -77,7 +77,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -89,7 +90,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
@ -104,7 +106,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -116,7 +119,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -128,7 +132,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
@ -143,7 +148,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -155,7 +161,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -167,7 +174,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);

27
src/thermophysicalModels/reactionThermo/psiReactionThermo/heheuReactionThermo/heheuReactionThermos.C
View File

@ -29,13 +29,12 @@ License
#include "makeReactionThermo.H"
#include "addToRunTimeSelectionTable.H"
#include "specie.H"
#include "perfectGas.H"
#include "hConstThermo.H"
#include "janafThermo.H"
#include "absoluteEnthalpy.H"
#include "thermo.H"
#include "constTransport.H"
#include "sutherlandTransport.H"
@ -62,7 +61,8 @@ makeReactionThermo
constTransport,
absoluteEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -74,7 +74,8 @@ makeReactionThermo
constTransport,
absoluteEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -86,7 +87,8 @@ makeReactionThermo
constTransport,
absoluteEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -98,7 +100,8 @@ makeReactionThermo
sutherlandTransport,
absoluteEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -110,7 +113,8 @@ makeReactionThermo
sutherlandTransport,
absoluteEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -122,7 +126,8 @@ makeReactionThermo
sutherlandTransport,
absoluteEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -134,7 +139,8 @@ makeReactionThermo
constTransport,
absoluteEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -146,7 +152,8 @@ makeReactionThermo
sutherlandTransport,
absoluteEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);

38
src/thermophysicalModels/reactionThermo/rhoReactionThermo/heRhoReactionThermo/heRhoReactionThermos.C
View File

@ -28,9 +28,9 @@ License
#include "rhoReactionThermo.H"
#include "heRhoReactionThermo.H"
#include "specie.H"
#include "perfectGas.H"
#include "incompressiblePerfectGas.H"
#include "hConstThermo.H"
#include "janafThermo.H"
#include "sensibleEnthalpy.H"
@ -64,7 +64,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -76,7 +77,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -88,7 +90,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -100,7 +103,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -112,7 +116,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
makeReactionThermo
@ -124,7 +129,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
perfectGas
perfectGas,
specie
);
@ -137,7 +143,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeReactionThermo
@ -149,7 +156,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeReactionThermo
@ -161,7 +169,8 @@ makeReactionThermo
constTransport,
sensibleEnthalpy,
hConstThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeReactionThermo
@ -173,7 +182,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeReactionThermo
@ -185,7 +195,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);
makeReactionThermo
@ -197,7 +208,8 @@ makeReactionThermo
sutherlandTransport,
sensibleEnthalpy,
janafThermo,
incompressiblePerfectGas
incompressiblePerfectGas,
specie
);

21
src/thermophysicalModels/solidThermo/heSolidThermo/heSolidThermos.C
View File

@ -26,21 +26,17 @@ License
#include "makeSolidThermo.H"
#include "specie.H"
#include "rhoConst.H"
#include "hConstThermo.H"
#include "hExponentialThermo.H"
#include "constIsoSolidTransport.H"
#include "constAnIsoSolidTransport.H"
#include "exponentialSolidTransport.H"
#include "constSolidRad.H"
#include "pureSolidMixture.H"
#include "multiComponentSolidMixture.H"
#include "reactingSolidMixture.H"
#include "sensibleEnthalpy.H"
#include "sensibleInternalEnergy.H"
#include "thermo.H"
@ -67,7 +63,8 @@ makeSolidThermo
constSolidRad,
sensibleEnthalpy,
hConstThermo,
rhoConst
rhoConst,
specie
);
makeSolidThermo
@ -79,7 +76,8 @@ makeSolidThermo
constSolidRad,
sensibleEnthalpy,
hConstThermo,
rhoConst
rhoConst,
specie
);
makeSolidThermo
@ -91,7 +89,8 @@ makeSolidThermo
constSolidRad,
sensibleEnthalpy,
hExponentialThermo,
rhoConst
rhoConst,
specie
);
makeSolidThermo
@ -103,7 +102,8 @@ makeSolidThermo
constSolidRad,
sensibleEnthalpy,
hConstThermo,
rhoConst
rhoConst,
specie
);
makeSolidThermo
@ -115,7 +115,8 @@ makeSolidThermo
constSolidRad,
sensibleEnthalpy,
hConstThermo,
rhoConst
rhoConst,
specie
);

40
src/thermophysicalModels/solidThermo/solidThermo/makeSolidThermo.H
View File

@ -36,10 +36,8 @@ Description
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
#define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Radiation,Type,Thermo,EqnOfState)\
#define makeSolidThermo(BaseThermo,Cthermo,Mixture,Transport,Radiation,Type,Thermo,EqnOfState,Specie)\
\
typedef Cthermo \
< \
@ -53,7 +51,10 @@ typedef Cthermo \
< \
Thermo \
< \
EqnOfState<specie> \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
@ -61,11 +62,13 @@ typedef Cthermo \
> \
>, \
BaseThermo \
>Cthermo##Mixture##Transport##Radiation##Type##Thermo##EqnOfState##BaseThermo;\
> Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
Cthermo##Mixture##Transport##Radiation##Type##Thermo##EqnOfState##BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo, \
#Cthermo \
"<" \
#Mixture \
@ -77,6 +80,9 @@ Cthermo##Mixture##Transport##Radiation##Type##Thermo##EqnOfState##BaseThermo, \
#Thermo \
"<" \
#EqnOfState \
"<" \
#Specie \
">" \
">," \
#Type \
">>>>", \
@ -94,19 +100,21 @@ typedef Mixture \
< \
Thermo \
< \
EqnOfState<specie> \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
> \
> \
> Mixture##Transport##Radiation##Type##Thermo##EqnOfState; \
\
> Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie; \
\
\
defineTemplateTypeNameAndDebugWithName \
( \
Mixture##Transport##Radiation##Type##Thermo##EqnOfState, \
Mixture##Transport##Radiation##Type##Thermo##EqnOfState##Specie, \
#Mixture \
"<" \
#Transport \
@ -125,26 +133,28 @@ defineTemplateTypeNameAndDebugWithName \
addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo##EqnOfState##BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo, \
mesh \
); \
\
addToRunTimeSelectionTable \
( \
basicThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo##EqnOfState##BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo##EqnOfState##BaseThermo, \
Cthermo##Mixture##Transport##Radiation##Type##Thermo \
##EqnOfState##Specie##BaseThermo, \
dictionary \
);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif

2
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
View File

@ -90,7 +90,7 @@ Ostream& operator<<
Class icoPolynomial Declaration
\*---------------------------------------------------------------------------*/
template<class Specie, int PolySize>
template<class Specie, int PolySize=8>
class icoPolynomial
:
public Specie

2
src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
View File

@ -92,7 +92,7 @@ Ostream& operator<<
Class hPolynomialThermo Declaration
\*---------------------------------------------------------------------------*/
template<class EquationOfState, int PolySize>
template<class EquationOfState, int PolySize=8>
class hPolynomialThermo
:
public EquationOfState

2
src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H
View File

@ -87,7 +87,7 @@ Ostream& operator<<
Class polynomialTransport Declaration
\*---------------------------------------------------------------------------*/
template<class Thermo, int PolySize>
template<class Thermo, int PolySize=8>
class polynomialTransport
:
public Thermo

2
tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<janafThermo<perfectGas>,absoluteEnthalpy>>>;
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<janafThermo<perfectGas<specie>>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.5776;

2
tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<janafThermo<perfectGas>,absoluteEnthalpy>>>;
thermoType heheuReactionThermo<homogeneousMixture<sutherlandTransport<janafThermo<perfectGas<specie>>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;

2
tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<janafThermo<perfectGas>,absoluteEnthalpy>>>;
thermoType heheuReactionThermo<inhomogeneousMixture<sutherlandTransport<janafThermo<perfectGas<specie>>,absoluteEnthalpy>>>;
stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;

2
tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/panelRegion/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<reactingSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
solidComponents
(

2
tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<janafThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<janafThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,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

2
tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/compressible/rhoPimpleFoam/ras/angledDuct/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/compressible/rhoPimplecFoam/angledDuct/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType heRhoThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<sutherlandTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,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

2
tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

2
tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
mixture
{

4
tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties
View File

@ -15,8 +15,8 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
//thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleInternalEnergy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
//thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleInternalEnergy>>>;
pRef 100000;

2
tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/system/changeDictionaryDict.baffleRegion
View File

@ -110,7 +110,7 @@ dictionaryReplacement
// Solid thermo
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture

5
tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
// thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
thermoType
{
@ -23,8 +23,9 @@ thermoType
mixture pureMixture;
transport constTransport;
thermo hConstThermo;
equationOfState perfectGas;
energy sensibleEnthalpy;
equationOfState perfectGas;
specie specie;
}
pRef 100000;

2
tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
pRef 100000;

2
tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType hePsiThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
pRef 100000;

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/heater/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/bottomWater/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<rhoConst>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/heater/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/leftSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/rightSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/constant/topAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/heater/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/leftSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/rightSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/heater/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/leftSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/rightSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/bottomAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/heater/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/leftSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/rightSolid/thermophysicalProperties
View File

@ -14,7 +14,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst>,sensibleEnthalpy>>>>;
thermoType heSolidThermo<pureSolidMixture<constIsoSolidTransport<constSolidRad<hConstThermo<rhoConst<specie>>,sensibleEnthalpy>>>>;
mixture
{

2
tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/thermophysicalProperties
View File

@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas>,sensibleEnthalpy>>>;
thermoType heRhoThermo<pureMixture<constTransport<hConstThermo<perfectGas<specie>>,sensibleEnthalpy>>>;
mixture
{