mirror of
https://github.com/CoolProp/CoolProp.git
synced 2026-04-01 03:00:13 -04:00
Started to look at the new fit for water, seems like there are problems with the transport properties, see also #390
This commit is contained in:
Jorrit Wronski
@@ -562,3 +562,29 @@ class PNF(PureData):
|
||||
self.reference = "Paratherm2013"
|
||||
self.reshapeAll()
|
||||
|
||||
|
||||
class Water(PureData):
|
||||
"""
|
||||
This is just a fit of the full EOS from Wagner and Pruss
|
||||
"""
|
||||
def __init__(self):
|
||||
PureData.__init__(self)
|
||||
self.density.source = self.density.SOURCE_DATA
|
||||
self.viscosity.source = self.viscosity.SOURCE_DATA
|
||||
self.specific_heat.source = self.specific_heat.SOURCE_DATA
|
||||
self.conductivity.source = self.conductivity.SOURCE_DATA
|
||||
self.saturation_pressure.source = self.saturation_pressure.SOURCE_DATA
|
||||
self.temperature.data = np.array([0.0000e+00, 5.1282e+00, 1.0256e+01, 1.5385e+01, 2.0513e+01, 2.5641e+01, 3.0769e+01, 3.5897e+01, 4.1026e+01, 4.6154e+01, 5.1282e+01, 5.6410e+01, 6.1538e+01, 6.6667e+01, 7.1795e+01, 7.6923e+01, 8.2051e+01, 8.7179e+01, 9.2308e+01, 9.7436e+01, 1.0256e+02, 1.0769e+02, 1.1282e+02, 1.1795e+02, 1.2308e+02, 1.2821e+02, 1.3333e+02, 1.3846e+02, 1.4359e+02, 1.4872e+02, 1.5385e+02, 1.5897e+02, 1.6410e+02, 1.6923e+02, 1.7436e+02, 1.7949e+02, 1.8462e+02, 1.8974e+02, 1.9487e+02, 2.0000e+02, ])+273.15
|
||||
self.density.data = np.array([1.0023e+03, 1.0024e+03, 1.0020e+03, 1.0013e+03, 1.0003e+03, 9.9907e+02, 9.9758e+02, 9.9587e+02, 9.9396e+02, 9.9185e+02, 9.8957e+02, 9.8713e+02, 9.8453e+02, 9.8178e+02, 9.7888e+02, 9.7585e+02, 9.7343e+02, 9.7014e+02, 9.6674e+02, 9.6321e+02, 9.5956e+02, 9.5580e+02, 9.5192e+02, 9.4793e+02, 9.4383e+02, 9.3962e+02, 9.3530e+02, 9.3086e+02, 9.2632e+02, 9.2166e+02, 9.1689e+02, 9.1200e+02, 9.0700e+02, 9.0188e+02, 8.9663e+02, 8.9127e+02, 8.8577e+02, 8.8014e+02, 8.7438e+02, 8.6848e+02, ])
|
||||
self.specific_heat.data = np.array([4.1960e+03, 4.1845e+03, 4.1768e+03, 4.1719e+03, 4.1689e+03, 4.1673e+03, 4.1668e+03, 4.1670e+03, 4.1678e+03, 4.1691e+03, 4.1707e+03, 4.1727e+03, 4.1750e+03, 4.1777e+03, 4.1807e+03, 4.1840e+03, 4.1842e+03, 4.1884e+03, 4.1930e+03, 4.1981e+03, 4.2038e+03, 4.2100e+03, 4.2168e+03, 4.2242e+03, 4.2323e+03, 4.2411e+03, 4.2507e+03, 4.2611e+03, 4.2723e+03, 4.2844e+03, 4.2974e+03, 4.3114e+03, 4.3265e+03, 4.3426e+03, 4.3600e+03, 4.3785e+03, 4.3984e+03, 4.4198e+03, 4.4427e+03, 4.4672e+03, ])
|
||||
self.conductivity.data = np.array([5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.5933e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, 5.6056e-01, ])
|
||||
self.viscosity.data = np.array([1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7811e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, 1.7776e-03, ])
|
||||
self.saturation_pressure.data = np.array([ np.NAN, 8.8041e+02, 1.2495e+03, 1.7485e+03, 2.4147e+03, 3.2931e+03, 4.4381e+03, 5.9145e+03, 7.7984e+03, 1.0179e+04, 1.3160e+04, 1.6858e+04, 2.1410e+04, 2.6968e+04, 3.3704e+04, 4.1808e+04, 5.1493e+04, 6.2992e+04, 7.6562e+04, 9.2482e+04, 1.1106e+05, 1.3261e+05, 1.5750e+05, 1.8610e+05, 2.1882e+05, 2.5608e+05, 2.9834e+05, 3.4608e+05, 3.9979e+05, 4.6002e+05, 5.2732e+05, 6.0227e+05, 6.8548e+05, 7.7757e+05, 8.7919e+05, 9.9104e+05, 1.1138e+06, 1.2482e+06, 1.3950e+06, 1.5549e+06, ])
|
||||
self.Tmin = np.min(self.temperature.data)
|
||||
self.Tmax = np.max(self.temperature.data)
|
||||
self.TminPsat = np.min(self.temperature.data[~np.isnan(self.saturation_pressure.data)])
|
||||
self.name = "Water"
|
||||
self.description = "Fit of the subcooled region of the full EOS from 0.5 bar to 100 bar and from 0 deg C to 200 deg C."
|
||||
self.reference = "Wagner2002"
|
||||
self.reshapeAll()
|
||||
|
||||
|
||||
96
dev/incompressible_liquids/json/Water.json
Normal file
96
dev/incompressible_liquids/json/Water.json
Normal file
@@ -0,0 +1,96 @@
|
||||
{
|
||||
"T_freeze": {
|
||||
"coeffs": "null",
|
||||
"type": "notdefined"
|
||||
},
|
||||
"Tbase": 3.731500e+02,
|
||||
"Tmax": 4.731500e+02,
|
||||
"Tmin": 2.731500e+02,
|
||||
"TminPsat": 2.782782e+02,
|
||||
"conductivity": {
|
||||
"coeffs": [
|
||||
[
|
||||
5.602160e-01
|
||||
],
|
||||
[
|
||||
1.470951e-05
|
||||
],
|
||||
[
|
||||
-4.222652e-08
|
||||
],
|
||||
[
|
||||
-9.630489e-10
|
||||
]
|
||||
],
|
||||
"type": "polynomial"
|
||||
},
|
||||
"density": {
|
||||
"coeffs": [
|
||||
[
|
||||
9.615327e+02
|
||||
],
|
||||
[
|
||||
-7.059969e-01
|
||||
],
|
||||
[
|
||||
-2.541021e-03
|
||||
],
|
||||
[
|
||||
3.442833e-06
|
||||
]
|
||||
],
|
||||
"type": "polynomial"
|
||||
},
|
||||
"description": "Fit of the subcooled region of the full EOS from 0.5 bar to 100 bar and from 0 deg C to 200 deg C.",
|
||||
"mass2input": {
|
||||
"coeffs": "null",
|
||||
"type": "notdefined"
|
||||
},
|
||||
"mole2input": {
|
||||
"coeffs": "null",
|
||||
"type": "notdefined"
|
||||
},
|
||||
"name": "Water",
|
||||
"reference": "Wagner2002",
|
||||
"saturation_pressure": {
|
||||
"coeffs": [
|
||||
-3.863635e+03,
|
||||
-4.391760e+01,
|
||||
-2.326064e+01
|
||||
],
|
||||
"type": "exponential"
|
||||
},
|
||||
"specific_heat": {
|
||||
"coeffs": [
|
||||
[
|
||||
4.199132e+03
|
||||
],
|
||||
[
|
||||
1.116817e+00
|
||||
],
|
||||
[
|
||||
1.238871e-02
|
||||
],
|
||||
[
|
||||
2.770690e-05
|
||||
]
|
||||
],
|
||||
"type": "polynomial"
|
||||
},
|
||||
"viscosity": {
|
||||
"coeffs": [
|
||||
1.752794e+00,
|
||||
-9.603666e+00,
|
||||
6.336660e+00
|
||||
],
|
||||
"type": "exponential"
|
||||
},
|
||||
"volume2input": {
|
||||
"coeffs": "null",
|
||||
"type": "notdefined"
|
||||
},
|
||||
"xbase": 0.000000e+00,
|
||||
"xid": "pure",
|
||||
"xmax": 1.000000e+00,
|
||||
"xmin": 0.000000e+00
|
||||
}
|
||||
Reference in New Issue
Block a user