From 347029d06a268868e86b8946dbb6c0e823061696 Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 6 Dec 2012 17:31:35 +0000
Subject: [PATCH] [1D] Added loglevel for saving residual components

At loglevel 8, the residual after each Newton step, set of time steps, or grid
refinement is saved to 'debug_sim1D.xml'.
---
 include/cantera/oneD/Sim1D.h |  3 +++
 src/oneD/Sim1D.cpp           | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/include/cantera/oneD/Sim1D.h b/include/cantera/oneD/Sim1D.h
index 5276a04ff..c3e89622a 100644
--- a/include/cantera/oneD/Sim1D.h
+++ b/include/cantera/oneD/Sim1D.h
@@ -75,6 +75,9 @@ public:
     void save(const std::string& fname, const std::string& id,
               const std::string& desc);
 
+    void saveResidual(const std::string& fname, const std::string& id,
+              const std::string& desc);
+
     /// Print to stream s the current solution for all domains.
     void showSolution(std::ostream& s);
     void showSolution();
diff --git a/src/oneD/Sim1D.cpp b/src/oneD/Sim1D.cpp
index f14aaa261..de05987c2 100644
--- a/src/oneD/Sim1D.cpp
+++ b/src/oneD/Sim1D.cpp
@@ -148,6 +148,14 @@ void Sim1D::save(const std::string& fname, const std::string& id,
     OneDim::save(fname, id, desc, DATA_PTR(m_x));
 }
 
+void Sim1D::saveResidual(const std::string& fname, const std::string& id,
+                         const std::string& desc)
+{
+    vector_fp res(m_x.size(), -999);
+    OneDim::eval(npos, &m_x[0], &res[0], 0.0);
+    OneDim::save(fname, id, desc, &res[0]);
+}
+
 /**
  * Initialize the solution with a previously-saved solution.
  */
@@ -305,6 +313,10 @@ void Sim1D::solve(int loglevel, bool refine_grid)
                     save("debug_sim1d.xml", "debug",
                          "After successful Newton solve");
                 }
+                if (loglevel > 7) {
+                    saveResidual("debug_sim1d.xml", "residual",
+                                 "After successful Newton solve");
+                }
                 ok = true;
                 soln_number++;
             } else {
@@ -315,6 +327,11 @@ void Sim1D::solve(int loglevel, bool refine_grid)
                         save("debug_sim1d.xml", "debug",
                              "After unsuccessful Newton solve");
                     }
+                    if (loglevel > 7) {
+                        saveResidual("debug_sim1d.xml", "residual",
+                                     "After unsuccessful Newton solve");
+                    }
+
                     writelog("Take "+int2str(nsteps)+" timesteps   ");
                 }
                 dt = timeStep(nsteps, dt, DATA_PTR(m_x), DATA_PTR(m_xnew),
@@ -322,6 +339,11 @@ void Sim1D::solve(int loglevel, bool refine_grid)
                 if (loglevel > 6) {
                     save("debug_sim1d.xml", "debug", "After timestepping");
                 }
+                if (loglevel > 7) {
+                    saveResidual("debug_sim1d.xml", "residual",
+                                 "After timestepping");
+                }
+
                 if (loglevel == 1) {
                     sprintf(buf, " %10.4g %10.4g \n", dt,
                             log10(ssnorm(DATA_PTR(m_x), DATA_PTR(m_xnew))));
@@ -351,6 +373,10 @@ void Sim1D::solve(int loglevel, bool refine_grid)
             if (new_points && loglevel > 6) {
                 save("debug_sim1d.xml", "debug", "After regridding");
             }
+            if (new_points && loglevel > 7) {
+                saveResidual("debug_sim1d.xml", "residual",
+                             "After regridding");
+            }
             if (new_points < 0) {
                 writelog("Maximum number of grid points reached.");
                 new_points = 0;