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

STYLE: thermo: Macro renaming

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

24
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C
View File

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

136
src/thermophysicalModels/basic/fluidThermo/makeThermo.H
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 \ typedef \
Transport \ Transport \
< \
species::thermo \
< \ < \
Thermo \ species::thermo \
< \ < \
EqnOfState \ Thermo \
< \ < \
Specie \ EqnOfState \
> \ < \
>, \ Specie \
Type \ > \
>, \
Type \
> \
> \ > \
> Transport##Type##Thermo##EqnOfState##Specie; \ Transport##Type##Thermo##EqnOfState##Specie
#define defineThermoPhysicsThermo(BaseThermo,CThermo,Mixture,ThermoPhys) \
\ \
typedef \ typedef \
Cthermo \ CThermo \
< \ < \
BaseThermo, \ BaseThermo, \
Mixture<Transport##Type##Thermo##EqnOfState##Specie> \ Mixture<ThermoPhys> \
> Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie; \ > \
CThermo##Mixture##ThermoPhys; \
\ \
defineTemplateTypeNameAndDebugWithName \ defineTemplateTypeNameAndDebugWithName \
( \
Cthermo##Mixture##Transport##Type##Thermo##EqnOfState##Specie, \
( \ ( \
#Cthermo"<" \ CThermo##Mixture##ThermoPhys, \
+ Mixture<Transport##Type##Thermo##EqnOfState##Specie>::typeName() \ (#CThermo"<" + Mixture<ThermoPhys>::typeName() + ">").c_str(), \
+ ">" \ 0 \
).c_str(), \ )
0 \
);
#define makeThermo(BaseThermo,Cthermo,Mixture,Transport,Type,Thermo,EqnOfState,Specie)\ #define addThermoPhysicsThermo(BaseThermo,CThermoMixtureThermoPhys) \
\ \
makeThermoTypedefs \ addToRunTimeSelectionTable \
( \ ( \
BaseThermo, \ BaseThermo, \
Cthermo, \ CThermoMixtureThermoPhys, \
Mixture, \ fvMesh \
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 \
);
#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 #endif

30
src/thermophysicalModels/basic/psiThermo/psiThermos.C
View File

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

60
src/thermophysicalModels/basic/rhoThermo/rhoThermos.C
View File

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

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

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

28
src/thermophysicalModels/reactionThermo/psiReactionThermo/psiReactionThermos.C
View File

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

88
src/thermophysicalModels/reactionThermo/rhoReactionThermo/rhoReactionThermos.C
View File

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