[oneD] adjusted loglevels for more output

Cantera · Aug 18, 2024 · 1730a37 · 1730a37
1 parent 1704029
commit 1730a37
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/oneD/MultiNewton.cpp b/src/oneD/MultiNewton.cpp
@@ -323,7 +323,7 @@ int MultiNewton::solve(double* x0, double* x1, OneDim& r, MultiJac& jac, int log
     while (true) {
         // Check whether the Jacobian should be re-evaluated.
         if (jac.age() > m_maxAge) {
-            if (loglevel > 0) {
+            if (loglevel > 1) {
                 writelog("\n  Maximum Jacobian age reached ({}), updating it.", m_maxAge);
             }
             forceNewJac = true;
@@ -365,7 +365,7 @@ int MultiNewton::solve(double* x0, double* x1, OneDim& r, MultiJac& jac, int log
                     break;
                 }
                 nJacReeval++;
-                if (loglevel > 0) {
+                if (loglevel > 1) {
                     writelog("\n  Re-evaluating Jacobian (damping coefficient not found"
                             " with this Jacobian)");
                 }

diff --git a/src/oneD/OneDim.cpp b/src/oneD/OneDim.cpp
@@ -217,7 +217,7 @@ int OneDim::solve(double* x, double* xnew, int loglevel)
         m_jac->updateTransient(m_rdt, m_mask.data());
         m_jac_ok = true;
     }
-    return m_newt->solve(x, xnew, *this, *m_jac, loglevel-1);
+    return m_newt->solve(x, xnew, *this, *m_jac, loglevel);
 }
 
 void OneDim::evalSSJacobian(double* x, double* xnew)
@@ -361,7 +361,7 @@ double OneDim::timeStep(int nsteps, double dt, double* x, double* r, int logleve
         int j0 = m_jac->nEvals(); // Store the current number of Jacobian evaluations
 
         // solve the transient problem
-        int status = solve(x, r, loglevel-1);
+        int status = solve(x, r, loglevel);
 
         // successful time step. Copy the new solution in r to
         // the current solution in x.
@@ -418,7 +418,7 @@ double OneDim::timeStep(int nsteps, double dt, double* x, double* r, int logleve
         writelog("\n============================");
     } else if (loglevel > 1) {
         double ss = ssnorm(x, r);
-        writelog("\nTimestep({}) dt= {:<11.4e} log10(ss)= {:<7.4f}\n", n, dt, log10(ss));
+        writelog("\nTimestep ({}) dt= {:<11.4e} log10(ss)= {:<7.4f}\n", n, dt, log10(ss));
     }
 
     // return the value of the last stepsize, which may be smaller

diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp
@@ -438,7 +438,7 @@ void Sim1D::solve(int loglevel, bool refine_grid)
             setSteadyMode();
             newton().setOptions(m_ss_jac_age);
             debuglog("\nAttempt Newton solution of steady-state problem.", loglevel);
-            int status = newtonSolve(loglevel-1);
+            int status = newtonSolve(loglevel);
 
             if (status == 0) {
                 if (loglevel > 0) {
@@ -490,7 +490,7 @@ void Sim1D::solve(int loglevel, bool refine_grid)
         if (loglevel > 0) {
             writeline('.', 78, true, true);
         }
-        if (loglevel > 2) {
+        if (loglevel > 3) {
             show();
         }