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

[1D] Fix saving multiple flame profiles to a single XML file

Browse source 
Broken by the change in b0e5b13913. Modify the save_restore test
to cover this case.
This commit is contained in:
Ray Speth 2015-05-02 19:41:18 -04:00
parent decf251a8b
commit fd659c09ea
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -252,6 +252,9 @@ class TestFreeFlame(utilities.CanteraTest):
self.sim.save(filename, 'test', loglevel=0)
# Save a second solution to the same file
self.sim.save(filename, 'test2', loglevel=0)
# Create flame object with dummy initial grid
self.sim = ct.FreeFlame(self.gas)
self.sim.restore(filename, 'test', loglevel=0)

10
src/oneD/OneDim.cpp
View file

@ -380,9 +380,8 @@ void OneDim::save(const std::string& fname, std::string id,
::time(&aclock); // Get time in seconds
struct tm* newtime = localtime(&aclock); // Convert time to struct tm form
XML_Node root("doc");
XML_Node root("ctml");
ifstream fin(fname.c_str());
XML_Node* ct;
if (fin) {
root.build(fin);
// Remove existing solution with the same id
@ -391,11 +390,8 @@ void OneDim::save(const std::string& fname, std::string id,
same_ID->parent()->removeChild(same_ID);
}
fin.close();
ct = &root.child("ctml");
} else {
ct = &root.addChild("ctml");
}
XML_Node& sim = ct->addChild("simulation");
XML_Node& sim = root.addChild("simulation");
sim.addAttribute("id",id);
addString(sim,"timestamp",asctime(newtime));
if (desc != "") {
@ -411,7 +407,7 @@ void OneDim::save(const std::string& fname, std::string id,
if (!s) {
throw CanteraError("save","could not open file "+fname);
}
ct->write(s);
root.write(s);
s.close();
writelog("Solution saved to file "+fname+" as solution "+id+".\n", loglevel);
}