Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry
2013-04-10 17:05:07 +01:00
2 changed files with 6 additions and 4 deletions

View File

@ -53,11 +53,12 @@ New
Info<< "Selecting chemistry type " << chemistryTypeDict << endl;
const int nCmpt = 12;
const int nCmpt = 13;
const char* cmptNames[nCmpt] =
{
"chemistrySolver",
"chemistryThermo",
"baseChemistry",
"transport",
"thermo",
"equationOfState",
@ -107,8 +108,9 @@ New
word chemistryTypeName
(
word(chemistryTypeDict.lookup("chemistrySolver")) + '<'
+ word(chemistryTypeDict.lookup("chemistryThermo")) + ','
+ solidThermoTypeName + ',' + gasThermoTypeName + ">"
+ word(chemistryTypeDict.lookup("chemistryThermo")) + '<'
+ typeName + ','
+ solidThermoTypeName + ',' + gasThermoTypeName + ">>"
);
Info<< "chemistryTypeName " << chemistryTypeName << endl;

View File

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