STYLE: thermo: Macro renaming

Thermo and reaction thermo macros have been renamed and refactored. If
the name is plural (make???Thermos) then it adds the model to all
selection tables. If not (make???Thermo) then it only adds to the
requested psi or rho table.
This commit is contained in:
Will Bainbridge 2017-12-14 16:37:21 +00:00 committed by Andrew Heather
parent 8aabbec71e
commit 2d238139b3
7 changed files with 218 additions and 218 deletions

View File

@ -136,7 +136,7 @@ constTransport
// pureMixture, sensibleEnthalpy:
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -148,7 +148,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -160,7 +160,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -175,7 +175,7 @@ makeThermo
// pureMixture, sensibleInternalEnergy:
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -187,7 +187,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -199,7 +199,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -214,7 +214,7 @@ makeThermo
// multiComponentMixture, sensibleInternalEnergy:
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -223,7 +223,7 @@ makeReactionMixtureThermos
constRefGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -232,7 +232,7 @@ makeReactionMixtureThermos
constRefFluidEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -244,7 +244,7 @@ makeReactionMixtureThermos
// multiComponentMixture, sensibleEnthalpy:
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -253,7 +253,7 @@ makeReactionMixtureThermos
constRefRhoConstHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -262,7 +262,7 @@ makeReactionMixtureThermos
constRefFluidHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,

View File

@ -37,79 +37,95 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeThermoTypedefs(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
#define typedefThermoPhysics(Transport,Type,Thermo,EqnOfState,Specie) \
\
typedef \
Transport \
< \
species::thermo \
typedef \
Transport \
< \
Thermo \
species::thermo \
< \
EqnOfState \
Thermo \
< \
Specie \
> \
>, \
Type \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
> \
> Transport##Type##Thermo##EqnOfState##Specie; \
Transport##Type##Thermo##EqnOfState##Specie
#define defineThermoPhysicsThermo(BaseThermo,CThermo,Mixture,ThermoPhys) \
\
typedef \
Cthermo \
< \
BaseThermo, \
Mixture<Transport##Type##Thermo##EqnOfState##Specie> \
> Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie; \
typedef \
CThermo \
< \
BaseThermo, \
Mixture<ThermoPhys> \
> \
CThermo##Mixture##ThermoPhys; \
\
defineTemplateTypeNameAndDebugWithName \
( \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
defineTemplateTypeNameAndDebugWithName \
( \
#Cthermo"<" \
+ Mixture<Transport##Type##Thermo##EqnOfState##Specie>::typeName() \
+ ">" \
).c_str(), \
0 \
);
CThermo##Mixture##ThermoPhys, \
(#CThermo"<" + Mixture<ThermoPhys>::typeName() + ">").c_str(), \
0 \
)
#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\
#define addThermoPhysicsThermo(BaseThermo,CThermoMixtureThermoPhys) \
\
makeThermoTypedefs \
( \
BaseThermo, \
Cthermo, \
Mixture, \
Transport, \
Type, \
Thermo, \
EqnOfState, \
Specie \
) \
\
addToRunTimeSelectionTable \
( \
basicThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
fluidThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
); \
\
addToRunTimeSelectionTable \
( \
BaseThermo, \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
fvMesh \
);
addToRunTimeSelectionTable \
( \
BaseThermo, \
CThermoMixtureThermoPhys, \
fvMesh \
); \
#define makeThermoPhysicsThermo(BaseThermo,CThermo,Mixture,ThermoPhys) \
\
defineThermoPhysicsThermo(BaseThermo, CThermo, Mixture, ThermoPhys); \
\
addThermoPhysicsThermo(BaseThermo, CThermo##Mixture##ThermoPhys)
#define makeThermoPhysicsThermos(BaseThermo,CThermo,Mixture,ThermoPhys) \
\
defineThermoPhysicsThermo(BaseThermo, CThermo, Mixture, ThermoPhys); \
\
addThermoPhysicsThermo(basicThermo, CThermo##Mixture##ThermoPhys); \
addThermoPhysicsThermo(fluidThermo, CThermo##Mixture##ThermoPhys); \
addThermoPhysicsThermo(BaseThermo, CThermo##Mixture##ThermoPhys)
#define makeThermo(BaseThermo,CThermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie) \
\
typedefThermoPhysics(Transport,Type,Thermo,EqnOfState,Specie); \
\
makeThermoPhysicsThermo \
( \
BaseThermo, \
CThermo, \
Mixture, \
Transport##Type##Thermo##EqnOfState##Specie \
)
#define makeThermos(BaseThermo,CThermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie) \
\
typedefThermoPhysics(Transport,Type,Thermo,EqnOfState,Specie); \
\
makeThermoPhysicsThermos \
( \
BaseThermo, \
CThermo, \
Mixture, \
Transport##Type##Thermo##EqnOfState##Specie \
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,6 +45,8 @@ License
#include "hePsiThermo.H"
#include "pureMixture.H"
#include "thermoPhysicsTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@ -52,7 +54,7 @@ namespace Foam
/* * * * * * * * * * * * * * * * * Enthalpy-based * * * * * * * * * * * * * */
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -64,7 +66,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -76,7 +78,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -88,7 +90,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -100,7 +102,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -112,7 +114,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -124,7 +126,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -139,7 +141,7 @@ makeThermo
/* * * * * * * * * * * * * * Internal-energy-based * * * * * * * * * * * * * */
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -151,7 +153,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -163,7 +165,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -175,7 +177,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -187,7 +189,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,
@ -199,7 +201,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
psiThermo,
hePsiThermo,

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,7 +58,7 @@ namespace Foam
/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -70,7 +70,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -82,7 +82,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -94,7 +94,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -106,7 +106,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -118,7 +118,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -130,7 +130,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -142,7 +142,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -154,7 +154,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -166,7 +166,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -178,7 +178,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -190,7 +190,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -202,7 +202,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -214,7 +214,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -226,7 +226,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -238,7 +238,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -252,7 +252,7 @@ makeThermo
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -264,7 +264,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -276,7 +276,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -288,7 +288,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -300,7 +300,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -312,7 +312,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -324,7 +324,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -336,7 +336,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -348,7 +348,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -360,7 +360,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -372,7 +372,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -384,7 +384,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,
@ -396,7 +396,7 @@ makeThermo
specie
);
makeThermo
makeThermos
(
rhoThermo,
heRhoThermo,

View File

@ -27,11 +27,12 @@ License
#define makeReactionThermo_H
#include "addToRunTimeSelectionTable.H"
#include "makeThermo.H"
#include "SpecieMixture.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define defineReactionMixtureThermo(BaseReactionThermo,CThermo,Mixture,ThermoPhys) \
#define defineThermoPhysicsReactionThermo(BaseReactionThermo,CThermo,Mixture,ThermoPhys) \
\
typedef CThermo \
< \
@ -53,58 +54,40 @@ License
)
#define addReactionMixtureThermo(BaseThermo,CThermoMixtureThermoPhys) \
#define makeThermoPhysicsReactionThermos(BaseThermo,BaseReactionThermo,CThermo,Mixture,ThermoPhys) \
\
addToRunTimeSelectionTable \
defineThermoPhysicsReactionThermo \
( \
BaseThermo, \
CThermoMixtureThermoPhys, \
fvMesh \
)
#define makeReactionMixtureThermos(BaseThermo,BaseReactionThermo,CThermo,Mixture,ThermoPhys) \
BaseReactionThermo, \
CThermo, \
Mixture, \
ThermoPhys \
); \
\
defineReactionMixtureThermo(BaseReactionThermo,CThermo,Mixture,ThermoPhys);\
\
addReactionMixtureThermo(basicThermo, CThermo##Mixture##ThermoPhys); \
addReactionMixtureThermo(fluidThermo, CThermo##Mixture##ThermoPhys); \
addReactionMixtureThermo(BaseThermo, CThermo##Mixture##ThermoPhys); \
addReactionMixtureThermo(BaseReactionThermo, CThermo##Mixture##ThermoPhys)
addThermoPhysicsThermo(basicThermo, CThermo##Mixture##ThermoPhys); \
addThermoPhysicsThermo(fluidThermo, CThermo##Mixture##ThermoPhys); \
addThermoPhysicsThermo(BaseThermo, CThermo##Mixture##ThermoPhys); \
addThermoPhysicsThermo(BaseReactionThermo, CThermo##Mixture##ThermoPhys)
#define makeReactionMixtureThermo(BaseReactionThermo,CThermo,Mixture,ThermoPhys) \
#define makeThermoPhysicsReactionThermo(BaseReactionThermo,CThermo,Mixture,ThermoPhys) \
\
defineReactionMixtureThermo(BaseReactionThermo,CThermo,Mixture,ThermoPhys);\
defineThermoPhysicsReactionThermo \
( \
BaseReactionThermo, \
CThermo, \
Mixture, \
ThermoPhys \
); \
\
addReactionMixtureThermo(BaseReactionThermo, CThermo##Mixture##ThermoPhys)
#define defineThermoPhys(Transport,Type,Thermo,EqnOfState,Specie) \
\
typedef \
Transport \
< \
species::thermo \
< \
Thermo \
< \
EqnOfState \
< \
Specie \
> \
>, \
Type \
> \
> \
Transport##Type##Thermo##EqnOfState##Specie \
addThermoPhysicsThermo(BaseReactionThermo, CThermo##Mixture##ThermoPhys)
#define makeReactionThermos(BaseThermo,BaseReactionThermo,CThermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie) \
\
defineThermoPhys(Transport,Type,Thermo,EqnOfState,Specie); \
typedefThermoPhysics(Transport,Type,Thermo,EqnOfState,Specie); \
\
makeReactionMixtureThermos \
makeThermoPhysicsReactionThermos \
( \
BaseThermo, \
BaseReactionThermo, \
@ -116,9 +99,9 @@ License
#define makeReactionThermo(BaseReactionThermo,CThermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie) \
\
defineThermoPhys(Transport,Type,Thermo,EqnOfState,Specie); \
typedefThermoPhysics(Transport,Type,Thermo,EqnOfState,Specie); \
\
makeReactionMixtureThermo \
makeThermoPhysicsReactionThermo \
( \
BaseReactionThermo, \
CThermo, \
@ -126,7 +109,6 @@ License
Transport##Type##Thermo##EqnOfState##Specie \
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif

View File

@ -183,7 +183,7 @@ makeReactionThermos
// Multi-component thermo for sensible enthalpy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -192,7 +192,7 @@ makeReactionMixtureThermos
constGasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -204,7 +204,7 @@ makeReactionMixtureThermos
// Multi-component thermo for internal energy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -213,7 +213,7 @@ makeReactionMixtureThermos
constGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -225,7 +225,7 @@ makeReactionMixtureThermos
// Reaction thermo for sensible enthalpy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -234,7 +234,7 @@ makeReactionMixtureThermos
constGasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -246,7 +246,7 @@ makeReactionMixtureThermos
// Single-step reaction thermo for sensible enthalpy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -258,7 +258,7 @@ makeReactionMixtureThermos
// Reaction thermo for internal energy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -267,7 +267,7 @@ makeReactionMixtureThermos
constGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -279,7 +279,7 @@ makeReactionMixtureThermos
// Single-step reaction thermo for internal energy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
psiThermo,
psiReactionThermo,
@ -291,7 +291,7 @@ makeReactionMixtureThermos
// Single-component thermo for sensible enthalpy
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
psiReactionThermo,
hePsiThermo,
@ -299,7 +299,7 @@ makeReactionMixtureThermo
constGasHThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
psiReactionThermo,
hePsiThermo,
@ -310,7 +310,7 @@ makeReactionMixtureThermo
// Single-component thermo for internal energy
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
psiReactionThermo,
hePsiThermo,
@ -318,7 +318,7 @@ makeReactionMixtureThermo
constGasEThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
psiReactionThermo,
hePsiThermo,

View File

@ -221,7 +221,7 @@ makeReactionThermos
// Multi-component thermo for internal energy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -230,7 +230,7 @@ makeReactionMixtureThermos
constGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -239,7 +239,7 @@ makeReactionMixtureThermos
gasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -248,7 +248,7 @@ makeReactionMixtureThermos
constIncompressibleGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -257,7 +257,7 @@ makeReactionMixtureThermos
incompressibleGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -266,7 +266,7 @@ makeReactionMixtureThermos
icoPoly8EThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -284,7 +284,7 @@ makeReactionMixtureThermos
constFluidEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -293,7 +293,7 @@ makeReactionMixtureThermos
constAdiabaticFluidEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -305,7 +305,7 @@ makeReactionMixtureThermos
// Reaction thermo for internal energy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -314,7 +314,7 @@ makeReactionMixtureThermos
constGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -323,7 +323,7 @@ makeReactionMixtureThermos
gasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -332,7 +332,7 @@ makeReactionMixtureThermos
constIncompressibleGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -341,7 +341,7 @@ makeReactionMixtureThermos
incompressibleGasEThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -353,7 +353,7 @@ makeReactionMixtureThermos
// Single-step reaction thermo for internal energy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -365,7 +365,7 @@ makeReactionMixtureThermos
// Single-component thermo for internal energy
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -373,7 +373,7 @@ makeReactionMixtureThermo
constGasEThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -381,7 +381,7 @@ makeReactionMixtureThermo
gasEThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -389,7 +389,7 @@ makeReactionMixtureThermo
constIncompressibleGasEThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -397,7 +397,7 @@ makeReactionMixtureThermo
incompressibleGasEThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -405,7 +405,7 @@ makeReactionMixtureThermo
icoPoly8EThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -413,7 +413,7 @@ makeReactionMixtureThermo
constFluidEThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -421,7 +421,7 @@ makeReactionMixtureThermo
constAdiabaticFluidEThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -457,7 +457,7 @@ makeReactionThermo
// Multi-component thermo for sensible enthalpy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -466,7 +466,7 @@ makeReactionMixtureThermos
constGasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -475,7 +475,7 @@ makeReactionMixtureThermos
gasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -484,7 +484,7 @@ makeReactionMixtureThermos
constIncompressibleGasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -493,7 +493,7 @@ makeReactionMixtureThermos
incompressibleGasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -502,7 +502,7 @@ makeReactionMixtureThermos
icoPoly8HThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -520,7 +520,7 @@ makeReactionMixtureThermos
constFluidHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -529,7 +529,7 @@ makeReactionMixtureThermos
constAdiabaticFluidHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -540,7 +540,7 @@ makeReactionMixtureThermos
// Reaction thermo for sensible enthalpy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -549,7 +549,7 @@ makeReactionMixtureThermos
constGasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -558,7 +558,7 @@ makeReactionMixtureThermos
gasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -567,7 +567,7 @@ makeReactionMixtureThermos
constIncompressibleGasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -576,7 +576,7 @@ makeReactionMixtureThermos
incompressibleGasHThermoPhysics
);
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -588,7 +588,7 @@ makeReactionMixtureThermos
// Single-step reaction thermo for sensible enthalpy
makeReactionMixtureThermos
makeThermoPhysicsReactionThermos
(
rhoThermo,
rhoReactionThermo,
@ -600,7 +600,7 @@ makeReactionMixtureThermos
// Single-component thermo for sensible enthalpy
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -608,7 +608,7 @@ makeReactionMixtureThermo
constGasHThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -616,7 +616,7 @@ makeReactionMixtureThermo
gasHThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -624,7 +624,7 @@ makeReactionMixtureThermo
constIncompressibleGasHThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -632,7 +632,7 @@ makeReactionMixtureThermo
incompressibleGasHThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -640,7 +640,7 @@ makeReactionMixtureThermo
icoPoly8HThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -648,7 +648,7 @@ makeReactionMixtureThermo
constFluidHThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,
@ -656,7 +656,7 @@ makeReactionMixtureThermo
constAdiabaticFluidHThermoPhysics
);
makeReactionMixtureThermo
makeThermoPhysicsReactionThermo
(
rhoReactionThermo,
heRhoThermo,