songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Thermodynamics: rationalised the "make" macros for chemistrySolvers

Browse Source
This commit is contained in:
Henry 2012-09-26 23:49:29 +01:00
parent 931b86335e
commit 4413f10e97
3 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
View File

@ -112,7 +112,6 @@ public:
);
#define makeChemistrySolverType(SS, ODEChem, Comp, Thermo) \
\
typedef SS<ODEChem<Comp, Thermo> > SS##ODEChem##Comp##Thermo; \
@ -132,26 +131,6 @@ public:
);
#define makeSolidChemistrySolverType(SS, ODEChem, Comp, SThermo, GThermo) \
\
typedef SS<ODEChem<Comp, SThermo, GThermo> > \
SS##ODEChem##Comp##SThermo##GThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##ODEChem##Comp##SThermo##GThermo, \
#SS"<"#ODEChem"<"#Comp","#SThermo","#GThermo">>", \
0 \
); \
\
addToRunTimeSelectionTable \
( \
Comp, \
SS##ODEChem##Comp##SThermo##GThermo, \
fvMesh \
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository

5
src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolverType.H
View File

@ -41,6 +41,11 @@ namespace Foam
#define makeSolidChemistrySolverType(SS, ODEChem, Comp, SThermo, GThermo) \
\
typedef ODESolidChemistryModel<Comp, SThermo, GThermo> \
ODESolidChemistryModel##Comp##SThermo##GThermo; \
\
makeChemistrySolver(ODESolidChemistryModel##Comp##SThermo##GThermo) \
\
typedef SS<ODEChem<Comp, SThermo, GThermo> > \
SS##ODEChem##Comp##SThermo##GThermo; \
\

14
src/thermophysicalModels/solidChemistryModel/solidChemistrySolver/makeSolidChemistrySolvers.C
View File

@ -27,8 +27,6 @@ License
#include "solidThermoPhysicsTypes.H"
#include "thermoPhysicsTypes.H"
#include "chemistrySolver.H"
#include "ODESolidChemistryModel.H"
#include "solidChemistryModel.H"
@ -38,12 +36,6 @@ License
namespace Foam
{
typedef ODESolidChemistryModel
<solidChemistryModel, hConstSolidThermoPhysics, gasThermoPhysics>
solidODEChemistryConstThermo;
makeChemistrySolver(solidODEChemistryConstThermo)
makeSolidChemistrySolverType
(
ode,
@ -53,12 +45,6 @@ namespace Foam
gasThermoPhysics
)
typedef ODESolidChemistryModel
<solidChemistryModel, hExponentialSolidThermoPhysics, gasThermoPhysics>
solidODEChemistryExpThermo;
makeChemistrySolver(solidODEChemistryExpThermo)
makeSolidChemistrySolverType
(
ode,