zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TDACChemistryModel: Allow reduction and tabulation methods to be instantiated in the same file

Browse Source
This commit is contained in:
Henry Weller
2018-12-14 15:05:02 +00:00
parent df4e383d5a
commit b66cad39ee
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/reduction/makeChemistryReductionMethods.H
View File

@ -39,18 +39,20 @@ License
#define makeChemistryReductionMethod(SS, Comp, Thermo) \
\
typedef chemistryReductionMethods::SS<Comp, Thermo> SS##Comp##Thermo; \
typedef chemistryReductionMethods::SS<Comp, Thermo> \
chemistryReductionMethod##SS##Comp##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##Comp##Thermo, \
chemistryReductionMethod##SS##Comp##Thermo, \
(#SS"<" + word(Comp::typeName_()) \
+ "," + Thermo::typeName() + ">").c_str(), \
0 \
); \
\
chemistryReductionMethod<Comp, Thermo>:: \
adddictionaryConstructorToTable<SS##Comp##Thermo> \
adddictionaryConstructorToTable \
<chemistryReductionMethod##SS##Comp##Thermo> \
add##chemistryReductionMethods##SS##Comp##Thermo##ConstructorToTable_;

8
src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/tabulation/makeChemistryTabulationMethods.H
View File

@ -34,18 +34,20 @@ License
#define makeChemistryTabulationMethod(SS, Comp, Thermo) \
\
typedef chemistryTabulationMethods::SS<Comp, Thermo> SS##Comp##Thermo; \
typedef chemistryTabulationMethods::SS<Comp, Thermo> \
chemistryTabulationMethod##SS##Comp##Thermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
SS##Comp##Thermo, \
chemistryTabulationMethod##SS##Comp##Thermo, \
(#SS"<" + word(Comp::typeName_()) \
+ "," + Thermo::typeName() + ">").c_str(), \
0 \
); \
\
chemistryTabulationMethod<Comp, Thermo>:: \
adddictionaryConstructorToTable<SS##Comp##Thermo> \
adddictionaryConstructorToTable \
<chemistryTabulationMethod##SS##Comp##Thermo> \
add##chemistryTabulationMethods##SS##Comp##Thermo##ConstructorToTable_;