Commit Graph

338 Commits

Author SHA1 Message Date
Ian Bell
d7701fa0a1 Once more into the breach
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 00:20:12 +02:00
Ian Bell
6a9cd07e75 Fixed error with undefined cmake_args
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 00:15:40 +02:00
Ian Bell
1813ad3b4e Indentation!!
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 00:14:35 +02:00
Ian Bell
18fb8071a8 Added the arch appropriate generator for windows for python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-13 23:40:36 +02:00
Ian Bell
83d2dbcda9 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-13 21:49:20 +02:00
Ian Bell
8a4828bd2e Sphinx build now also installs python wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-13 21:49:07 +02:00
Ian Bell
95c386a94c Octave working again on OSX 2014-08-13 19:57:34 +02:00
Ian Bell
a7ddd80d5a Much more progress on PY flash routines. Only a few edge cases that fail, otherwise all is good
Moved from bounded secant to Brent for stability

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-13 14:26:47 +02:00
Ian Bell
8f9c6ca438 Added hs_anchor test (passing) and function get_state to allow to get access to states stored in the backends
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 21:17:34 +02:00
Ian Bell
12db53de06 Reverted the Octave finder - need to rethink the structure for windows since it works fine on linux/OSX
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 21:14:59 +02:00
Ian Bell
c632e823ac Updated triple point states - a bit more work to once Ts(ps) works at low pressure without NR
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 21:13:59 +02:00
Ian Bell
12f1cc6b86 Updated fluid files with most of the triple point densities
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 20:57:18 +02:00
Ian Bell
227323a495 Updated master.cfg to fix clean command - string instead of list of strings
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 20:43:01 +02:00
Ian Bell
b14096b80a full clean should be able to work again from the web interface 2014-08-12 20:17:07 +02:00
Ian Bell
8f66b729c0 Fluid hs_anchor states updated to agree with CoolProp v5
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 18:42:09 +02:00
Ian Bell
5726d38975 Bump up max temps for melting lines to make them valid up to the maximum pressure of EOS
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 12:02:56 +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
299a85111c Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-12 08:40:27 +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
9f91a12a86 Fixed another typo with python builders 2014-08-12 01:05:45 +02:00
Ian Bell
a60b46dd31 Updated path again
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 00:43:19 +02:00
Ian Bell
4d3004bc13 Fixed typo 2014-08-12 00:35:08 +02:00
Ian Bell
a0caadb175 Trying again with the python builds 2014-08-12 00:31:51 +02:00
Ian Bell
c5bf716cdb sources fix for python bb 2014-08-12 00:19:08 +02:00
Ian Bell
228de6dcc3 Fixed path to CMakeLists.txt for python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 00:12:36 +02:00
Ian Bell
aadce9570d updated source activate command 2014-08-11 23:28:46 +02:00
Ian Bell
7d1d8245b0 indentation
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-11 23:06:04 +02:00
Ian Bell
c55f9b4d16 Added source for OSX to activate environment 2014-08-11 23:04:05 +02:00
Ian Bell
6c491467cd Added env names to python builders
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-11 22:52:03 +02:00
Ian Bell
7e22fac30e Fixed python builbot
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-11 22:50:44 +02:00
Ian Bell
bef97e3326 Added python versions using conda (64-bit only so far) 2014-08-11 22:49:04 +02:00
Ian Bell
36d601490f Lots more work on melting curves, can now make pretty phase diagram for water including the melting line 2014-08-10 19:28:04 +02:00
Ian Bell
ead9c98875 added codelite project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-09 12:41:07 +02:00
Ian Bell
faf530d588 Fixed melting curves, PY flash works for subcritical cases 2014-08-09 11:07:21 +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
74a62aa78a Added new EOS for R245fa from Akasaka, Zhou and Lemmon
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-09 10:54:40 +02:00
Ian Bell
1f13580d12 Added static library to buildbot to close https://github.com/CoolProp/CoolProp/issues/91
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-09 00:11:36 +02:00
Ian Bell
2e4b89e0a4 Another typo bites the dust
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 19:55:47 +02:00
Ian Bell
74997dfda3 Once more
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 19:52:27 +02:00
Ian Bell
641c78aca4 Fixed typo
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 19:48:58 +02:00
Ian Bell
5f0f713252 Fixed missing import
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 19:47:46 +02:00
Ian Bell
b6ab8fc3ef Add a fullclean option to the force on the website
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 19:46:10 +02:00
Ian Bell
39abcc5193 buildbot master now can do full cleans by setting property fullclean to yes in the web UI
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 18:51:44 +02:00
Ian Bell
b3e37171c1 Removed for now fullclean on windows - bug? Cleaned up test iterators
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 09:04:11 +02:00
Ian Bell
a34298efbd Just try to delete files in the folder
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 02:07:23 +02:00
Ian Bell
074b2f6d1b Ok lets try to do a clean for real
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 01:56:48 +02:00
Ian Bell
21004f279f Another attempt
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 01:40:47 +02:00
Ian Bell
4dad3fcb10 with a conditional now
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-08 01:34:03 +02:00