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

fixed an error in the reading of the XML file.

Browse source 
Comments in the <thermo> node of a file would create error conditions.
Now, you can add comments anywhere and there shouldn't be any
runtime differences.
This commit is contained in:
Harry Moffat 2010-09-21 15:52:27 +00:00
parent 4ccbaed862
commit 3446c33520
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Cantera/src/thermo/SpeciesThermoFactory.cpp
View file

@ -816,7 +816,17 @@ namespace Cantera {
speciesNode["name"], "<nonexistent>");
}
const XML_Node& thermo = speciesNode.child("thermo");
const std::vector<XML_Node*>& tp = thermo.children();
// Get the children of the thermo XML node. In the next bit of code we take out the comments that
// may have been childrent of the thermo XML node by doing a selective copy.
// These shouldn't interfere with the algorithm at any point.
const std::vector<XML_Node*>& tpWC = thermo.children();
std::vector<XML_Node *> tp;
for (int i = 0; i < static_cast<int>(tpWC.size()); i++) {
if (! (tpWC[i])->isComment()) {
tp.push_back(tpWC[i]);
}
}
int nc = static_cast<int>(tp.size());
string mname = thermo["model"];
@ -845,9 +855,6 @@ namespace Cantera {
else if (f->name() == "NASA9") {
installNasa9ThermoFromXML(speciesNode["name"], spthermo, k, tp);
}
// else if (f->name() == "HKFT") {
// installHKFTThermoFromXML(s["name"], spthermo, k, tp);
//}
#ifdef WITH_ADSORBATE
else if (f->name() == "adsorbate") {
installAdsorbateThermoFromXML(speciesNode["name"], spthermo, k, *f);