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

Thanks to Vittorio Carosella who reported #425. This commit closes #425, which was caused by two errors in the conversion function for the Melinder coefficients.

Browse Source
This commit is contained in:
Jorrit Wronski
2015-01-25 22:42:40 +01:00
parent 7e020965f1
commit f52e59bba2
15 changed files with 263 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev/incompressible_liquids/CPIncomp/DataObjects.py
View File

@@ -581,8 +581,9 @@ class CoefficientData(SolutionData):
self.conductivity.coeffs = self.convertMelinderArray(coeffs[3])
self.viscosity.source = self.viscosity.SOURCE_COEFFS
self.viscosity.type = self.viscosity.INCOMPRESSIBLE_POLYNOMIAL
self.viscosity.coeffs = self.convertMelinderArray(coeffs[4])/1e3
self.viscosity.type = self.viscosity.INCOMPRESSIBLE_EXPPOLYNOMIAL
self.viscosity.coeffs = self.convertMelinderArray(coeffs[4])
self.viscosity.coeffs[0,0] -= math.log(1000) # Fixes the units mPa s -> Pa s

38
dev/incompressible_liquids/json/ExampleMelinder.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
1.153000e-03,
5.448000e-04,
-5.552000e-03,
3.038000e-03,
6.669000e-03,
-8.472000e-03
-5.754755e+00,
5.448000e-01,
-5.552000e+00,
3.038000e+00,
6.669000e+00,
-8.472000e+00
],
[
-3.866000e-05,
1.008000e-05,
8.384000e-05,
-7.435000e-05,
-9.105000e-05,
-3.866000e-02,
1.008000e-02,
8.384000e-02,
-7.435000e-02,
-9.105000e-02,
0.000000e+00
],
[
2.779000e-07,
-2.809000e-07,
-3.997000e-07,
7.442000e-07,
2.779000e-04,
-2.809000e-04,
-3.997000e-04,
7.442000e-04,
0.000000e+00,
0.000000e+00
],
[
-1.543000e-09,
9.811000e-10,
-3.466000e-09,
-1.543000e-06,
9.811000e-07,
-3.466000e-06,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MAM.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
9.255000e-04,
1.327000e-03,
-5.979000e-03,
-1.097000e-01,
3.065000e-01,
3.244000e+00
-5.982255e+00,
1.327000e+00,
-5.979000e+00,
-1.097000e+02,
3.065000e+02,
3.244000e+03
],
[
-3.439000e-05,
1.856000e-05,
-2.184000e-04,
1.670000e-03,
-6.166000e-03,
-3.439000e-02,
1.856000e-02,
-2.184000e-01,
1.670000e+00,
-6.166000e+00,
0.000000e+00
],
[
3.217000e-07,
-1.646000e-06,
1.297000e-05,
-3.377000e-05,
3.217000e-04,
-1.646000e-03,
1.297000e-02,
-3.377000e-02,
0.000000e+00,
0.000000e+00
],
[
-4.544000e-09,
3.004000e-08,
-1.141000e-07,
-4.544000e-06,
3.004000e-05,
-1.141000e-04,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MCA.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
8.939000e-04,
4.389000e-03,
9.121000e-03,
1.963000e-03,
2.997000e-02,
3.435000e-01
-6.013855e+00,
4.389000e+00,
9.121000e+00,
1.963000e+00,
2.997000e+01,
3.435000e+02
],
[
-2.647000e-05,
2.102000e-05,
3.993000e-05,
-4.892000e-04,
-3.631000e-03,
-2.647000e-02,
2.102000e-02,
3.993000e-02,
-4.892000e-01,
-3.631000e+00,
0.000000e+00
],
[
1.718000e-07,
-8.688000e-08,
3.785000e-06,
1.526000e-08,
1.718000e-04,
-8.688000e-05,
3.785000e-03,
1.526000e-05,
0.000000e+00,
0.000000e+00
],
[
-7.918000e-10,
-4.353000e-09,
-9.979000e-08,
-7.918000e-07,
-4.353000e-06,
-9.979000e-05,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MEA.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
1.474000e-03,
1.565000e-03,
-8.435000e-03,
7.552000e-03,
1.529000e-02,
-4.130000e-02
-5.433755e+00,
1.565000e+00,
-8.435000e+00,
7.552000e+00,
1.529000e+01,
-4.130000e+01
],
[
-4.745000e-05,
-4.106000e-06,
1.640000e-04,
-1.118000e-04,
-9.481000e-05,
-4.745000e-02,
-4.106000e-03,
1.640000e-01,
-1.118000e-01,
-9.481000e-02,
0.000000e+00
],
[
4.314000e-07,
-5.135000e-07,
-1.091000e-06,
1.899000e-06,
4.314000e-04,
-5.135000e-04,
-1.091000e-03,
1.899000e-03,
0.000000e+00,
0.000000e+00
],
[
-3.023000e-09,
7.004000e-09,
-1.967000e-08,
-3.023000e-06,
7.004000e-06,
-1.967000e-05,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MEG.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
4.705000e-04,
2.471000e-03,
3.328000e-05,
1.659000e-03,
3.089000e-03,
-1.865000e-02
-6.437255e+00,
2.471000e+00,
3.328000e-02,
1.659000e+00,
3.089000e+00,
-1.865000e+01
],
[
-2.550000e-05,
-1.171000e-05,
1.086000e-05,
3.157000e-06,
1.831000e-05,
-2.550000e-02,
-1.171000e-02,
1.086000e-02,
3.157000e-03,
1.831000e-02,
0.000000e+00
],
[
1.782000e-07,
1.052000e-07,
1.051000e-07,
4.063000e-07,
1.782000e-04,
1.052000e-04,
1.051000e-04,
4.063000e-04,
0.000000e+00,
0.000000e+00
],
[
-7.669000e-10,
-1.634000e-09,
-6.475000e-09,
-7.669000e-07,
-1.634000e-06,
-6.475000e-06,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MGL.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
1.520000e-03,
4.450000e-03,
3.633000e-03,
1.069000e-03,
5.729000e-03,
2.116000e-02
-5.387755e+00,
4.450000e+00,
3.633000e+00,
1.069000e+00,
5.729000e+00,
2.116000e+01
],
[
-3.729000e-05,
-2.688000e-05,
-4.088000e-05,
-1.248000e-04,
-1.780000e-04,
-3.729000e-02,
-2.688000e-02,
-4.088000e-02,
-1.248000e-01,
-1.780000e-01,
0.000000e+00
],
[
3.572000e-07,
8.876000e-08,
6.219000e-07,
3.019000e-06,
3.572000e-04,
8.876000e-05,
6.219000e-04,
3.019000e-03,
0.000000e+00,
0.000000e+00
],
[
-3.648000e-09,
-2.209000e-09,
6.331000e-09,
-3.648000e-06,
-2.209000e-06,
6.331000e-06,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MKA.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
1.042000e-03,
3.405000e-03,
5.017000e-03,
5.637000e-03,
-2.922000e-02,
-7.960000e-02
-5.865755e+00,
3.405000e+00,
5.017000e+00,
5.637000e+00,
-2.922000e+01,
-7.960000e+01
],
[
-3.071000e-05,
-1.511000e-05,
-7.779000e-05,
2.534000e-05,
4.601000e-04,
-3.071000e-02,
-1.511000e-02,
-7.779000e-02,
2.534000e-02,
4.601000e-01,
0.000000e+00
],
[
2.819000e-07,
1.172000e-07,
9.125000e-07,
1.596000e-06,
2.819000e-04,
1.172000e-04,
9.125000e-04,
1.596000e-03,
0.000000e+00,
0.000000e+00
],
[
-2.190000e-09,
-2.379000e-09,
-1.888000e-08,
-2.190000e-06,
-2.379000e-06,
-1.888000e-05,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MKC.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
8.063000e-04,
3.624000e-03,
6.659000e-03,
1.077000e-02,
-1.097000e-02,
-8.453000e-02
-6.101455e+00,
3.624000e+00,
6.659000e+00,
1.077000e+01,
-1.097000e+01,
-8.453000e+01
],
[
-2.362000e-05,
-1.262000e-06,
-1.611000e-04,
-9.796000e-05,
7.825000e-04,
-2.362000e-02,
-1.262000e-03,
-1.611000e-01,
-9.796000e-02,
7.825000e-01,
0.000000e+00
],
[
1.851000e-07,
-3.022000e-08,
1.530000e-06,
3.070000e-06,
1.851000e-04,
-3.022000e-05,
1.530000e-03,
3.070000e-03,
0.000000e+00,
0.000000e+00
],
[
-2.372000e-09,
-7.761000e-10,
1.061000e-08,
-2.372000e-06,
-7.761000e-07,
1.061000e-05,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MKF.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
8.088000e-04,
1.758000e-03,
-8.372000e-04,
-1.184000e-03,
1.088000e-01,
3.098000e-01
-6.098955e+00,
1.758000e+00,
-8.372000e-01,
-1.184000e+00,
1.088000e+02,
3.098000e+02
],
[
-2.556000e-05,
8.603000e-06,
-1.601000e-05,
-1.331000e-04,
-7.003000e-04,
-2.556000e-02,
8.603000e-03,
-1.601000e-02,
-1.331000e-01,
-7.003000e-01,
0.000000e+00
],
[
2.195000e-07,
2.498000e-07,
4.815000e-08,
-5.489000e-06,
2.195000e-04,
2.498000e-04,
4.815000e-05,
-5.489000e-03,
0.000000e+00,
0.000000e+00
],
[
-1.667000e-09,
-3.569000e-09,
-1.861000e-08,
-1.667000e-06,
-3.569000e-06,
-1.861000e-05,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MLI.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
1.013000e-03,
3.920000e-03,
3.320000e-03,
2.206000e-03,
1.745000e-01,
6.699000e-01
-5.894755e+00,
3.920000e+00,
3.320000e+00,
2.206000e+00,
1.745000e+02,
6.699000e+02
],
[
-3.062000e-05,
6.246000e-06,
7.840000e-06,
-6.011000e-04,
-7.094000e-03,
-3.062000e-02,
6.246000e-03,
7.840000e-03,
-6.011000e-01,
-7.094000e+00,
0.000000e+00
],
[
2.940000e-07,
-1.752000e-07,
-3.100000e-06,
4.023000e-06,
2.940000e-04,
-1.752000e-04,
-3.100000e-03,
4.023000e-03,
0.000000e+00,
0.000000e+00
],
[
-2.719000e-09,
8.346000e-09,
1.381000e-07,
-2.719000e-06,
8.346000e-06,
1.381000e-04,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MMA.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
1.153000e-03,
5.448000e-04,
-5.552000e-03,
3.038000e-03,
6.669000e-03,
-8.472000e-03
-5.754755e+00,
5.448000e-01,
-5.552000e+00,
3.038000e+00,
6.669000e+00,
-8.472000e+00
],
[
-3.866000e-05,
1.008000e-05,
8.384000e-05,
-7.435000e-05,
-9.105000e-05,
-3.866000e-02,
1.008000e-02,
8.384000e-02,
-7.435000e-02,
-9.105000e-02,
0.000000e+00
],
[
2.779000e-07,
-2.809000e-07,
-3.997000e-07,
7.442000e-07,
2.779000e-04,
-2.809000e-04,
-3.997000e-04,
7.442000e-04,
0.000000e+00,
0.000000e+00
],
[
-1.543000e-09,
9.811000e-10,
-3.466000e-09,
-1.543000e-06,
9.811000e-07,
-3.466000e-06,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MMG.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
9.573000e-04,
4.968000e-03,
-2.722000e-02,
9.351000e-02,
7.364000e+00,
3.717000e+01
-5.950455e+00,
4.968000e+00,
-2.722000e+01,
9.351000e+01,
7.364000e+03,
3.717000e+04
],
[
-3.065000e-05,
1.559000e-05,
-1.753000e-04,
-8.353000e-03,
-4.014000e-02,
-3.065000e-02,
1.559000e-02,
-1.753000e-01,
-8.353000e+00,
-4.014000e+01,
0.000000e+00
],
[
1.115000e-07,
-1.796000e-06,
2.021000e-05,
1.901000e-04,
1.115000e-04,
-1.796000e-03,
2.021000e-02,
1.901000e-01,
0.000000e+00,
0.000000e+00
],
[
-2.923000e-09,
3.051000e-08,
2.614000e-07,
-2.923000e-06,
3.051000e-05,
2.614000e-04,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

26
dev/incompressible_liquids/json/MNA.json
View File

@@ -145,25 +145,25 @@
"viscosity": {
"coeffs": [
[
4.369000e-04,
2.346000e-03,
4.276000e-03,
7.386000e-03,
4.688000e-02,
-6.470855e+00,
2.346000e+00,
4.276000e+00,
7.386000e+00,
4.688000e+01,
0.000000e+00
],
[
-2.666000e-05,
-5.368000e-06,
-4.526000e-05,
5.437000e-04,
-2.666000e-02,
-5.368000e-03,
-4.526000e-02,
5.437000e-01,
0.000000e+00,
0.000000e+00
],
[
2.035000e-07,
2.871000e-07,
1.838000e-06,
2.035000e-04,
2.871000e-04,
1.838000e-03,
0.000000e+00,
0.000000e+00,
0.000000e+00
@@ -177,7 +177,7 @@
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",

38
dev/incompressible_liquids/json/MPG.json
View File

@@ -145,39 +145,39 @@
"viscosity": {
"coeffs": [
[
6.837000e-04,
3.328000e-03,
5.453000e-04,
-3.900000e-03,
-1.587000e-03,
3.564000e-02
-6.224055e+00,
3.328000e+00,
5.453000e-01,
-3.900000e+00,
-1.587000e+00,
3.564000e+01
],
[
-3.045000e-05,
-3.984000e-05,
-8.600000e-07,
1.054000e-04,
4.475000e-05,
-3.045000e-02,
-3.984000e-02,
-8.600000e-04,
1.054000e-01,
4.475000e-02,
0.000000e+00
],
[
2.525000e-07,
4.332000e-07,
-1.593000e-07,
-1.589000e-06,
2.525000e-04,
4.332000e-04,
-1.593000e-04,
-1.589000e-03,
0.000000e+00,
0.000000e+00
],
[
-1.399000e-09,
-1.860000e-09,
-4.465000e-10,
-1.399000e-06,
-1.860000e-06,
-4.465000e-07,
0.000000e+00,
0.000000e+00,
0.000000e+00
]
],
"type": "polynomial"
"type": "exppolynomial"
},
"volume2input": {
"coeffs": "null",