research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Python/1D] Make callbacks accessible outside Cython

Browse source
This commit is contained in:
Ray Speth 2017-12-02 23:32:58 -05:00
parent 3e39a0bc3d
commit 4b352751f5
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interfaces/cython/cantera/_cantera.pxd
View file

@ -1052,9 +1052,9 @@ cdef class Sim1D:
cdef object _initialized
cdef object _initial_guess_args
cdef object _initial_guess_kwargs
cdef Func1 interrupt
cdef Func1 time_step_callback
cdef Func1 steady_callback
cdef public Func1 _interrupt
cdef public Func1 _time_step_callback
cdef public Func1 _steady_callback
cdef class ReactionPathDiagram:
cdef CxxReactionPathDiagram diagram

12
interfaces/cython/cantera/onedim.pyx
View file

@ -585,8 +585,8 @@ cdef class Sim1D:
"""
if not isinstance(f, Func1):
f = Func1(f)
self.interrupt = f
self.sim.setInterrupt(self.interrupt.func)
self._interrupt = f
self.sim.setInterrupt(self._interrupt.func)
def set_time_step_callback(self, f):
"""
@ -596,8 +596,8 @@ cdef class Sim1D:
"""
if not isinstance(f, Func1):
f = Func1(f)
self.time_step_callback = f
self.sim.setTimeStepCallback(self.time_step_callback.func)
self._time_step_callback = f
self.sim.setTimeStepCallback(self._time_step_callback.func)
def set_steady_callback(self, f):
"""
@ -607,8 +607,8 @@ cdef class Sim1D:
"""
if not isinstance(f, Func1):
f = Func1(f)
self.steady_callback = f
self.sim.setSteadyCallback(self.steady_callback.func)
self._steady_callback = f
self.sim.setSteadyCallback(self._steady_callback.func)
def domain_index(self, dom):
"""