diff --git a/Cantera/src/equil/.cvsignore b/Cantera/src/equil/.cvsignore index 756fc5489..615a00414 100644 --- a/Cantera/src/equil/.cvsignore +++ b/Cantera/src/equil/.cvsignore @@ -1,3 +1,4 @@ Makefile *.d .depends +TODO.txt diff --git a/Cantera/src/equil/equilibrate.cpp b/Cantera/src/equil/equilibrate.cpp index e26b4bb17..ebf8fbcff 100644 --- a/Cantera/src/equil/equilibrate.cpp +++ b/Cantera/src/equil/equilibrate.cpp @@ -110,22 +110,21 @@ namespace Cantera { int printLvlSub = 0; if (loglevel > 0) { - beginLogGroup("equilibrate", loglevel); - addLogEntry("Single-phase equilibrate function"); - { - beginLogGroup("arguments"); - addLogEntry("phase",s.id()); - addLogEntry("XY",XY); - addLogEntry("solver",solver); - addLogEntry("rtol",rtol); - addLogEntry("maxsteps",maxsteps); - addLogEntry("maxiter",maxiter); - addLogEntry("loglevel",loglevel); - endLogGroup("arguments"); - } + beginLogGroup("equilibrate", loglevel); + addLogEntry("Single-phase equilibrate function"); + { + beginLogGroup("arguments"); + addLogEntry("phase",s.id()); + addLogEntry("XY",XY); + addLogEntry("solver",solver); + addLogEntry("rtol",rtol); + addLogEntry("maxsteps",maxsteps); + addLogEntry("maxiter",maxiter); + addLogEntry("loglevel",loglevel); + endLogGroup("arguments"); + } } while (redo) { - if (solver >= 2) { m = new MultiPhase; try { @@ -164,24 +163,24 @@ namespace Cantera { (void) equilibrate(*m, XY, rtol, maxsteps, maxiter, loglevel-1); redo = false; if (loglevel > 0) - addLogEntry("MultiPhaseEquil solver succeeded."); + addLogEntry("MultiPhaseEquil solver succeeded."); delete m; retn = nAttempts; } catch (CanteraError err) { - if (loglevel > 0) - addLogEntry("MultiPhaseEquil solver failed."); + if (loglevel > 0) + addLogEntry("MultiPhaseEquil solver failed."); delete m; if (nAttempts < 2) { - if (loglevel > 0) - addLogEntry("Trying single phase ChemEquil solver."); + if (loglevel > 0) + addLogEntry("Trying single phase ChemEquil solver."); solver = -1; - } - else { - if (loglevel > 0) - endLogGroup("equilibrate"); - throw err; - } + } + else { + if (loglevel > 0) + endLogGroup("equilibrate"); + throw err; + } } } else { // solver <= 0 @@ -195,12 +194,12 @@ namespace Cantera { nAttempts++; retnSub = e->equilibrate(s,XY,loglevel-1); if (retnSub < 0) { - if (loglevel > 0) - addLogEntry("ChemEquil solver failed."); + if (loglevel > 0) + addLogEntry("ChemEquil solver failed."); if (nAttempts < 2) { - if (loglevel > 0) - addLogEntry("Trying MultiPhaseEquil solver."); - solver = 1; + if (loglevel > 0) + addLogEntry("Trying MultiPhaseEquil solver."); + solver = 1; } else { throw CanteraError("equilibrate", "Both equilibrium solvers failed"); @@ -211,23 +210,23 @@ namespace Cantera { redo = false; delete e; if (loglevel > 0) - addLogEntry("ChemEquil solver succeeded."); + addLogEntry("ChemEquil solver succeeded."); } catch (CanteraError err) { delete e; if (loglevel > 0) - addLogEntry("ChemEquil solver failed."); + addLogEntry("ChemEquil solver failed."); // If ChemEquil fails, try the MultiPhase solver if (solver < 0) { - if (loglevel > 0) - addLogEntry("Trying MultiPhaseEquil solver."); + if (loglevel > 0) + addLogEntry("Trying MultiPhaseEquil solver."); solver = 1; } else { redo = false; if (loglevel > 0) - endLogGroup("equilibrate"); + endLogGroup("equilibrate"); throw err; } } @@ -236,8 +235,8 @@ namespace Cantera { /* * We are here only for a success */ - if (loglevel > 0) - endLogGroup("equilibrate"); + if (loglevel > 0) + endLogGroup("equilibrate"); return retn; } }