Commit Graph

812 Commits

Author SHA1 Message Date
Ian Bell
21f18bf104 Added aliases for molemass and p_triple
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 21:16:11 +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
ee36d65eba Prepared prepare_pypi for CoolProp5 -> CoolProp reversion 2014-08-12 18:00:17 +02:00
Ian Bell
e4c8d3f061 Python wrapper is more or less back in action completely. Additional testing is required.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 16:25:33 +02:00
Ian Bell
a98ef9c44a Renamed python module
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 15:09:38 +02:00
Ian Bell
802495cad3 Last commit before rename of python module to CoolProp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 15:07:57 +02:00
Ian Bell
c594a3c3c8 Implemented 2-input form of PropsSI function again in Python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 12:22:36 +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
b7bd58d986 More work on flash routines, number of failures is rapidly decreasing - still have problems for low pressure sat_p calcs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 11:21:12 +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
808fe592a5 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-12 09:35:14 +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
6224b1b56e Update index.rst 2014-08-12 08:55:13 +02:00
Ian Bell
79eca1d58e check both versions of REFPROP on windows always
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 08:50:14 +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
779714cce6 Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-08-11 23:29:09 +02:00
Ian Bell
aadce9570d updated source activate command 2014-08-11 23:28:46 +02:00
Ian Bell
9702c34515 Update wrappers.rst 2014-08-11 23:10:36 +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
984ceceb06 Update index.rst 2014-08-11 08:07:19 +02:00
Ian Bell
6567279419 Update index.rst 2014-08-10 22:49:21 +02:00
Ian Bell
febfea1bde Update index.rst 2014-08-10 22:36:40 +02:00
Ian Bell
ce5d8a919f D(T,P) falls back to Brent if can't get good solution with other solvers
A guaranteed solution if the solution domain made wide enough

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-10 21:39:09 +02:00
Ian Bell
8bd4227f38 Added T for phase determination p calculations 2014-08-10 21:02:15 +02:00
Ian Bell
86641af670 Fixed some errors with two-phase Trho inputs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-10 20:38:59 +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
51b34dcdbe Shared libraries now get the CoolPropLib.cpp file back
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-10 16:16:27 +02:00
Ian Bell
7203107b67 Can use pseudo-pure fluids again with REFPROP backend
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-10 16:15:43 +02:00
Ian Bell
5ee295f639 cleaned up whitespace 2014-08-09 15:12:31 +02:00
Ian Bell
c3cc696080 P,Y now works if P > pc
Add supercritical_gas and supercritical_liquid phase flags for a bit finer granularity

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-09 15:10:09 +02:00
Ian Bell
1a6e516eb0 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-09 13:59:48 +02:00
Ian Bell
adc207685d First check the empty file extension in REFPROP 2014-08-09 13:57:49 +02:00
Ian Bell
a7f0c8b580 Fixed REFPROP on *nix (forgot to init ierr=0) 2014-08-09 12:57:38 +02:00