From e6e720bd006ff0320c67369d028fc6823eb6625c Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Tue, 26 Aug 2003 05:22:29 +0000 Subject: [PATCH] *** empty log message *** --- Cantera/matlab/cantera/private/onedimmethods.cpp | 2 -- Cantera/src/oneD/MultiNewton.cpp | 11 +++++------ Cantera/src/oneD/StFlow.cpp | 2 +- Cantera/src/oneD/refine.cpp | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Cantera/matlab/cantera/private/onedimmethods.cpp b/Cantera/matlab/cantera/private/onedimmethods.cpp index 4d6a4cfa3..7c66ef6aa 100644 --- a/Cantera/matlab/cantera/private/onedimmethods.cpp +++ b/Cantera/matlab/cantera/private/onedimmethods.cpp @@ -89,9 +89,7 @@ void onedimmethods( int nlhs, mxArray *plhs[], for (k = 0; k < sz; k++) { ptrs[k] = int(dom_ids[k]); } - writelog("calling sim1D_new\n"); indx = sim1D_new(sz, ptrs); - writelog("ret sim1D_new\n"); delete[] ptrs; break; diff --git a/Cantera/src/oneD/MultiNewton.cpp b/Cantera/src/oneD/MultiNewton.cpp index 515930d80..dc68e06bd 100644 --- a/Cantera/src/oneD/MultiNewton.cpp +++ b/Cantera/src/oneD/MultiNewton.cpp @@ -120,10 +120,10 @@ namespace Cantera { for (n = 0; n < sz; n++) { step[n] = -step[n]; } - try { + //try { jac.solve(sz, step, step); - } - catch (CanteraError) { + //} + //catch (CanteraError) { #undef DEBUG_STEP #ifdef DEBUG_STEP bool ok = false; @@ -140,9 +140,8 @@ namespace Cantera { //if (!ok) throw "not ok"; } #endif - writelog("size = "+int2str(sz)+"\n"); - throw CanteraError("step","step error"); - } + //throw CanteraError("step","step error"); + //} } diff --git a/Cantera/src/oneD/StFlow.cpp b/Cantera/src/oneD/StFlow.cpp index 83dc61abb..a0c5ba4cb 100644 --- a/Cantera/src/oneD/StFlow.cpp +++ b/Cantera/src/oneD/StFlow.cpp @@ -1065,7 +1065,7 @@ namespace Cantera { int nd = d.size(); vector_fp x; - int n, np, j, ks; + int n, np = 0, j, ks; string nm; bool readgrid = false, wrote_header = false; for (n = 0; n < nd; n++) { diff --git a/Cantera/src/oneD/refine.cpp b/Cantera/src/oneD/refine.cpp index 08a1a7e68..fe24607be 100644 --- a/Cantera/src/oneD/refine.cpp +++ b/Cantera/src/oneD/refine.cpp @@ -186,7 +186,7 @@ namespace Cantera { -done: + //done: //m_did_analysis = true; return m_loc.size(); }