36 Commits

Author SHA1 Message Date
Jorrit Wronski
ae36828ea1 Fixed the header handling, closes #362 and partly covers the issues named in #354. 2014-12-19 11:31:21 +01:00
Ian Bell
70f737c55d Predefined mixtures are added, can be accessed with a fluid name like R410A.mix
Closes https://github.com/CoolProp/CoolProp/issues/153

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 09:57:01 +02:00
Ian Bell
1a3437b04a Fixed departure functions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 09:54:20 +02:00
Ian Bell
8fdd1fddaf Refactor of mixing parameters successful
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 15:41:33 +02:00
Ian Bell
8294acb71e Updated generate_headers.py for the new structure of reducing and departure functions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 16:46:45 +01:00
Ian Bell
2f448a0a4a Also output the python -mjson.tool output for incompressibles
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 00:55:12 +02:00
Ian Bell
3c3ffa66c4 generate_headers.py gives slightly more useful output if JSON fluid file cannot be decoded
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 00:48:38 +02:00
Ian Bell
4a733c6db7 Once more with the encodings
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 11:11:47 +02:00
Ian Bell
6ceaab1fd7 One more try with the encoding
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 10:34:42 +02:00
Ian Bell
396dbba0ee Fixed string encoding in generate_headers.py
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 09:35:01 +02:00
Ian Bell
d65fee9303 Encode the hash input as ascii if needed (windows only?)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 08:40:14 +02:00
Ian Bell
df8abdfd03 Removed print of type
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-09 11:05:53 +02:00
Ian Bell
584b975b4b Fixed python files for py3.x I think, though I hate python 3 string handling 2014-08-07 23:27:37 +02:00
Ian Bell
65df77f81e Fixed some things in generate_headers.py for py3.x 2014-08-07 22:07:40 +02:00
Ian Bell
19e406e805 Fixed some things in generate_headers.py for py3.x 2014-08-07 21:12:24 +02:00
Ian Bell
a2f45e29da Added functionality for trivial outputs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 18:55:52 +02:00
Ian Bell
df17eaf6cc python wrapper builds with vs2008 (fixed bug in Eigen)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 11:37:17 +02:00
jowr
8ff8332e77 Added some reporting to Python. Untested changes in C++ 2014-08-01 15:13:48 +02:00
Ian Bell
4aa8c5ac61 Fixed incomp JSON files and added prototypes to incompressible backend
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 15:40:32 +02:00
Ian Bell
acac55d63c generate_headers.py prints error when JSON file cannot be loaded to localize problem
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 11:17:45 +02:00
Ian Bell
de6cfd670e Changed verbosity of header generation
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:28:43 +02:00
Ian Bell
cd9009e91f Combined several scripts into generate_headers.py
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:00:26 +02:00
Ian Bell
501274215a properly load and save the hashes in file 2014-06-11 01:11:39 +02:00
Ian Bell
ce5e41412e hashes.json file gets saved in the right place
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 15:24:40 +02:00
Ian Bell
8b43f59eae Fixed relative paths for copying Catch header
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 21:22:54 +02:00
Ian Bell
6b27b5675e Copy Catch header as part of build process
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 21:15:16 +02:00
Ian Bell
81cea06746 JSON packaging is slightly improved - no injection every time; Build incompressible JSON library
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-05 11:14:31 +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
Ian Bell
2a24f7a192 Merge pull request #29 from Rod-Persky/cmake
Cmake
2014-05-17 23:45:19 +02:00
Ian Bell
18759d1b13 Fixed header generator (typo) 2014-05-17 22:37:59 +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
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
Ian bell
b3847c7522 Initial commit for v5, but this time with the right line endings
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-14 12:46:24 +02:00