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 error in MEG heat capacity by factor 1e3, closes #309

Browse Source
This commit is contained in:
Jorrit Wronski
2014-12-08 16:40:17 +01:00
parent f6cadd0b9d b31729d5a5
commit f8f550e19f
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dev/incompressible_liquids/CPIncomp/MelinderFluids.py
View File

@@ -304,24 +304,24 @@ class EGSolution(CoefficientData):
self.xbase = 30.8462 / 100.0
coeffs = np.array([
[-15.25,1034,3.737,0.472,0.4705],
[-0.000001566,-0.4781,0.00293,0.0008903,-0.0255],
[-0.0000002278,-0.002692,-0.000004675,-0.000001058,0.0001782],
[0.000000002169,0.000004725,-0.00000001389,-0.000000002789,-0.0000007669],
[-0.808,1.311,-0.01799,-0.004286,0.02471],
[-0.000001339,-0.006876,0.0001046,-0.00001473,-0.0001171],
[0.00000002047,0.00004805,-0.0000004147,0.0000001059,0.000001052],
[-0.00000000002717,0.0000000169,0.0000000001847,-0.0000000001142,-0.00000001634],
[-0.01334,0.0000749,-0.00009933,0.00001747,0.000003328],
[0.00000006322,0.00007855,0.0000003516,0.00000006814,0.000001086],
[0.0000000002373,-0.0000003995,0.000000005109,-0.000000003612,0.00000001051],
[-0.000000000002183,0.000000004982,-0.00000000007138,0.000000000002365,-0.0000000006475],
[-0.00007293,-0.0001062,0.00000261,0.00000003017,0.000001659],
[0.000000001764,0.000001229,-0.000000001189,-0.000000002412,0.000000003157],
[-0.00000000002442,-0.00000001153,-0.0000000001643,0.00000000004004,0.0000000004063],
[0.000001006,-0.0000009623,0.00000001537,-0.000000001322,0.00000003089],
[-0.00000000007662,-0.00000007211,-0.0000000004272,0.00000000002555,0.0000000001831],
[0.00000000114,0.00000004891,-0.000000001618,0.00000000002678,-0.000000001865]
[-15.25,1034,3737,0.472,0.4705],
[-0.000001566,-0.4781,2.93,0.0008903,-0.0255],
[-0.0000002278,-0.002692,-0.004675,-0.000001058,0.0001782],
[0.000000002169,0.000004725,-0.00001389,-0.000000002789,-0.0000007669],
[-0.808,1.311,-17.99,-0.004286,0.02471],
[-0.000001339,-0.006876,0.1046,-0.00001473,-0.0001171],
[0.00000002047,0.00004805,-0.0004147,0.0000001059,0.000001052],
[-0.00000000002717,0.0000000169,0.0000001847,-0.0000000001142,-0.00000001634],
[-0.01334,0.0000749,-0.09933,0.00001747,0.000003328],
[0.00000006322,0.00007855,0.0003516,0.00000006814,0.000001086],
[0.0000000002373,-0.0000003995,0.000005109,-0.000000003612,0.00000001051],
[-0.000000000002183,0.000000004982,-0.00000007138,0.000000000002365,-0.0000000006475],
[-0.00007293,-0.0001062,0.00261,0.00000003017,0.000001659],
[0.000000001764,0.000001229,-0.000001189,-0.000000002412,0.000000003157],
[-0.00000000002442,-0.00000001153,-0.0000001643,0.00000000004004,0.0000000004063],
[0.000001006,-0.0000009623,0.00001537,-0.000000001322,0.00000003089],
[-0.00000000007662,-0.00000007211,-0.0000004272,0.00000000002555,0.0000000001831],
[0.00000000114,0.00000004891,-0.000001618,0.00000000002678,-0.000000001865]
])
self.setMelinderMatrix(coeffs)

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

@@ -108,33 +108,33 @@
"specific_heat": {
"coeffs": [
[
3.737000e+00,
-1.799000e+00,
-9.933000e-01,
2.610000e+00,
1.537000e+00,
-1.618000e+01
3.737000e+03,
-1.799000e+03,
-9.933000e+02,
2.610000e+03,
1.537000e+03,
-1.618000e+04
],
[
2.930000e-03,
1.046000e-02,
3.516000e-03,
-1.189000e-03,
-4.272000e-02,
2.930000e+00,
1.046000e+01,
3.516000e+00,
-1.189000e+00,
-4.272000e+01,
0.000000e+00
],
[
-4.675000e-06,
-4.147000e-05,
5.109000e-05,
-1.643000e-04,
-4.675000e-03,
-4.147000e-02,
5.109000e-02,
-1.643000e-01,
0.000000e+00,
0.000000e+00
],
[
-1.389000e-08,
1.847000e-08,
-7.138000e-07,
-1.389000e-05,
1.847000e-05,
-7.138000e-04,
0.000000e+00,
0.000000e+00,
0.000000e+00