github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-09 05:15:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
140 Commits 36 Branches 30 Tags
0f02f8cb21c08c5d9fb253b12dcd8326c2b7697e
Commit Graph

81 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
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
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
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
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
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
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
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
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
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
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
Ian bell
f12c749914 Updated paths to CoolPropFluid.h 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 16:25:56 +02:00
Ian bell
82a52554b9 Moved CoolPropFluid.h into include, removed CoolPropFluid.cpp. Started adding structure for viscosity and conductivity inputs. 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 16:25:09 +02:00
Ian bell
3af1a4f0d8 AbstractState class tests 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 14:55:21 +02:00
Ian bell
c191c134f3 Some docs for Tests.cpp 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 14:09:04 +02:00
Ian bell
a98d9fda71 Switched viscosity to HEOS - but why do we get segfault when using REFPROP? 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 14:03:27 +02:00
Ian bell
79ceae2f5c Diabled copy ctor for now for AbstractStateWrapper class until we figure out how to handle ownership and copying 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 13:57:28 +02:00
Ian bell
601d561fbd Cleaned up Tests.cpp 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 13:47:14 +02:00
Ian bell
41e9047221 Added tests for AbstractStateWrapper class 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 13:46:39 +02:00
Ian bell
43904c3cac AbstractStateWrapper now checks whether AbstractState has been instantiated; HumidAirProp instantiation moved to function that is called by all exposed functions 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 12:52:26 +02:00
Ian bell
c18e0801c9 More viscosity validation data 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 00:09:26 +02:00
Ian bell
54d1e98e75 Added some more validation data for viscosity 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 23:43:36 +02:00
Ian bell
237a078c4d Fixed incompressible include path 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:40:13 +02:00
Ian bell
1b9ce4b503 Load transport properties (default values for now) 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:39:44 +02:00
Ian bell
41dacf83c6 HEOS can call transport properties 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:39:04 +02:00
Ian bell
69f76386b1 More work on transport properties. Hardcoded propane values for now. Also implemented tests for viscosity 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:38:33 +02:00