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

Fixed incomp JSON files and added prototypes to incompressible backend

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-07-08 15:40:32 +02:00
parent 77fa6d9887
commit 4aa8c5ac61
8 changed files with 391 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dev/generate_headers.py
View File

@@ -205,13 +205,16 @@ def combine_json(root_dir):
master = []
for file in glob.glob(os.path.join(root_dir,'dev','IncompressibleLiquids','*.json')):
for file in glob.glob(os.path.join(root_dir,'dev','incompressible_liquids','*.json')):
path, file_name = os.path.split(file)
fluid_name = file_name.split('.')[0]
# Load the fluid file
fluid = json.load(open(file, 'r'))
try:
# Load the fluid file
fluid = json.load(open(file, 'r'))
except ValueError:
raise ValueError('unable to decode file %s' % file)
master += [fluid]

158
dev/incompressible_liquids/ExampleMelinder.json
View File

@@ -6,73 +6,73 @@
-1.18700000e+02,
-1.21800000e+02,
-6.82300000e+01,
+1.29700000e+01,
+2.36300000e+02
1.29700000e+01,
2.36300000e+02
],
[
-2.57500000e-06,
-1.60900000e-03,
+3.86500000e-03,
+2.13700000e-02,
3.86500000e-03,
2.13700000e-02,
-5.40700000e-02,
+0.00000000e+00
0.00000000e+00
],
[
-6.73200000e-06,
+3.42000000e-05,
+8.76800000e-05,
3.42000000e-05,
8.76800000e-05,
-4.27100000e-04,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00
],
[
+1.63000000e-07,
+5.68700000e-08,
1.63000000e-07,
5.68700000e-08,
-2.09500000e-06,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
},
"Tbase": +2.76685900e+02,
"Tmax": +3.13150000e+02,
"Tmin": +2.23150000e+02,
"TminPsat": +3.13150000e+02,
"Tbase": 2.76685900e+02,
"Tmax": 3.13150000e+02,
"Tmin": 2.23150000e+02,
"TminPsat": 3.13150000e+02,
"conductivity": {
"coeffs": [
[
+4.17500000e-01,
4.17500000e-01,
-4.42100000e-01,
+2.04400000e-01,
+2.94300000e-01,
2.04400000e-01,
2.94300000e-01,
-8.66600000e-02,
-2.03300000e+00
],
[
+7.27100000e-04,
7.27100000e-04,
-2.95200000e-03,
+3.41300000e-03,
3.41300000e-03,
-9.64600000e-04,
-4.57300000e-05,
+0.00000000e+00
0.00000000e+00
],
[
+2.82300000e-07,
+7.33600000e-06,
2.82300000e-07,
7.33600000e-06,
-3.66500000e-05,
+3.17400000e-05,
+0.00000000e+00,
+0.00000000e+00
3.17400000e-05,
0.00000000e+00,
0.00000000e+00
],
[
+9.71800000e-09,
+4.32800000e-08,
9.71800000e-09,
4.32800000e-08,
-2.79100000e-07,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -80,36 +80,36 @@
"density": {
"coeffs": [
[
+9.58100000e+02,
9.58100000e+02,
-1.39100000e+02,
-1.10500000e+02,
-1.20800000e+02,
+4.92700000e+02,
4.92700000e+02,
-7.72700000e+02
],
[
-4.15100000e-01,
-1.51000000e+00,
+1.82800000e+00,
+2.99200000e+00,
1.82800000e+00,
2.99200000e+00,
-1.32500000e+01,
+0.00000000e+00
0.00000000e+00
],
[
-2.26100000e-03,
+1.11300000e-02,
1.11300000e-02,
-1.64100000e-02,
+1.45500000e-03,
+0.00000000e+00,
+0.00000000e+00
1.45500000e-03,
0.00000000e+00,
0.00000000e+00
],
[
+2.99800000e-07,
2.99800000e-07,
-3.26400000e-05,
+1.51000000e-04,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
1.51000000e-04,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -128,36 +128,36 @@
"specific_heat": {
"coeffs": [
[
+3.88700000e+03,
3.88700000e+03,
-1.85000000e+03,
-3.76900000e+02,
-3.77600000e+03,
-1.50400000e+04,
+6.43300000e+04
6.43300000e+04
],
[
+7.20100000e+00,
+2.98400000e+01,
7.20100000e+00,
2.98400000e+01,
-1.19600000e+02,
-5.61100000e+01,
+7.37300000e+02,
+0.00000000e+00
7.37300000e+02,
0.00000000e+00
],
[
-8.97900000e-02,
-1.86500000e-01,
+9.80100000e-01,
9.80100000e-01,
-7.81100000e-01,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00
],
[
-4.39000000e-04,
-1.71800000e-03,
+6.66000000e-03,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
6.66000000e-03,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -165,36 +165,36 @@
"viscosity": {
"coeffs": [
[
+1.15300000e+00,
+5.44800000e-01,
1.15300000e+00,
5.44800000e-01,
-5.55200000e+00,
+3.03800000e+00,
+6.66900000e+00,
3.03800000e+00,
6.66900000e+00,
-8.47200000e+00
],
[
-3.86600000e-02,
+1.00800000e-02,
+8.38400000e-02,
1.00800000e-02,
8.38400000e-02,
-7.43500000e-02,
-9.10500000e-02,
+0.00000000e+00
0.00000000e+00
],
[
+2.77900000e-04,
2.77900000e-04,
-2.80900000e-04,
-3.99700000e-04,
+7.44200000e-04,
+0.00000000e+00,
+0.00000000e+00
7.44200000e-04,
0.00000000e+00,
0.00000000e+00
],
[
-1.54300000e-06,
+9.81100000e-07,
9.81100000e-07,
-3.46600000e-06,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -203,7 +203,7 @@
"coeffs": "null",
"type": 0
},
"xbase": +3.05128000e-01,
"xmax": +6.00000000e-01,
"xmin": +0.00000000e+00
"xbase": 3.05128000e-01,
"xmax": 6.00000000e-01,
"xmin": 0.00000000e+00
}

114
dev/incompressible_liquids/ExamplePure.json
View File

@@ -2,37 +2,37 @@
"T_freeze": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
},
"Tbase": +0.00000000e+00,
"Tmax": +5.33150000e+02,
"Tmin": +1.88150000e+02,
"TminPsat": +3.13150000e+02,
"Tbase": 0.00000000e+00,
"Tmax": 5.33150000e+02,
"Tmin": 1.88150000e+02,
"TminPsat": 3.13150000e+02,
"conductivity": {
"coeffs": [
[
+1.48097095e-01
1.48097095e-01
],
[
-9.48368298e-05
@@ -46,7 +46,7 @@
"density": {
"coeffs": [
[
+9.18850911e+02
9.18850911e+02
],
[
-3.79885781e-01
@@ -61,25 +61,25 @@
"mass2mole": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -92,7 +92,7 @@
-3.37362570e+01
],
[
+1.48475714e-01
1.48475714e-01
],
[
-1.42982745e-04
@@ -103,10 +103,10 @@
"specific_heat": {
"coeffs": [
[
+6.29102932e+02
6.29102932e+02
],
[
+5.64463170e+00
5.64463170e+00
],
[
-2.07459207e-03
@@ -117,13 +117,13 @@
"viscosity": {
"coeffs": [
[
+6.73407820e+00
6.73407820e+00
],
[
-3.03017516e-02
],
[
+2.71311395e-05
2.71311395e-05
]
],
"type": "exppolynomial"
@@ -131,30 +131,30 @@
"volume2mass": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
},
"xbase": +0.00000000e+00,
"xbase": 0.00000000e+00,
"xmax": null,
"xmin": null
}

140
dev/incompressible_liquids/ExampleSecCool.json
View File

@@ -1,7 +1,7 @@
{
"T_freeze": {
"coeffs": [
+2.77555556e+01,
2.77555556e+01,
-2.29732217e+01,
-1.10405072e+00,
-1.20762281e-02,
@@ -9,43 +9,43 @@
],
"type": "polynomial"
},
"Tbase": +2.68670000e+02,
"Tmax": +2.93150000e+02,
"Tmin": +2.23150000e+02,
"TminPsat": +2.93150000e+02,
"Tbase": 2.68670000e+02,
"Tmax": 2.93150000e+02,
"Tmin": 2.23150000e+02,
"TminPsat": 2.93150000e+02,
"conductivity": {
"coeffs": [
[
+4.08206670e-01,
4.08206670e-01,
-3.98168700e-01,
+1.58336800e-01,
1.58336800e-01,
-3.55204900e-01,
-9.88417600e-02,
+4.46000000e+00
4.46000000e+00
],
[
+6.62932100e-04,
6.62932100e-04,
-2.68647500e-03,
+9.03915000e-03,
9.03915000e-03,
-2.12825700e-02,
-5.56200000e-02,
+0.00000000e+00
0.00000000e+00
],
[
+3.68597500e-07,
+7.18841600e-06,
3.68597500e-07,
7.18841600e-06,
-1.04177300e-04,
+2.27800100e-04,
+0.00000000e+00,
+0.00000000e+00
2.27800100e-04,
0.00000000e+00,
0.00000000e+00
],
[
+4.70339500e-08,
+7.61236100e-09,
4.70339500e-08,
7.61236100e-09,
-2.73400000e-06,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -53,36 +53,36 @@
"density": {
"coeffs": [
[
+9.60246658e+02,
9.60246658e+02,
-1.29038391e+02,
-1.61042520e+02,
-1.96988800e+02,
+1.13155900e+03,
+9.18199900e+02
1.13155900e+03,
9.18199900e+02
],
[
-4.02034827e-01,
-1.62463989e+00,
+1.62330100e+00,
+4.36734300e+00,
+1.19900000e+00,
+0.00000000e+00
1.62330100e+00,
4.36734300e+00,
1.19900000e+00,
0.00000000e+00
],
[
-2.52047760e-03,
+1.10151400e-02,
1.10151400e-02,
-2.32021700e-03,
+7.79499900e-02,
+0.00000000e+00,
+0.00000000e+00
7.79499900e-02,
0.00000000e+00,
0.00000000e+00
],
[
+9.93748300e-06,
9.93748300e-06,
-1.34688600e-04,
+4.14199900e-04,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
4.14199900e-04,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -101,36 +101,36 @@
"specific_heat": {
"coeffs": [
[
+3.82297123e+03,
3.82297123e+03,
-2.31224095e+03,
+6.78775826e+02,
+2.24138930e+03,
6.78775826e+02,
2.24138930e+03,
-3.04533200e+04,
-4.75800000e+04
],
[
+2.35014495e+00,
+1.78883941e+01,
+6.82800000e+00,
+2.10116600e+02,
2.35014495e+00,
1.78883941e+01,
6.82800000e+00,
2.10116600e+02,
-9.81200000e+02,
+0.00000000e+00
0.00000000e+00
],
[
-4.72417600e-04,
-3.31794900e-02,
+1.00203200e+00,
1.00203200e+00,
-5.30600000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00
],
[
+4.24219400e-05,
+2.34719000e-03,
4.24219400e-05,
2.34719000e-03,
-1.89400000e-02,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -138,36 +138,36 @@
"viscosity": {
"coeffs": [
[
+1.47255255e+00,
+2.22189980e-01,
1.47255255e+00,
2.22189980e-01,
-4.40613900e+00,
+6.04798400e+00,
6.04798400e+00,
-1.95473000e+01,
-2.37200000e+01
],
[
-4.11841566e-02,
+1.78447900e-02,
1.78447900e-02,
-3.56441300e-02,
+4.06467100e-02,
+1.91500000e+00,
+0.00000000e+00
4.06467100e-02,
1.91500000e+00,
0.00000000e+00
],
[
+2.57286200e-04,
2.57286200e-04,
-9.22634300e-05,
-2.17857700e-04,
-9.52999900e-04,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00
],
[
-1.69984400e-06,
-1.02355200e-05,
+4.48200000e-05,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
4.48200000e-05,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -176,7 +176,7 @@
"coeffs": "null",
"type": 0
},
"xbase": +3.15700000e-01,
"xmax": +5.00000000e-01,
"xmin": +0.00000000e+00
"xbase": 3.15700000e-01,
"xmax": 5.00000000e-01,
"xmin": 0.00000000e+00
}

234
dev/incompressible_liquids/ExampleSolution.json
View File

@@ -2,55 +2,55 @@
"T_freeze": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
},
"Tbase": +0.00000000e+00,
"Tbase": 0.00000000e+00,
"Tmax": null,
"Tmin": null,
"TminPsat": null,
"conductivity": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -59,24 +59,24 @@
"coeffs": [
[
-2.39943098e+02,
+1.25081590e+03,
+4.23507367e+01,
1.25081590e+03,
4.23507367e+01,
-1.81607263e+02,
+3.78787879e+01
3.78787879e+01
],
[
+1.18577276e+01,
1.18577276e+01,
-1.35013456e+01,
+7.88854875e-01,
+5.82010582e-01,
+0.00000000e+00
7.88854875e-01,
5.82010582e-01,
0.00000000e+00
],
[
-2.67448980e-02,
+3.14002268e-02,
3.14002268e-02,
-3.28798186e-03,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -85,25 +85,25 @@
"mass2mole": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -113,25 +113,25 @@
"saturation_pressure": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "exppolynomial"
@@ -139,25 +139,25 @@
"specific_heat": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
@@ -165,25 +165,25 @@
"viscosity": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "exppolynomial"
@@ -191,30 +191,30 @@
"volume2mass": {
"coeffs": [
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
],
[
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00,
+0.00000000e+00
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00,
0.00000000e+00
]
],
"type": "polynomial"
},
"xbase": +0.00000000e+00,
"xbase": 0.00000000e+00,
"xmax": null,
"xmin": null
}

2
dev/incompressible_liquids/json_incompressible.py
View File

@@ -122,7 +122,7 @@ class SolutionDataWriter(object):
original_float_repr = json.encoder.FLOAT_REPR
json.encoder.FLOAT_REPR = lambda o: format(o, '+.8e')
json.encoder.FLOAT_REPR = lambda o: format(o, ' .8e')
#print json.dumps(1.0001)
dump = json.dumps(jobj, indent = 2, sort_keys = True)
json.encoder.FLOAT_REPR = original_float_repr