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

[1D] Save and restore energy_enabled and species_enabled flags

Browse source
This commit is contained in:
Ray Speth 2013-03-07 18:51:33 +00:00
parent 557078229f
commit 302ebb2c7e
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interfaces/cython/cantera/test/test_onedim.py
View file

@ -222,6 +222,7 @@ class TestFreeFlame(utilities.CanteraTest):
rtol, atol = self.sim.flame.tolerances('T')
self.assertNear(rtol, self.tol_ss[0])
self.assertNear(atol, self.tol_ss[1])
self.assertFalse(self.sim.energy_enabled)
P2a = self.sim.P

36
src/oneD/StFlow.cpp
View file

@ -887,8 +887,29 @@ 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];
}
} 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];
}
} else if (!x.empty()) {
throw CanteraError("StFlow::restore", "species_enabled is length" +
int2str(x.size()) + "but should be length" +
int2str(m_nsp));
}
}
XML_Node& StFlow::save(XML_Node& o, const doublereal* const sol)
@ -933,6 +954,19 @@ XML_Node& StFlow::save(XML_Node& o, const doublereal* const sol)
addFloatArray(gv,m_thermo->speciesName(k),
x.size(),DATA_PTR(x),"","massFraction",0.0,1.0);
}
vector_fp values(nPoints());
for (size_t i = 0; i < nPoints(); i++) {
values[i] = m_do_energy[i];
}
addNamedFloatArray(flow, "energy_enabled", nPoints(), &values[0]);
values.resize(m_nsp);
for (size_t i = 0; i < m_nsp; i++) {
values[i] = m_do_species[i];
}
addNamedFloatArray(flow, "species_enabled", m_nsp, &values[0]);
return flow;
}