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

Added a real state object for the critical state

Browse Source
This commit is contained in:
Jorrit Wronski
2016-06-09 14:10:46 +02:00
parent 87fd90af84
commit 809998aecb
1 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
wrappers/Python/CoolProp/Plots/Common.py
View File

@@ -6,12 +6,37 @@ import numpy as np
from abc import ABCMeta
from six import with_metaclass
import warnings
import copy
import CoolProp
from CoolProp import AbstractState
from CoolProp import CoolProp as CP
from CoolProp.CoolProp import PropsSI,extract_backend,extract_fractions
from CoolProp.CoolProp import PropsSI,extract_backend,extract_fractions, PyCriticalState
def get_critical_point(state):
crit_state = PyCriticalState()
crit_state.T = np.nan
crit_state.p = np.nan
crit_state.rhomolar = np.nan
crit_state.stable = False
try:
crit_state.T = state.T_critical()
crit_state.p = state.p_critical()
crit_state.rhomolar = state.rhomolar_critical()
crit_state.stable = True
except:
try:
for crit_state_tmp in state.all_critical_points():
if crit_state_tmp.stable and crit_state_tmp.T > crit_state.T:
crit_state.T = crit_state_tmp.T
crit_state.p = crit_state_tmp.p
crit_state.rhomolar = crit_state_tmp.rhomolar
crit_state.stable = crit_state_tmp.stable
except:
raise ValueError("Could not calculate the critical point data.")
new_state = copy.deepcopy(state)
new_state.update(CoolProp.DmolarT_INPUTS, crit_state.rhomolar, crit_state.T)
return new_state
def interpolate_values_1d(x,y,x_points=None,kind='linear'):
try:
@@ -290,6 +315,7 @@ class Base2DObject(with_metaclass(ABCMeta),object):
def __init__(self, x_type, y_type, state=None, small=None):
self._x_index = _get_index(x_type)
self._y_index = _get_index(y_type)
self._critical_state = None
if small is not None: self._small = small
else: self._small = 1e-7
if state is not None: self.state = state
@@ -301,12 +327,21 @@ class Base2DObject(with_metaclass(ABCMeta),object):
@property
def y_index(self): return self._y_index
@property
def critical_state(self):
if self._critical_state is None and self._state is not None:
self._critical_state = get_critical_point(state)
return self._critical_state
@property
def state(self): return self._state
@state.setter
def state(self, value):
self._state = process_fluid_state(value)
self._T_small = self._state.trivial_keyed_output(CoolProp.iT_critical)*self._small
self._P_small = self._state.trivial_keyed_output(CoolProp.iP_critical)*self._small
self._critical_state = None
#self._T_small = self._state.trivial_keyed_output(CoolProp.iT_critical)*self._small
#self._P_small = self._state.trivial_keyed_output(CoolProp.iP_critical)*self._small
self._T_small = self.critical_state.keyed_output(CoolProp.iT)*self._small
self._P_small = self.critical_state.keyed_output(CoolProp.iP)*self._small
def _get_sat_bounds(self, kind, smin=None, smax=None):
@@ -325,10 +360,10 @@ class Base2DObject(with_metaclass(ABCMeta),object):
kind = _get_index(kind)
if kind == CoolProp.iP:
fluid_min = self._state.keyed_output(CoolProp.iP)+self._P_small
fluid_max = self._state.trivial_keyed_output(CoolProp.iP_critical)-self._P_small
fluid_max = self.critical_state.keyed_output(CoolProp.iP)-self._P_small
elif kind == CoolProp.iT:
fluid_min = self._state.keyed_output(CoolProp.iT)+self._T_small
fluid_max = self._state.trivial_keyed_output(CoolProp.iT_critical)-self._T_small
fluid_max = self.critical_state.keyed_output(CoolProp.iT)-self._T_small
else:
raise ValueError("Saturation boundaries have to be defined in T or P, but not in {0:s}".format(str(kind)))
@@ -453,9 +488,9 @@ class IsoLine(Base2DObject):
one = np.resize(np.array(self.value),two.shape)
pair = CoolProp.QT_INPUTS
Tcrit = self.state.trivial_keyed_output(CoolProp.iT_critical)
Pcrit = self.state.trivial_keyed_output(CoolProp.iP_critical)
Dcrit = self.state.trivial_keyed_output(CoolProp.irhomass_critical)
Tcrit = self.critical_state.keyed_output(CoolProp.iT)
Pcrit = self.critical_state.keyed_output(CoolProp.iP)
Dcrit = self.critical_state.keyed_output(CoolProp.iDmass)
try:
self.state.update(CoolProp.DmassT_INPUTS, Dcrit, Tcrit)
xcrit = self.state.keyed_output(self._x_index)