research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added MolarityIonicVPSS to the ThermoFactory

Browse source
This commit is contained in:
Harry Moffat 2011-11-09 18:39:51 +00:00
parent 5b03c282d8
commit 8742d6addb
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Cantera/src/thermo/MolarityIonicVPSSTP.cpp
View file

@ -261,10 +261,9 @@ namespace Cantera {
*/
stemp = thermoNode.attrib("model");
string formString = lowercase(stemp);
if (formString != "molarityionicvpss") {
if (formString != "molarityionicvpss" && formString != "molarityionicvpsstp") {
throw CanteraError("MolarityIonicVPSSTP::constructPhaseXML",
"model name isn't MolarityIonicVPSS: " + formString);
"model name isn't MolarityIonicVPSSTP: " + formString);
}
/*
@ -713,9 +712,9 @@ namespace Cantera {
XML_Node& thermoNode = phaseNode.child("thermo");
std::string mStringa = thermoNode.attrib("model");
std::string mString = lowercase(mStringa);
if (mString != "molarityionicvpss") {
if (mString != "molarityionicvpss" && mString != "molarityionicvpsstp") {
throw CanteraError(subname.c_str(),
"Unknown thermo model: " + mStringa + " - This object only knows \"MolarityIonicVPSS\" ");
"Unknown thermo model: " + mStringa + " - This object only knows \"MolarityIonicVPSSTP\" ");
}
/*
* Go get all of the coefficients and factors in the

4
Cantera/src/thermo/ThermoFactory.cpp
View file

@ -167,6 +167,10 @@ namespace Cantera {
th = new RedlichKisterVPSSTP();
break;
case cMolarityIonicVPSSTP:
th = new MolarityIonicVPSSTP();
break;
case cPhaseCombo_Interaction:
th = new PhaseCombo_Interaction();
break;