GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Python] Clarifiy reactor content nomenclature

Browse Source
This commit is contained in:
Ingmar Schoegl 2025-02-04 07:06:55 -06:00
parent 6d36d9416e
commit 1d86759140
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
interfaces/cython/cantera/reactor.pxd
View File

@ -224,7 +224,7 @@ ctypedef CxxReactorAccessor* CxxReactorAccessorPtr
cdef class ReactorBase:
cdef shared_ptr[CxxReactorBase] _reactor
cdef CxxReactorBase* rbase
cdef object _thermo
cdef object _contents
cdef list _inlets
cdef list _outlets
cdef list _walls
@ -240,7 +240,6 @@ cdef class ReactorBase:
cdef class Reactor(ReactorBase):
cdef CxxReactor* reactor
cdef object _kinetics
cdef public str group_name
"""
Optional name of a grouping of reactors that will be drawn as a cluster in the

22
interfaces/cython/cantera/reactor.pyx
View File

@ -28,7 +28,7 @@ cdef class ReactorBase:
self._walls = []
self._surfaces = []
if isinstance(contents, _SolutionBase):
self._thermo = contents
self._contents = contents
if volume is not None:
self.volume = volume
@ -43,10 +43,10 @@ cdef class ReactorBase:
.. deprecated:: 3.2
After Cantera 3.2, a change of reactor contents after instantiation
will be disabled.
will be disabled and this method will be removed.
"""
self._thermo = solution
self.rbase.setSolution(solution._base) # raises warning in C++ core
self._contents = solution
property type:
"""The type of the reactor."""
@ -69,10 +69,12 @@ cdef class ReactorBase:
self.rbase.syncState()
property thermo:
"""The `ThermoPhase` object representing the reactor's contents."""
"""
The `ThermoPhase` object representing the reactor's contents.
"""
def __get__(self):
self.rbase.restoreState()
return self._thermo
return self._contents
property volume:
"""The volume [m^3] of the reactor."""
@ -244,14 +246,6 @@ cdef class Reactor(ReactorBase):
self.group_name = group_name
def insert(self, _SolutionBase solution):
"""
Set ``solution`` to be the object used to compute thermodynamic
properties and kinetic rates for this reactor.
"""
ReactorBase.insert(self, solution)
self._kinetics = solution
property kinetics:
"""
The `Kinetics` object used for calculating kinetic rates in
@ -259,7 +253,7 @@ cdef class Reactor(ReactorBase):
"""
def __get__(self):
self.rbase.restoreState()
return self._kinetics
return self._contents
property chemistry_enabled:
"""