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

Get Tsat working again in a not so super nice way.

Browse Source
This commit is contained in:
Ian Bell
2015-06-30 19:34:06 -06:00
parent 9a869f3d46
commit 074b6ec242
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Backends/Tabular/TabularBackends.h
View File

@@ -732,6 +732,7 @@ class TabularBackend : public AbstractState
CoolPropDbl calc_p_triple(void){return this->AS->p_triple();};
CoolPropDbl calc_pmax(void){return this->AS->pmax();};
CoolPropDbl calc_Tmax(void){return this->AS->Tmax();};
CoolPropDbl calc_p_critical(void){ return this->AS->p_critical(); }
bool using_mole_fractions(void){return true;}
bool using_mass_fractions(void){return false;}
bool using_volu_fractions(void){return false;}

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

@@ -486,7 +486,7 @@ cdef class State:
----------
Fluid : string
StateDict : dictionary
The state of the fluid - passed to the update function
The state of the fluid - passed to the update function; if None, does not do a state update
phase : string
DEPRECATED : this input is ignored
backend : string
@@ -506,7 +506,8 @@ cdef class State:
self.Fluid = _Fluid
# Parse the inputs provided
self.update(StateDict)
if StateDict is not None:
self.update(StateDict)
self.phase = phase
if phase is None:
@@ -739,10 +740,22 @@ cdef class State:
Returns ``None`` if pressure is not within the two-phase pressure range
"""
if self.p_ > 0.001*_PropsSI('pcrit','T',0,'P',0,self.Fluid) or self.p_ < 0.001*_PropsSI('ptriple','T',0,'P',0, self.Fluid):
return None
cdef State state = State(self.Fluid, None)
cdef double pc = state.Props(iP_critical)
cdef double pt
try:
pt = state.Props(iP_triple)
except ValueError:
pt = -1
if _ValidNumber(pc) and _ValidNumber(pt):
if self.p_ > 0.001*pc or self.p_ < 0.001*pt:
return None
else:
state.update(dict(P=self.p_,Q=Q))
return state.T
else:
return 0.001*_PropsSI('T', 'P', self.p_*1000, 'Q', Q, self.Fluid)
state.update(dict(P=self.p_,Q=Q))
return state.T
property Tsat:
""" The saturation temperature (dew) for the given pressure, in [K]"""
def __get__(self):