github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

old-style State class can handle mixtures mostly and phase can be set

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-09-18 18:46:49 +02:00
parent 1ec70ccb80
commit b1f8a2e8b6
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
wrappers/Python/CoolProp/CoolProp.pyx
View File

@@ -396,21 +396,26 @@ cdef class State:
if _Fluid == <string>'none':
return
else:
if backend is None:
if '::' in Fluid:
backend, Fluid = Fluid.split(u'::',1)
elif backend is None:
backend = u'?'
self.set_Fluid(Fluid, backend)
self.Fluid = _Fluid
# Parse the inputs provided
self.update(StateDict)
self.phase = phase
if phase is None:
self.phase = u'??'.encode('ascii')
# Parse the inputs provided
self.update(StateDict)
# #Set the phase flag
# if self.phase == <string>'Gas' or self.phase == <string>'Liquid' or self.phase == <string>'Supercritical':
# if self.is_CPFluid and (self.phase == <string>'Gas' or self.phase == <string>'Liquid'):
# self.CPS.flag_SinglePhase = True
# elif not self.is_CPFluid and phase is not None:
# _set_phase(self.phase)
# Set the phase flag
if self.phase.lower() == 'gas':
self.pAS.specify_phase(constants_header.iphase_gas)
elif self.phase.lower() == 'liquid':
self.pAS.specify_phase(constants_header.iphase_liquid)
# def __reduce__(self):
# d={}
@@ -421,7 +426,22 @@ cdef class State:
# return rebuildState,(d,)
cpdef set_Fluid(self, string Fluid, string backend):
self.pAS = AbstractState(backend, Fluid)
cdef object _Fluid = Fluid
cdef object _backend = backend
new_fluid = []
fracs = []
if '[' in _Fluid and ']' in _Fluid:
pairs = _Fluid.split('&')
for pair in pairs:
fluid, frac = pair.split('[')
new_fluid.append(fluid)
fracs.append(float(frac.strip(']')))
_Fluid = '&'.join(new_fluid)
else:
fracs = [1]
self.pAS = AbstractState(_backend, _Fluid)
self.pAS.set_mole_fractions(fracs)
cpdef update_ph(self, double p, double h):
"""