From 41527b1ea7f524d1894dd8a51a7bd8bb87695dda Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sun, 6 Sep 2015 22:45:17 -0400 Subject: [PATCH] Rename two-argument version of writelog 'debuglog' This is a prerequisite to allowing writelog to take an arbitrary number of arguments. --- include/cantera/base/global.h | 2 +- src/equil/ChemEquil.cpp | 2 +- src/equil/MultiPhase.cpp | 16 ++++++++-------- src/oneD/MultiNewton.cpp | 6 +++--- src/oneD/OneDim.cpp | 10 +++++----- src/oneD/Sim1D.cpp | 10 +++++----- src/oneD/StFlow.cpp | 14 +++++++------- src/thermo/PureFluidPhase.cpp | 2 +- src/thermo/ThermoPhase.cpp | 8 ++++---- src/zeroD/ReactorNet.cpp | 4 ++-- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/cantera/base/global.h b/include/cantera/base/global.h index 8a6bf834c..1ff32cbbe 100644 --- a/include/cantera/base/global.h +++ b/include/cantera/base/global.h @@ -147,7 +147,7 @@ std::string canteraRoot(); void writelog(const std::string& msg); //! Write a message to the log only if loglevel > 0 -inline void writelog(const std::string& msg, int loglevel) +inline void debuglog(const std::string& msg, int loglevel) { if (loglevel > 0) { writelog(msg); diff --git a/src/equil/ChemEquil.cpp b/src/equil/ChemEquil.cpp index 575199011..0919f52c8 100644 --- a/src/equil/ChemEquil.cpp +++ b/src/equil/ChemEquil.cpp @@ -1410,7 +1410,7 @@ int ChemEquil::estimateEP_Brinkley(thermo_t& s, vector_fp& x, } catch (CanteraError& err) { err.save(); if (DEBUG_MODE_ENABLED) { - writelog("Matrix is SINGULAR.ERROR\n", ChemEquil_print_lvl); + debuglog("Matrix is SINGULAR.ERROR\n", ChemEquil_print_lvl); } s.restoreState(state); throw CanteraError("equilibrate:estimateEP_Brinkley()", diff --git a/src/equil/MultiPhase.cpp b/src/equil/MultiPhase.cpp index c01541097..bf5bb2da7 100644 --- a/src/equil/MultiPhase.cpp +++ b/src/equil/MultiPhase.cpp @@ -745,7 +745,7 @@ void MultiPhase::equilibrate(const std::string& XY, const std::string& solver, int ixy = _equilflag(XY.c_str()); if (solver == "auto" || solver == "vcs") { try { - writelog("Trying VCS equilibrium solver\n", log_level); + debuglog("Trying VCS equilibrium solver\n", log_level); vcs_MultiPhaseEquil eqsolve(this, log_level-1); int ret = eqsolve.equilibrate(ixy, estimate_equil, log_level-1, rtol, max_steps); @@ -753,11 +753,11 @@ void MultiPhase::equilibrate(const std::string& XY, const std::string& solver, throw CanteraError("MultiPhase::equilibrate", "VCS solver failed. Return code: " + int2str(ret)); } - writelog("VCS solver succeeded\n", log_level); + debuglog("VCS solver succeeded\n", log_level); return; } catch (std::exception& err) { - writelog("VCS solver failed.\n", log_level); - writelog(err.what(), log_level); + debuglog("VCS solver failed.\n", log_level); + debuglog(err.what(), log_level); m_moleFractions = initial_moleFractions; m_moles = initial_moles; m_temp = initial_T; @@ -772,15 +772,15 @@ void MultiPhase::equilibrate(const std::string& XY, const std::string& solver, if (solver == "auto" || solver == "gibbs") { try { - writelog("Trying MultiPhaseEquil (Gibbs) equilibrium solver\n", + debuglog("Trying MultiPhaseEquil (Gibbs) equilibrium solver\n", log_level); equilibrate_MultiPhaseEquil(ixy, rtol, max_steps, max_iter, log_level-1); - writelog("MultiPhaseEquil solver succeeded\n", log_level); + debuglog("MultiPhaseEquil solver succeeded\n", log_level); return; } catch (std::exception& err) { - writelog("MultiPhaseEquil solver failed.\n", log_level); - writelog(err.what(), log_level); + debuglog("MultiPhaseEquil solver failed.\n", log_level); + debuglog(err.what(), log_level); m_moleFractions = initial_moleFractions; m_moles = initial_moles; m_temp = initial_T; diff --git a/src/oneD/MultiNewton.cpp b/src/oneD/MultiNewton.cpp index d18cf33b6..dd2bf20d9 100644 --- a/src/oneD/MultiNewton.cpp +++ b/src/oneD/MultiNewton.cpp @@ -253,7 +253,7 @@ int MultiNewton::dampStep(const doublereal* x0, const doublereal* step0, // this case, the Newton algorithm fails, so return an error // condition. if (fbound < 1.e-10) { - writelog("\nAt limits.\n", loglevel); + debuglog("\nAt limits.\n", loglevel); return -3; } @@ -334,7 +334,7 @@ int MultiNewton::solve(doublereal* x0, doublereal* x1, while (true) { // Check whether the Jacobian should be re-evaluated. if (jac.age() > m_maxAge) { - writelog("\nMaximum Jacobian age reached ("+int2str(m_maxAge)+")\n", loglevel); + debuglog("\nMaximum Jacobian age reached ("+int2str(m_maxAge)+")\n", loglevel); forceNewJac = true; } @@ -386,7 +386,7 @@ int MultiNewton::solve(doublereal* x0, doublereal* x1, break; } nJacReeval++; - writelog("\nRe-evaluating Jacobian, since no damping " + debuglog("\nRe-evaluating Jacobian, since no damping " "coefficient\ncould be found with this Jacobian.\n", loglevel); } else { diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp index 34f07f1f4..591aaedb6 100644 --- a/src/oneD/OneDim.cpp +++ b/src/oneD/OneDim.cpp @@ -320,8 +320,8 @@ doublereal OneDim::timeStep(int nsteps, doublereal dt, doublereal* x, // set the Jacobian age parameter to the transient value newton().setOptions(m_ts_jac_age); - writelog("\n\n step size (s) log10(ss) \n", loglevel); - writelog("===============================\n", loglevel); + debuglog("\n\n step size (s) log10(ss) \n", loglevel); + debuglog("===============================\n", loglevel); int n = 0; char str[80]; @@ -342,7 +342,7 @@ doublereal OneDim::timeStep(int nsteps, doublereal dt, doublereal* x, // the current solution in x. if (m >= 0) { n += 1; - writelog("\n", loglevel); + debuglog("\n", loglevel); copy(r, r + m_size, x); if (m == 100) { dt *= 1.5; @@ -351,7 +351,7 @@ doublereal OneDim::timeStep(int nsteps, doublereal dt, doublereal* x, } else { // No solution could be found with this time step. // Decrease the stepsize and try again. - writelog("...failure.\n", loglevel); + debuglog("...failure.\n", loglevel); dt *= m_tfactor; if (dt < m_tmin) { throw CanteraError("OneDim::timeStep", @@ -406,7 +406,7 @@ void OneDim::save(const std::string& fname, std::string id, } root.write(s); s.close(); - writelog("Solution saved to file "+fname+" as solution "+id+".\n", loglevel); + debuglog("Solution saved to file "+fname+" as solution "+id+".\n", loglevel); } } diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp index d6c0a2ad3..81db189a1 100644 --- a/src/oneD/Sim1D.cpp +++ b/src/oneD/Sim1D.cpp @@ -228,7 +228,7 @@ void Sim1D::solve(int loglevel, bool refine_grid) writeline('.', 78, true, true); } while (!ok) { - writelog("Attempt Newton solution of steady-state problem...", loglevel); + debuglog("Attempt Newton solution of steady-state problem...", loglevel); int status = newtonSolve(loglevel-1); if (status == 0) { @@ -255,7 +255,7 @@ void Sim1D::solve(int loglevel, bool refine_grid) soln_number++; } else { char buf[100]; - writelog(" failure. \n", loglevel); + debuglog(" failure. \n", loglevel); if (loglevel > 6) { save("debug_sim1d.xml", "debug", "After unsuccessful Newton solve"); @@ -264,7 +264,7 @@ void Sim1D::solve(int loglevel, bool refine_grid) saveResidual("debug_sim1d.xml", "residual", "After unsuccessful Newton solve"); } - writelog("Take "+int2str(nsteps)+" timesteps ", loglevel); + debuglog("Take "+int2str(nsteps)+" timesteps ", loglevel); dt = timeStep(nsteps, dt, DATA_PTR(m_x), DATA_PTR(m_xnew), loglevel-1); if (loglevel > 6) { @@ -315,7 +315,7 @@ void Sim1D::solve(int loglevel, bool refine_grid) new_points = 0; } } else { - writelog("grid refinement disabled.\n", loglevel); + debuglog("grid refinement disabled.\n", loglevel); new_points = 0; } } @@ -376,7 +376,7 @@ int Sim1D::refine(int loglevel) } } } else { - writelog("refine: discarding point at "+fp2str(d.grid(m))+"\n", loglevel); + debuglog("refine: discarding point at "+fp2str(d.grid(m))+"\n", loglevel); } } dsize.push_back(znew.size() - nstart); diff --git a/src/oneD/StFlow.cpp b/src/oneD/StFlow.cpp index ee18fa5c0..3a8d9a6a9 100644 --- a/src/oneD/StFlow.cpp +++ b/src/oneD/StFlow.cpp @@ -663,7 +663,7 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel) if (nm == "z") { getFloatArray(fa,x,false); np = x.size(); - writelog("Grid contains "+int2str(np)+" points.\n", loglevel >= 2); + debuglog("Grid contains "+int2str(np)+" points.\n", loglevel >= 2); readgrid = true; setupGrid(np, DATA_PTR(x)); } @@ -673,13 +673,13 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel) "domain contains no grid points."); } - writelog("Importing datasets:\n", loglevel >= 2); + debuglog("Importing datasets:\n", loglevel >= 2); 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 ", loglevel >= 2); + debuglog("axial velocity ", loglevel >= 2); if (x.size() != np) { throw CanteraError("StFlow::restore", "axial velocity array size error"); @@ -690,7 +690,7 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel) } else if (nm == "z") { ; // already read grid } else if (nm == "V") { - writelog("radial velocity ", loglevel >= 2); + debuglog("radial velocity ", loglevel >= 2); if (x.size() != np) { throw CanteraError("StFlow::restore", "radial velocity array size error"); @@ -699,7 +699,7 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel) soln[index(1,j)] = x[j]; } } else if (nm == "T") { - writelog("temperature ", loglevel >= 2); + debuglog("temperature ", loglevel >= 2); if (x.size() != np) { throw CanteraError("StFlow::restore", "temperature array size error"); @@ -718,7 +718,7 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel) } setFixedTempProfile(zz, x); } else if (nm == "L") { - writelog("lambda ", loglevel >= 2); + debuglog("lambda ", loglevel >= 2); if (x.size() != np) { throw CanteraError("StFlow::restore", "lambda arary size error"); @@ -727,7 +727,7 @@ void StFlow::restore(const XML_Node& dom, doublereal* soln, int loglevel) soln[index(3,j)] = x[j]; } } else if (m_thermo->speciesIndex(nm) != npos) { - writelog(nm+" ", loglevel >= 2); + debuglog(nm+" ", loglevel >= 2); if (x.size() == np) { k = m_thermo->speciesIndex(nm); did_species[k] = 1; diff --git a/src/thermo/PureFluidPhase.cpp b/src/thermo/PureFluidPhase.cpp index 281871076..9ed04c0b3 100644 --- a/src/thermo/PureFluidPhase.cpp +++ b/src/thermo/PureFluidPhase.cpp @@ -86,7 +86,7 @@ void PureFluidPhase::initThermo() double s_R = s0_R - log(p/refPressure()); m_sub->setStdState(h0_RT*GasConstant*298.15/m_mw, s_R*GasConstant/m_mw, T0, p); - writelog("PureFluidPhase::initThermo: initialized phase " + debuglog("PureFluidPhase::initThermo: initialized phase " +id()+"\n", m_verbose); } diff --git a/src/thermo/ThermoPhase.cpp b/src/thermo/ThermoPhase.cpp index 9a6ab386b..57dd87ee7 100644 --- a/src/thermo/ThermoPhase.cpp +++ b/src/thermo/ThermoPhase.cpp @@ -763,7 +763,7 @@ void ThermoPhase::equilibrate(const std::string& XY, const std::string& solver, if (solver == "auto" || solver == "element_potential") { vector_fp initial_state; saveState(initial_state); - writelog("Trying ChemEquil solver\n", log_level); + debuglog("Trying ChemEquil solver\n", log_level); try { ChemEquil E; E.options.maxIterations = max_steps; @@ -775,11 +775,11 @@ void ThermoPhase::equilibrate(const std::string& XY, const std::string& solver, "ChemEquil solver failed. Return code: " + int2str(ret)); } setElementPotentials(E.elementPotentials()); - writelog("ChemEquil solver succeeded\n", log_level); + debuglog("ChemEquil solver succeeded\n", log_level); return; } catch (std::exception& err) { - writelog("ChemEquil solver failed.\n", log_level); - writelog(err.what(), log_level); + debuglog("ChemEquil solver failed.\n", log_level); + debuglog(err.what(), log_level); restoreState(initial_state); if (solver == "auto") { } else { diff --git a/src/zeroD/ReactorNet.cpp b/src/zeroD/ReactorNet.cpp index 5c7f9144f..52855552a 100644 --- a/src/zeroD/ReactorNet.cpp +++ b/src/zeroD/ReactorNet.cpp @@ -36,7 +36,7 @@ void ReactorNet::initialize() size_t n, nv; char buf[100]; m_nv = 0; - writelog("Initializing reactor network.\n", m_verbose); + debuglog("Initializing reactor network.\n", m_verbose); if (m_reactors.empty()) { throw CanteraError("ReactorNet::initialize", "no reactors in network!"); @@ -96,7 +96,7 @@ void ReactorNet::initialize() void ReactorNet::reinitialize() { if (m_init) { - writelog("Re-initializing reactor network.\n", m_verbose); + debuglog("Re-initializing reactor network.\n", m_verbose); m_integ->reinitialize(m_time, *this); m_integrator_init = true; } else {