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

[1D] Added loglevel argument to control output from save and restore

Browse source 
Passing loglevel=0 to Sim1D::save or Sim1D::restore will suppress all output
from these functions. The default loglevel maintains the normal level of output.
This commit is contained in:
Ray Speth 2012-12-18 00:09:29 +00:00
parent b4218203d2
commit 14426bfc86
12 changed files with 77 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cantera/oneD/Domain1D.h
View file

@ -530,7 +530,7 @@ public:
virtual void showSolution_s(std::ostream& s, const doublereal* x) {}
virtual void showSolution(const doublereal* x);
virtual void restore(const XML_Node& dom, doublereal* soln) {}
virtual void restore(const XML_Node& dom, doublereal* soln, int loglevel) {}
doublereal z(size_t jlocal) const {
return m_z[jlocal];

14
include/cantera/oneD/Inlet1D.h
View file

@ -183,7 +183,7 @@ public:
virtual void eval(size_t jg, doublereal* xg, doublereal* rg,
integer* diagg, doublereal rdt);
virtual void save(XML_Node& o, const doublereal* const soln);
virtual void restore(const XML_Node& dom, doublereal* soln);
virtual void restore(const XML_Node& dom, doublereal* soln, int loglevel);
protected:
@ -218,7 +218,7 @@ public:
integer* diagg, doublereal rdt);
virtual void save(XML_Node& o, const doublereal* const soln);
virtual void restore(const XML_Node& dom, doublereal* soln);
virtual void restore(const XML_Node& dom, doublereal* soln, int loglevel);
virtual void _finalize(const doublereal* x) {}
virtual void _getInitialSoln(doublereal* x) {
x[0] = 0.0;
@ -250,7 +250,7 @@ public:
integer* diagg, doublereal rdt);
virtual void save(XML_Node& o, const doublereal* const soln);
virtual void restore(const XML_Node& dom, doublereal* soln);
virtual void restore(const XML_Node& dom, doublereal* soln, int loglevel);
virtual void _finalize(const doublereal* x) {
; //m_temp = x[0];
}
@ -283,7 +283,7 @@ public:
integer* diagg, doublereal rdt);
virtual void save(XML_Node& o, const doublereal* const soln);
virtual void restore(const XML_Node& dom, doublereal* soln);
virtual void restore(const XML_Node& dom, doublereal* soln, int loglevel);
virtual void _finalize(const doublereal* x) {
; //m_temp = x[0];
}
@ -335,7 +335,7 @@ public:
virtual void eval(size_t jg, doublereal* xg, doublereal* rg,
integer* diagg, doublereal rdt);
virtual void save(XML_Node& o, const doublereal* const soln);
virtual void restore(const XML_Node& dom, doublereal* soln);
virtual void restore(const XML_Node& dom, doublereal* soln, int loglevel);
protected:
@ -370,7 +370,7 @@ public:
integer* diagg, doublereal rdt);
virtual void save(XML_Node& o, const doublereal* const soln);
virtual void restore(const XML_Node& dom, doublereal* soln);
virtual void restore(const XML_Node& dom, doublereal* soln, int loglevel);
virtual void _getInitialSoln(doublereal* x) {
x[0] = m_temp;
@ -433,7 +433,7 @@ public:
integer* diagg, doublereal rdt);
virtual void save(XML_Node& o, const doublereal* const soln);
virtual void restore(const XML_Node& dom, doublereal* soln);
virtual void restore(const XML_Node& dom, doublereal* soln, int loglevel);
virtual void _getInitialSoln(doublereal* x) {
x[0] = m_temp;

2
include/cantera/oneD/OneDim.h
View file

@ -193,7 +193,7 @@ public:
void writeStats(int printTime = 1);
void save(const std::string& fname, std::string id,
const std::string& desc, doublereal* sol);
const std::string& desc, doublereal* sol, int loglevel);
// options
void setMinTimeStep(doublereal tmin) {

6
include/cantera/oneD/Sim1D.h
View file

@ -73,10 +73,10 @@ public:
//@}
void save(const std::string& fname, const std::string& id,
const std::string& desc);
const std::string& desc, int loglevel=1);
void saveResidual(const std::string& fname, const std::string& id,
const std::string& desc);
const std::string& desc, int loglevel=1);
/// Print to stream s the current solution for all domains.
void showSolution(std::ostream& s);
@ -115,7 +115,7 @@ public:
*/
void setGridMin(int dom, double gridmin);
void restore(const std::string& fname, const std::string& id);
void restore(const std::string& fname, const std::string& id, int loglevel=2);
void getInitialSoln();
void setSolution(const doublereal* soln) {

3
include/cantera/oneD/StFlow.h
View file

@ -188,7 +188,8 @@ public:
*/
virtual void save(XML_Node& o, const doublereal* const sol);
virtual void restore(const XML_Node& dom, doublereal* soln);
virtual void restore(const XML_Node& dom, doublereal* soln,
int loglevel);
// overloaded in subclasses
virtual std::string flowType() {

4
interfaces/cython/cantera/_cantera.pxd
View file

@ -408,8 +408,8 @@ cdef extern from "cantera/oneD/Sim1D.h":
void solve(int, cbool) except +
void refine(int) except +
void setRefineCriteria(size_t, double, double, double, double)
void save(string, string, string) except +
void restore(string, string) except +
void save(string, string, string, int) except +
void restore(string, string, int) except +
void writeStats(int) except +
int domainIndex(string) except +
double value(size_t, size_t, size_t) except +

12
interfaces/cython/cantera/onedim.pyx
View file

@ -699,7 +699,8 @@ cdef class Sim1D:
"""
self.sim.setFixedTemperature(T)
def save(self, filename='soln.xml', name='solution', description='none'):
def save(self, filename='soln.xml', name='solution', description='none',
loglevel=1):
"""
Save the solution in XML format.
@ -708,19 +709,22 @@ cdef class Sim1D:
"""
self.sim.save(stringify(filename), stringify(name),
stringify(description))
stringify(description), loglevel)
def restore(self, filename='soln.xml', name='solution'):
def restore(self, filename='soln.xml', name='solution', loglevel=2):
"""Set the solution vector to a previously-saved solution.
:param filename:
solution file
:param name:
solution name within the file
:param loglevel:
Amount of logging information to display while restoring,
from 0 (disabled) to 2 (most verbose).
>>> s.restore(filename='save.xml', id='energy_off')
"""
self.sim.restore(stringify(filename), stringify(name))
self.sim.restore(stringify(filename), stringify(name), loglevel)
self._initialized = True
def showStats(self, printTime=True):

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

@ -186,10 +186,10 @@ class TestFreeFlame(utilities.CanteraTest):
u1 = self.sim.u
V1 = self.sim.V
self.sim.save(filename, 'test')
self.sim.save(filename, 'test', loglevel=0)
self.create_sim(p, Tin, reactants)
self.sim.restore(filename, 'test')
self.sim.restore(filename, 'test', loglevel=0)
Y2 = self.sim.Y
u2 = self.sim.u
V2 = self.sim.V

7
src/oneD/OneDim.cpp
View file

@ -474,7 +474,8 @@ doublereal OneDim::timeStep(int nsteps, doublereal dt, doublereal* x,
void OneDim::save(const std::string& fname, std::string id,
const std::string& desc, doublereal* sol)
const std::string& desc, doublereal* sol,
int loglevel)
{
struct tm* newtime;
@ -519,7 +520,9 @@ void OneDim::save(const std::string& fname, std::string id,
}
ct->write(s);
s.close();
writelog("Solution saved to file "+fname+" as solution "+id+".\n");
if (loglevel > 0) {
writelog("Solution saved to file "+fname+" as solution "+id+".\n");
}
}

13
src/oneD/Sim1D.cpp
View file

@ -143,23 +143,24 @@ void Sim1D::setProfile(size_t dom, size_t comp,
void Sim1D::save(const std::string& fname, const std::string& id,
const std::string& desc)
const std::string& desc, int loglevel)
{
OneDim::save(fname, id, desc, DATA_PTR(m_x));
OneDim::save(fname, id, desc, DATA_PTR(m_x), loglevel);
}
void Sim1D::saveResidual(const std::string& fname, const std::string& id,
const std::string& desc)
const std::string& desc, int loglevel)
{
vector_fp res(m_x.size(), -999);
OneDim::eval(npos, &m_x[0], &res[0], 0.0);
OneDim::save(fname, id, desc, &res[0]);
OneDim::save(fname, id, desc, &res[0], loglevel);
}
/**
* Initialize the solution with a previously-saved solution.
*/
void Sim1D::restore(const std::string& fname, const std::string& id)
void Sim1D::restore(const std::string& fname, const std::string& id,
int loglevel)
{
ifstream s(fname.c_str());
//char buf[100];
@ -195,7 +196,7 @@ void Sim1D::restore(const std::string& fname, const std::string& id)
m_xnew.resize(sz);
for (m = 0; m < m_nd; m++) {
if (xd[m]) {
domain(m).restore(*xd[m], DATA_PTR(m_x) + domain(m).loc());
domain(m).restore(*xd[m], DATA_PTR(m_x) + domain(m).loc(), loglevel);
}
}
resize();

48
src/oneD/StFlow.cpp
View file

@ -1044,7 +1044,7 @@ size_t StFlow::componentIndex(const std::string& name) const
}
void StFlow::restore(const XML_Node& dom, doublereal* soln)
void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
vector<string> ignored;
@ -1079,8 +1079,10 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln)
if (nm == "z") {
getFloatArray(fa,x,false);
np = x.size();
writelog("Grid contains "+int2str(np)+
" points.\n");
if (loglevel >= 2) {
writelog("Grid contains "+int2str(np)+
" points.\n");
}
readgrid = true;
setupGrid(np, DATA_PTR(x));
}
@ -1090,13 +1092,17 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln)
"domain contains no grid points.");
}
writelog("Importing datasets:\n");
if (loglevel >= 2) {
writelog("Importing datasets:\n");
}
for (n = 0; n < nd; n++) {
const XML_Node& fa = *d[n];
nm = fa["title"];
getFloatArray(fa,x,false);
if (nm == "u") {
writelog("axial velocity ");
if (loglevel >= 2) {
writelog("axial velocity ");
}
if (x.size() == np) {
for (j = 0; j < np; j++) {
soln[index(0,j)] = x[j];
@ -1107,7 +1113,9 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln)
} else if (nm == "z") {
; // already read grid
} else if (nm == "V") {
writelog("radial velocity ");
if (loglevel >= 2) {
writelog("radial velocity ");
}
if (x.size() == np) {
for (j = 0; j < np; j++) {
soln[index(1,j)] = x[j];
@ -1116,7 +1124,9 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln)
goto error;
}
} else if (nm == "T") {
writelog("temperature ");
if (loglevel >= 2) {
writelog("temperature ");
}
if (x.size() == np) {
for (j = 0; j < np; j++) {
soln[index(2,j)] = x[j];
@ -1136,7 +1146,9 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln)
goto error;
}
} else if (nm == "L") {
writelog("lambda ");
if (loglevel >=2) {
writelog("lambda ");
}
if (x.size() == np) {
for (j = 0; j < np; j++) {
soln[index(3,j)] = x[j];
@ -1145,7 +1157,9 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln)
goto error;
}
} else if (m_thermo->speciesIndex(nm) != npos) {
writelog(nm+" ");
if (loglevel >=2) {
writelog(nm+" ");
}
if (x.size() == np) {
k = m_thermo->speciesIndex(nm);
did_species[k] = 1;
@ -1158,7 +1172,7 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln)
}
}
if (ignored.size() != 0) {
if (loglevel >=2 && !ignored.empty()) {
writelog("\n\n");
writelog("Ignoring datasets:\n");
size_t nn = ignored.size();
@ -1167,13 +1181,15 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln)
}
}
for (ks = 0; ks < nsp; ks++) {
if (did_species[ks] == 0) {
if (!wrote_header) {
writelog("Missing data for species:\n");
wrote_header = true;
if (loglevel >= 1) {
for (ks = 0; ks < nsp; ks++) {
if (did_species[ks] == 0) {
if (!wrote_header) {
writelog("Missing data for species:\n");
wrote_header = true;
}
writelog(m_thermo->speciesName(ks)+" ");
}
writelog(m_thermo->speciesName(ks)+" ");
}
}

14
src/oneD/boundaries1D.cpp
View file

@ -253,7 +253,7 @@ save(XML_Node& o, const doublereal* const soln)
}
void Inlet1D::
restore(const XML_Node& dom, doublereal* soln)
restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
//map<string, double> x;
//getFloats(dom, x);
@ -322,7 +322,7 @@ save(XML_Node& o, const doublereal* const soln)
}
void Empty1D::
restore(const XML_Node& dom, doublereal* soln)
restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
resize(1,1);
}
@ -413,7 +413,7 @@ save(XML_Node& o, const doublereal* const soln)
}
void Symm1D::
restore(const XML_Node& dom, doublereal* soln)
restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
resize(1,1);
}
@ -523,7 +523,7 @@ save(XML_Node& o, const doublereal* const soln)
}
void Outlet1D::
restore(const XML_Node& dom, doublereal* soln)
restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
resize(1,1);
}
@ -672,7 +672,7 @@ save(XML_Node& o, const doublereal* const soln)
}
void OutletRes1D::
restore(const XML_Node& dom, doublereal* soln)
restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
resize(1,1);
}
@ -761,7 +761,7 @@ save(XML_Node& o, const doublereal* const soln)
}
void Surf1D::
restore(const XML_Node& dom, doublereal* soln)
restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
map<string, double> x;
ctml::getFloats(dom, x);
@ -924,7 +924,7 @@ save(XML_Node& o, const doublereal* const soln)
}
void ReactingSurf1D::
restore(const XML_Node& dom, doublereal* soln)
restore(const XML_Node& dom, doublereal* soln, int loglevel)
{
map<string, double> x;
ctml::getFloats(dom, x);