From 70d277c86eda2bc83e81b7710ad4e7531e5e11d4 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Mon, 5 Dec 2005 18:36:27 +0000 Subject: [PATCH] minor changes --- Cantera/matlab/cantera/examples/catcomb.m | 4 +--- Cantera/python/Cantera/OneD/onedim.py | 1 + Cantera/src/oneD/Domain1D.h | 2 +- Cantera/src/oneD/MultiNewton.cpp | 10 +++++----- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cantera/matlab/cantera/examples/catcomb.m b/Cantera/matlab/cantera/examples/catcomb.m index dfb86e8b4..b353f3e48 100644 --- a/Cantera/matlab/cantera/examples/catcomb.m +++ b/Cantera/matlab/cantera/examples/catcomb.m @@ -10,8 +10,6 @@ % The catalytic combustion mechanism is from Deutschman et al., 26th % Symp. (Intl.) on Combustion,1996 pp. 1747-1754 % -% On a Mac G4, this example takes about 20 sec. -% help catcomb; %disp('press any key to start the simulation'); @@ -47,7 +45,7 @@ initial_grid = [0.0 0.02 0.04 0.06 0.08 0.1]; % m % numerical parameters -tol_ss = [1.0e-5 1.0e-9]; % [rtol atol] for steady-state problem +tol_ss = [1.0e-8 1.0e-14]; % [rtol atol] for steady-state problem tol_ts = [1.0e-4 1.0e-9]; % [rtol atol] for time stepping loglevel = 1; % amount of diagnostic output diff --git a/Cantera/python/Cantera/OneD/onedim.py b/Cantera/python/Cantera/OneD/onedim.py index 10f2fd9bf..24ffb8b97 100644 --- a/Cantera/python/Cantera/OneD/onedim.py +++ b/Cantera/python/Cantera/OneD/onedim.py @@ -144,6 +144,7 @@ class Domain1D: d[b] = tol[b] for b in d.keys(): n = self.componentIndex(b) + print 'setting tol for ',b,' itime = ',itime _cantera.domain_setTolerances(self._hndl, n, d[b][0], d[b][1], itime) diff --git a/Cantera/src/oneD/Domain1D.h b/Cantera/src/oneD/Domain1D.h index bec38d5b5..83c1661a9 100644 --- a/Cantera/src/oneD/Domain1D.h +++ b/Cantera/src/oneD/Domain1D.h @@ -55,7 +55,7 @@ namespace Cantera { m_jstart(0), m_left(0), m_right(0), - m_refiner(0), m_id("-"), m_desc("-") { + m_refiner(0), m_id("-"), m_desc("-"), m_rdt(0.0) { resize(nv, points); } diff --git a/Cantera/src/oneD/MultiNewton.cpp b/Cantera/src/oneD/MultiNewton.cpp index 9d1f02dcc..be80d5308 100644 --- a/Cantera/src/oneD/MultiNewton.cpp +++ b/Cantera/src/oneD/MultiNewton.cpp @@ -130,7 +130,7 @@ namespace Cantera { } #endif - try { + //try { iok = jac.solve(sz, step, step); if (iok > 0) { iok--; @@ -150,10 +150,10 @@ namespace Cantera { else if (iok < 0) throw CanteraError("MultiNewton::step", "iok = "+int2str(iok)); - } - catch (CanteraError) { - showErrors(cout); - } + //} + //catch (CanteraError) { + //showErrors(cout); + //} #ifdef DEBUG_STEP bool ok = false;