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 accessor methods to unit system object, now behaves dict-like.

Browse Source
This commit is contained in:
Jorrit Wronski
2015-07-21 09:58:56 +02:00
parent c4a8f6af5b
commit 87d8d346dd
3 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,33 @@ class UnitSystem(with_metaclass(ABCMeta),object):
CoolProp.iT : self._T,
CoolProp.iUmass : self._U,
CoolProp.iQ : self._Q
}
}
def __getitem__(self, index):
"""Allow for property access via square brackets"""
if index == CoolProp.iDmass : return self.D
elif index == CoolProp.iHmass : return self.H
elif index == CoolProp.iP : return self.P
elif index == CoolProp.iSmass : return self.S
elif index == CoolProp.iT : return self.T
elif index == CoolProp.iUmass : return self.U
elif index == CoolProp.iQ : return self.Q
else: raise ValueError("Unknown index \"{0:s}\".".format(str(index)))
def __setitem__(self, index, value):
"""Allow for property access via square brackets"""
if index == CoolProp.iDmass : self.D = value
elif index == CoolProp.iHmass : self.H = value
elif index == CoolProp.iP : self.P = value
elif index == CoolProp.iSmass : self.S = value
elif index == CoolProp.iT : self.T = value
elif index == CoolProp.iUmass : self.U = value
elif index == CoolProp.iQ : self.Q = value
else: raise ValueError("Unknown index \"{0:s}\".".format(str(index)))
class SIunits(UnitSystem):
@@ -590,7 +616,7 @@ consider replacing it with \"_get_sat_bounds\".",
def _get_iso_label(self, isoline, unit=True):
if self._system is not None:
dim = self._system.dimensions[isoline.i_index]
dim = self._system[isoline.i_index]
return str(r"$"+dim.symbol+"="+str(dim.from_SI(isoline.value))+ "$ "+dim.unit if unit else "$").strip()
return str(isoline.value).strip()
@@ -637,10 +663,10 @@ consider replacing it with \"_get_sat_bounds\".",
self.axis.set_yscale('log')
if not self.axis.get_xlabel():
dim = self._system.dimensions[self._x_index]
dim = self._system[self._x_index]
self.xlabel(str(dim.label+" $"+dim.symbol+"$ / "+dim.unit).strip())
if not self.axis.get_ylabel():
dim = self._system.dimensions[self._y_index]
dim = self._system[self._y_index]
self.ylabel(str(dim.label+" $"+dim.symbol+"$ / "+dim.unit).strip())
def title(self, title):
@@ -671,9 +697,9 @@ consider replacing it with \"_get_sat_bounds\".",
def _set_axis_limits(self, limits):
"""Set the limits of the internal axis object based on SI units,
takes [xmin, xmax, ymin, ymax]"""
dim = self._system.dimensions[self._x_index]
dim = self._system[self._x_index]
self.axis.set_xlim([dim.from_SI(limits[0]), dim.from_SI(limits[1])])
dim = self._system.dimensions[self._y_index]
dim = self._system[self._y_index]
self.axis.set_ylim([dim.from_SI(limits[2]), dim.from_SI(limits[3])])
def get_axis_limits(self,x_index=None,y_index=None):
@@ -699,9 +725,9 @@ consider replacing it with \"_get_sat_bounds\".",
Y[i] = self._state.keyed_output(y_index)
# Figure out what to update
dim = self._system.dimensions[x_index]
dim = self._system[x_index]
x_lim = [dim.from_SI(min(X)),dim.from_SI(max(X))]
dim = self._system.dimensions[y_index]
dim = self._system[y_index]
y_lim = [dim.from_SI(min(Y)),dim.from_SI(max(Y))]
# Either update the axes limits or get them
if x_index == self._x_index:
@@ -726,10 +752,10 @@ consider replacing it with \"_get_sat_bounds\".",
if x_index is None: x_index = self._x_index
if y_index is None: y_index = self._y_index
limits = self.get_axis_limits(x_index,y_index)
dim = self._system.dimensions[x_index]
dim = self._system[x_index]
limits[0] = dim.to_SI(limits[0])
limits[1] = dim.to_SI(limits[1])
dim = self._system.dimensions[y_index]
dim = self._system[y_index]
limits[2] = dim.to_SI(limits[2])
limits[3] = dim.to_SI(limits[3])
return limits
@@ -846,10 +872,10 @@ consider replacing it with \"_get_sat_bounds\".",
This will give the coordinates and rotation required to align a label with
a line on a plot in axis units.
"""
dimx = self._system.dimensions[self._x_index]
dimx = self._system[self._x_index]
xv = dimx.to_SI(xv)
if x is not None: x = dimx.to_SI(x)
dimy = self._system.dimensions[self._y_index]
dimy = self._system[self._y_index]
yv = dimy.to_SI(yv)
if y is not None: y = dimx.to_SI(y)
(x,y,rot) = self._inline_label(xv,yv,x,y)
@@ -895,6 +921,7 @@ if __name__ == "__main__":
print(bp._get_sat_bounds('P'))
print(bp._get_iso_label(iso))
print(bp.get_axis_limits())
# get_update_pair(CoolProp.iP,CoolProp.iSmass,CoolProp.iT) -> (0,1,2,CoolProp.PSmass_INPUTS)

15
wrappers/Python/CoolProp/Plots/Plots.py
View File

@@ -142,7 +142,7 @@ class PropertyPlot(BasePlot):
ixrange = self.generate_ranges(self._x_index,limits[0],limits[1],points)
iyrange = self.generate_ranges(self._y_index,limits[2],limits[3],points)
dim = self._system.dimensions[iso_type]
dim = self._system[iso_type]
lines = self.isolines.get(iso_type, [])
for i in range(num):
@@ -156,8 +156,8 @@ class PropertyPlot(BasePlot):
def draw_isolines(self):
for i in self.isolines:
props = self.props[i]
dimx = self._system.dimensions[self._x_index]
dimy = self._system.dimensions[self._y_index]
dimx = self._system[self._x_index]
dimy = self._system[self._y_index]
for line in self.isolines[i]:
if line.i_index == CoolProp.iQ and \
(line.value == 0.0 or line.value == 1.0):
@@ -220,9 +220,9 @@ class PropertyPlot(BasePlot):
switch = IsoLine.XY_SWITCH[iso_type].get(self.y_index*10+self.x_index,None)
if switch is not None:
try:
dimx = self.system.dimensions[self.x_index]
dimy = self.system.dimensions[self.y_index]
dimi = self.system.dimensions[iso_type]
dimx = self.system[self.x_index]
dimy = self.system[self.y_index]
dimi = self.system[iso_type]
pair, out1, out2 = CP.generate_update_pair(self.x_index,dimx.to_SI(x1),self.y_index,dimy.to_SI(y1))
self.state.update(pair, out1, out2)
i_val1 = self.state.keyed_output(iso_type)
@@ -285,6 +285,7 @@ if __name__ == "__main__":
#
#
plot.savefig("Plots.pdf")
#plot.savefig("Plots.pdf")
plot.show()
#for i in plot.isolines:
# print(plot.isolines[i][0].x,plot.isolines[i][0].y)

26
wrappers/Python/CoolProp/Plots/SimpleCycles.py
View File

@@ -421,6 +421,10 @@ def EconomizedCycle(Ref,Qin,Te,Tc,DTsh,DTsc,eta_oi,f_p,Ti,Ts_Ph='Ts',skipPlot=Fa
#
# for more properties, see :class:`CoolProp.Plots.Common.Base2DObject`.
class StatePoint(UnitSystem):
"""A simple fixed dimension dict represented by an object with attributes"""
class StateContainer(object):
"""A collection of values for the main properties, built to mixin with :class:`CoolProp.Plots.Common.UnitSystem`"""
@@ -482,6 +486,16 @@ class StateContainer(object):
if i == CoolProp.iSmass : self.s = values[i]
if i == CoolProp.iT : self.t = values[i]
@property
def points(self):
return {
CoolProp.iDmass : self._d,
CoolProp.iHmass : self._h,
CoolProp.iP : self._p,
CoolProp.iSmass : self._s,
CoolProp.iT : self._t,
}
def get_si_states(self):
return self.values
@@ -641,22 +655,26 @@ class SimpleRankineCycle(BaseCycle):
if self._state is None:
raise ValueError("You have specify a fluid before you calculate.")
# Subcooled liquid
self.state.update(CoolProp.PT_INPUTS,p0,T0)
h0 = self.state.hmass()
s0 = self.state.smass()
# Pressurised liquid
p1 = p2
self.state.update(CoolProp.PSmass_INPUTS,p1,s0)
h1 = h0 + (self.state.hmass() - h0) / eta_pum
self.state.update(CoolProp.HmassP_INPUTS,h1,p1)
s1 = self.state.smass()
T1 = self.state.T()
# Evaporated vapour
self.state.update(CoolProp.PT_INPUTS,p2,T2)
h2 = self.state.hmass()
s2 = self.state.smass()
p3 = p2
# Expanded gas
p3 = p0
self.state.update(CoolProp.PSmass_INPUTS,p3,s2)
h3 = h2 - eta_exp * (h2 - self.state.hmass())
self.state.update(CoolProp.HmassP_INPUTS,h3,p3)