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

[Thermo] Preserve constant property pair when multiplying Quantity

Browse source
This commit is contained in:
Ray Speth 2018-03-09 19:30:17 -05:00
parent de3ec3d53e
commit c9b0bce8b9
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interfaces/cython/cantera/composite.py
View file

@ -235,10 +235,10 @@ class Quantity(object):
return self
def __mul__(self, other):
return Quantity(self.phase, mass=self.mass * other)
return Quantity(self.phase, mass=self.mass * other, constant=self.constant)
def __rmul__(self, other):
return Quantity(self.phase, mass=self.mass * other)
return Quantity(self.phase, mass=self.mass * other, constant=self.constant)
def __iadd__(self, other):
if (self._id != other._id):

10
interfaces/cython/cantera/test/test_thermo.py
View file

@ -1137,6 +1137,16 @@ class TestQuantity(utilities.CanteraTest):
self.assertNear(q1.entropy * 2.5, q2.entropy)
self.assertArrayNear(q1.X, q2.X)
def test_multiply_HP(self):
self.gas.TPX = 500, 101325, 'CH4:1.0, O2:0.4'
q1 = ct.Quantity(self.gas, mass=2, constant='HP')
q2 = ct.Quantity(self.gas, mass=1, constant='HP')
q2.equilibrate('HP')
q3 = 0.2 * q1 + q2 * 0.4
self.assertNear(q1.P, q3.P)
self.assertNear(q1.enthalpy_mass, q3.enthalpy_mass)
self.assertNear(q2.enthalpy_mass, q3.enthalpy_mass)
def test_iadd(self):
q0 = ct.Quantity(self.gas, mass=5)
q1 = ct.Quantity(self.gas, mass=5)