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
104 Commits 36 Branches 30 Tags
fe04964cbccb30ab0f62fe1f99d5d700928c836a
Commit Graph

104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
3726030f9f Fixed hash function (*facepalm*) in header generator 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 14:28:25 +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
bb10d0c1ab Implemented the hash checking of generate_headers.py to avoid rebuilding unnecessarily (https://github.com/CoolProp/CoolProp/issues/34) 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 12:42:13 +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
338e073354 Sphinx config links to dreamhosters doxygen output 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:41:53 +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
Ian bell
185a216364 Fixed PolyMath to correct name clash with DEBUG macro - should use get/set_debug_level instead 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:36:06 +02:00
Ian bell
0bafb7e10b Surface tension curves are back - temporarily disabling check in generate_headers.py 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-18 22:21:09 +02:00
Ian bell
de78977e76 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-18 22:09:42 +02:00
Ian bell
23e846e38e Baby steps towards transport properties. 2014-05-18 22:09:29 +02:00
jowr
70fdcf2613 Added build directory to ignore, more on polymath and incompressibles 2014-05-18 17:23:15 +02:00
Ian bell
8987cf3954 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-18 01:20:46 +02:00
Ian bell
0aa3a8d404 Fixed json packing on py2.7 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-18 01:20:32 +02:00
Ian bell
1c5d9a44b6 Fixed Cmake file on windows 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-18 01:20:10 +02:00
Ian Bell
69a3e5409c Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-05-18 00:11:04 +02:00
Ian Bell
8328c271c6 Fixed initialization bug, Octave example compiles and runs on linux now 2014-05-18 00:10:51 +02:00
Ian Bell
2a24f7a192 Merge pull request #29 from Rod-Persky/cmake 
Cmake
 2014-05-17 23:45:19 +02:00
Ian bell
ca68a2356b Fixed generate_headers.py machinery on py3; More fluid surface tension injected 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-17 23:44:13 +02:00
Ian Bell
50c4e054f9 Cmake file for Octave works, but seg faults on ubuntu (?) 2014-05-17 22:39:22 +02:00
Ian Bell
18759d1b13 Fixed header generator (typo) 2014-05-17 22:37:59 +02:00
Ian bell
7e34a8550a Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-17 19:54:42 +02:00
Ian bell
eeab8e18fe Use cpversion.h instead of version.h to reduce name clashing in headers 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-17 19:54:28 +02:00
Ian bell
d23e9447fa First cut at octave + Cmake. Seems there is a problem with MSVC and octave now - used to work. 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-17 19:51:32 +02:00
Rod Persky
8f3f6566f6 Update .travis.yml 2014-05-18 01:19:14 +10:00