Commit Graph

140 Commits

Author SHA1 Message Date
Ian Bell
0f02f8cb21 Read CP0 and EOS BibTeX keys from JSON files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 21:21:40 +02:00
Ian Bell
ab257ec8fe Error if surface tension curves not provided for the fluid; Added keys for EOS and CP0 for the fluid
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 21:21:02 +02:00
Ian Bell
050ec56327 Added propane, dodecane, R1234yf and R1234ze(E) conductivity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 20:24:07 +02:00
Ian Bell
eddbfc0ec1 When building DLL, apply the COOLPROP_LIB macro to export the functions to the DLL
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 19:12:31 +02:00
Ian Bell
e98f3b6945 "V" and "L" are again supported in PropsSI as input
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 19:12:04 +02:00
Ian Bell
eba2f49e9c Added isobutane, n-butane conductivity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 19:11:35 +02:00
Ian Bell
40206185e7 Added octane nonane decane conductivity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 19:11:09 +02:00
Ian Bell
b845ccbae5 R125 conductivity - not exactly the same as REFPROP - why? But error with REFPROP max of 1.2%
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 17:57:51 +02:00
Ian Bell
cb94a3622d Updated Doxygen file for new version of Doxygen
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 16:06:10 +02:00
Ian Bell
ae20496fc1 Regenerated Benzene and n-Hexane JSON file
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 16:05:03 +02:00
Ian Bell
67c862bd0d Added hydrogen and parahydrogen conductivity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 16:04:35 +02:00
Ian Bell
ba8afe5e7f Added treatment of Olchowy-Sengers critical region term
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 13:30:49 +02:00
Ian Bell
5999c9d4f7 Benzene conductivity - still missing viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 13:29:22 +02:00
Ian Bell
59e0eeed6d Implemented critical constants for Olchowy-Sengers
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 13:28:54 +02:00
Ian Bell
3f449ab890 Fixed typo in SF6 conductivity caused by typo in Assael paper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-24 13:11:29 +02:00
Ian Bell
7d542997b1 Conductivity for Ethanol, SF6, Toluene and Heptane
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-23 20:05:24 +02:00
Ian Bell
3c8eb8746b Started with conductivity - implemented n-Hexane
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-23 17:13:54 +02:00
Ian Bell
83994c1de5 added visc and cond to keyed_output
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-23 17:13:29 +02:00
Ian Bell
dbac65da89 Added docs to AbstractState
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-23 17:13:07 +02:00
Ian Bell
1423afa815 Added note to BibTex for Ammonia
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-23 17:12:31 +02:00
Ian Bell
ea4670c252 Ammonia viscosity and tests
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-23 10:29:19 +02:00
Ian Bell
6ec5574b76 Added remaining tests for viscosity - only a few do not pass
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 23:52:04 +02:00
Ian Bell
bc5c75d06b Ethane viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 23:36:10 +02:00
Ian Bell
f29c329b8c R23 viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 23:13:56 +02:00
Ian Bell
809ec14df2 Helium viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 22:56:19 +02:00
Ian Bell
7477a8db80 Added notebook for conversion of viscosity terms
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 22:04:24 +02:00
Ian Bell
c135ca319b SF6 and H2S viscosity - still problems with H2S
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 22:03:31 +02:00
Ian Bell
3d9a99733d HFC pseudo-pure mixtures viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 22:02:31 +02:00
Ian Bell
5eb527e730 REFPROP backend can handle pseudo-pure fluids 2014-05-22 22:01:03 +02:00
Ian Bell
f4980afd1d Friction theory and SF6 viscosity and tests
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 16:17:47 +02:00
Ian Bell
f084b843a3 n-Hexane viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 14:53:26 +02:00
Ian Bell
f35336b9e5 Hydrogen viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 14:37:54 +02:00
Ian Bell
891af4d131 Water viscosity and moved viscosity specific values into the viscosity entry in JSON files 2014-05-22 11:18:48 +02:00
Ian Bell
33f5af0033 Ethanol viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 10:14:37 +02:00
Ian Bell
dd3b30d758 Disabling known failing tests
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 00:32:45 +02:00
Ian bell
52c684a3bd R152A viscosity
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 21:19:57 +02:00
Ian bell
fe04964cbc R123 viscosity and powers of T dilute term
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 20:23:44 +02:00
Ian bell
d8aaa2d2cf DimethylEther viscosity
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 17:45:29 +02:00
Ian bell
1feeba0d9b Fixed air viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-21 17:12:44 +02:00
Ian bell
d1da1fee27 Added R134a viscosity and tests based on REFPROP data
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 17:09:49 +02:00
Ian bell
b25b4e31d3 Added Nitrogen,Argon,Oxygen,Air viscosity
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 16:19:10 +02:00
Ian bell
646aa2f18f Added viscosity for CO2
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 14:12:15 +02:00
Ian bell
650ae3c5ed Implemented viscosity correlations (and tests) for Decane,Dodecane,Nonane,Octane,R125
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 10:49:01 +02:00
Ian bell
9875933430 Viscosity for Isobutane
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 09:36:43 +02:00
Ian bell
f69c2d7560 Added butane viscosity correlation
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 09:27:24 +02:00
Ian bell
d3fef2ff31 Added viscosity validation data for water
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 01:24:00 +02:00
Ian bell
a687d5b673 n-Propane viscosity fully loaded from JSON file - just need to implement the rest of fluids
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 00:51:59 +02:00
Ian bell
4f67a31041 Added JSON files for the incompressible fluids in preparation for integration into CoolProp
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-20 23:10:47 +02:00
Ian bell
2d17cc53ab Renamed CoolPropDLL to CoolPropLib
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-20 22:55:41 +02:00
Ian bell
04db9963f0 n-Propane viscosity can mostly be read from JSON, all that remains is the higher order terms, some thinking remains on that front
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-20 16:27:23 +02:00