From be4ef3e4b16194d0498c375441a99e38468fb227 Mon Sep 17 00:00:00 2001 From: Dave Goodwin Date: Tue, 3 Aug 2004 15:20:58 +0000 Subject: [PATCH] *** empty log message *** --- Cantera/python/Cantera/Reactor.py | 20 ++++++++++++-------- Cantera/python/examples/reactor1.py | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Cantera/python/Cantera/Reactor.py b/Cantera/python/Cantera/Reactor.py index 79bb8a26e..1dcfe1df8 100644 --- a/Cantera/python/Cantera/Reactor.py +++ b/Cantera/python/Cantera/Reactor.py @@ -92,11 +92,12 @@ class ReactorBase: _cantera.reactor_setKineticsMgr(self.__reactor_id, contents.ckin) -## def setInitialTime(self, T0): -## """Deprecated. -## Set the initial time. Restarts integration from this time -## using the current state as the initial condition. Default: 0.0 s""" -## _cantera.reactor_setInitialTime(self.__reactor_id, T0) + def setInitialTime(self, T0): + """Deprecated. + Set the initial time. Restarts integration from this time + using the current state as the initial condition. Default: 0.0 s""" + raise "use method setInitialTime of class ReactorNet" + #_cantera.reactor_setInitialTime(self.__reactor_id, T0) def _setInitialVolume(self, V0): """Set the initial reactor volume. """ @@ -132,7 +133,8 @@ class ReactorBase: def time(self): """Deprecated. The current time [s].""" - return _cantera.reactor_time(self.__reactor_id) + raise "use method time of class ReactorNet" + #return _cantera.reactor_time(self.__reactor_id) def mass(self): """The total mass of fluid in the reactor [kg].""" @@ -155,14 +157,16 @@ class ReactorBase: Advance the state of the reactor in time from the current time to time 'time'. Note: this method is deprecated. See class ReactorNet.""" - return _cantera.reactor_advance(self.__reactor_id, time) + raise "use method advance of class ReactorNet" + #return _cantera.reactor_advance(self.__reactor_id, time) def step(self, time): """Deprecated. Take one internal time step from the current time toward time 'time'. Note: this method is deprecated. See class ReactorNet.""" - return _cantera.reactor_step(self.__reactor_id, time) + raise "use method step of class ReactorNet" + #return _cantera.reactor_step(self.__reactor_id, time) def massFraction(self, s): """The mass fraction of species s, specified either by name or diff --git a/Cantera/python/examples/reactor1.py b/Cantera/python/examples/reactor1.py index ed31322b3..b77ab2cb9 100644 --- a/Cantera/python/examples/reactor1.py +++ b/Cantera/python/examples/reactor1.py @@ -37,7 +37,7 @@ for n in range(100): data[n,1] = r.moleFraction('OH') data[n,2] = r.moleFraction('H') data[n,3] = r.moleFraction('H2') - print '%10.3e %10.3f %10.3f %14.6e' % (r.time(), r.temperature(), + print '%10.3e %10.3f %10.3f %14.6e' % (sim.time(), r.temperature(), r.pressure(), r.intEnergy_mass())