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

makeSolidChemistryModel: Separate solid-only and solid-gas instantiation macros

Browse Source 
Avoids duplicate typedefs.
Thanks to Bruno Santo for patch
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1694
This commit is contained in:
Henry
2015-05-17 22:04:36 +01:00
parent e54868da7e
commit 4aed56e67d
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/thermophysicalModels/solidChemistryModel/basicSolidChemistryModel/basicSolidChemistryModels.C
View File

@ -39,8 +39,17 @@ Description
#include "thermoPhysicsTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// hConstSolidThermoPhysics
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hConstSolidThermoPhysics
);
makeSolidGasChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
@ -49,7 +58,19 @@ makeSolidChemistryModel
gasHThermoPhysics
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// hPowerSolidThermoPhysics
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hPowerSolidThermoPhysics
);
makeSolidGasChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
@ -58,7 +79,19 @@ makeSolidChemistryModel
gasHThermoPhysics
);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// hExpKappaConstSolidThermoPhysics
makeSolidChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,
basicSolidChemistryModel,
hExpKappaConstSolidThermoPhysics
);
makeSolidGasChemistryModel
(
solidChemistryModel,
pyrolysisChemistryModel,

19
src/thermophysicalModels/solidChemistryModel/makeSolidChemistryModel.H
View File

@ -34,21 +34,24 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeSolidChemistryModel(sChemistry, SS, Comp, SThermo, GThermo) \
\
typedef Foam::SS<Foam::Comp, Foam::SThermo, Foam::GThermo> \
SS##Comp##SThermo##GThermo; \
#define makeSolidChemistryModel(sChemistry, SS, Comp, SThermo) \
\
typedef Foam::sChemistry<Foam::Comp, Foam::SThermo> \
sChemistryl##Comp##SThermo; \
sChemistry##Comp##SThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \
sChemistryl##Comp##SThermo, \
(Foam::word(sChemistryl##Comp##SThermo::typeName_()) + "<"#Comp"," \
sChemistry##Comp##SThermo, \
(Foam::word(sChemistry##Comp##SThermo::typeName_()) + "<"#Comp"," \
+ SThermo::typeName() + ">").c_str(), \
0 \
); \
);
#define makeSolidGasChemistryModel(sChemistry, SS, Comp, SThermo, GThermo) \
\
typedef Foam::SS<Foam::Comp, Foam::SThermo, Foam::GThermo> \
SS##Comp##SThermo##GThermo; \
\
defineTemplateTypeNameAndDebugWithName \
( \