github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-09 13:25:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
132 Commits 36 Branches 30 Tags
cb94a3622dbb46cc402a582d6b32bee8ca602735
Commit Graph

54 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
jowr
70fdcf2613 Added build directory to ignore, more on polymath and incompressibles 2014-05-18 17:23:15 +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
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
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
Rod Persky
ffd9c007e5 CMake 
Can now compile with catch with no errors, although there are errors within the
test cases. Also added a check in the generate_headers.py file to see if the
headers have already been generated (this is a proposal and can be removed)
because it's time consuming when there is no changes to those files. the change
is fairly dumb (check if file .JSON_done exists) and doesn't consider the
modification time of the files.
 2014-05-17 17:00:38 +10:00
Rod Persky
f41dbe60e2 added dl 2014-05-17 12:34:34 +10:00
jowr
47bb064717 Playing with CMake... 2014-05-16 13:47:49 +02:00
jowr
8e71eebc3b Added catch tests for polymath 2014-05-16 11:45:25 +02:00
Jorrit Wronski
55c8a292fa Merge pull request #25 from Rod-Persky/python-args 
Added parameter for path to JSON_to_CPP.py
 2014-05-16 09:13:22 +02:00
Rod Persky
df425fba4a readme stub in dev/ 
Basic description of how to build coolprop.
 2014-05-16 16:48:28 +10:00
Rod Persky
cd571e6797 Path 
generate_headers.py may not be called from the correct path, so get the
path of generate_headers.py and determine the base path from there
assuming generate_headers.py will be in dev/
 2014-05-16 16:36:44 +10:00
Rod Persky
cad756ba18 Added parameter for path to JSON_to_CPP.py 
set path through --path that is the root directory for the code. The
default is None as this was the previous behavior, however this does not
make sense.

Also the path name is normalised as, depending on OS there is confusion
on slash direction.
 2014-05-16 15:43:42 +10:00
Ian bell
463c40fcf0 Small work on the docs - doxylink needs to be fed an absolute path, but otherwise seems good. Might need to generate the absolute path at runtime somehow. Its different between local and remote locations of HTML. 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 23:43:58 +02:00