Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
andy 2013-04-11 12:06:22 +01:00
commit 652e318422
3 changed files with 5 additions and 4 deletions

View File

@ -48,7 +48,8 @@ namespace Foam
defineTemplateTypeNameAndDebugWithName \
( \
sChemistryl##Comp##SThermo, \
(#sChemistry"<"#Comp"," + SThermo::typeName() + ">").c_str(), \
(word(sChemistry::typeName_()) + "<"#Comp"," + SThermo::typeName() + \
+ ">").c_str(), \
0 \
); \
\

View File

@ -47,8 +47,8 @@ namespace Foam
defineTemplateTypeNameAndDebugWithName \
( \
SS##Schem##Comp##SThermo##GThermo, \
(#SS"<"#Schem"<"#Comp"," + SThermo::typeName() + "," \
+ GThermo::typeName() + ">>").c_str(), \
(#SS"<" + word(Schem::typeName_()) +"<"#Comp"," + SThermo::typeName() \
+ "," + GThermo::typeName() + ">>").c_str(), \
0 \
); \
\

View File

@ -18,7 +18,7 @@ FoamFile
chemistryType
{
chemistrySolver ode;
chemistryThermo pyrolysisChemistryModel;
chemistryThermo pyrolysis;
}
chemistry on;