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

[1D] Fixed restoration from XML files with missing fields

Browse source 
This improves compatibility with output files from older versions of Cantera
that don't save the 'energy_enabled' and 'species_enabled' flags.
This commit is contained in:
Ray Speth 2013-03-08 15:32:02 +00:00
parent 86ce3da4ef
commit c59ee86d5d
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/oneD/StFlow.cpp
View file

@ -888,26 +888,30 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel)
}
}
getFloatArray(dom, x, false, "", "energy_enabled");
if (x.size() == nPoints()) {
for (size_t i = 0; i < x.size(); i++) {
m_do_energy[i] = x[i];
if (dom.hasChild("energy_enabled")) {
getFloatArray(dom, x, false, "", "energy_enabled");
if (x.size() == nPoints()) {
for (size_t i = 0; i < x.size(); i++) {
m_do_energy[i] = x[i];
}
} else if (!x.empty()) {
throw CanteraError("StFlow::restore", "energy_enabled is length" +
int2str(x.size()) + "but should be length" +
int2str(nPoints()));
}
} else if (!x.empty()) {
throw CanteraError("StFlow::restore", "energy_enabled is length" +
int2str(x.size()) + "but should be length" +
int2str(nPoints()));
}
getFloatArray(dom, x, false, "", "species_enabled");
if (x.size() == m_nsp) {
for (size_t i = 0; i < x.size(); i++) {
m_do_species[i] = x[i];
if (dom.hasChild("species_enabled")) {
getFloatArray(dom, x, false, "", "species_enabled");
if (x.size() == m_nsp) {
for (size_t i = 0; i < x.size(); i++) {
m_do_species[i] = x[i];
}
} else if (!x.empty()) {
throw CanteraError("StFlow::restore", "species_enabled is length" +
int2str(x.size()) + "but should be length" +
int2str(m_nsp));
}
} else if (!x.empty()) {
throw CanteraError("StFlow::restore", "species_enabled is length" +
int2str(x.size()) + "but should be length" +
int2str(m_nsp));
}
if (dom.hasChild("refine_criteria")) {