Commit Graph

715 Commits

Author SHA1 Message Date
Ian Bell
8b388f65a4 Updated ancillaries for R245fa
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 23:13:20 +02:00
Ian Bell
bbc97ac230 Added methanol viscosity correlation to close https://github.com/CoolProp/CoolProp/issues/82
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 23:12:16 +02:00
Ian Bell
5fea309764 Fixed R11 ancillaries
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 18:39:42 +02:00
Ian Bell
0e3f10e0e6 Added mixture derivatives files to codelite project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 14:57:11 +02:00
Ian Bell
3f6b6b4e35 Genetic ancillary fitter now uses PropsSI and CP v5
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 14:01:51 +02:00
Ian Bell
4299a27490 Improved ancillaries for R11
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-25 00:47:42 +02:00
Ian Bell
4b082029c4 Finally repaired flash routines.
Some edge cases remain

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-24 13:40:46 +02:00
Ian Bell
69bbdc693b Reimplemented critical region splines all the way from scripts to build to C++ code
Closes https://github.com/CoolProp/CoolProp/issues/94

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-22 22:14:48 +02:00
Ian Bell
921ec87c20 Updated constants module generator script
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 09:13:09 +02:00
Ian Bell
ec069fa84f Updated codelite project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 02:51:59 +02: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
b4ff7a8cc5 Implemented viscosity for cyclohexane from Tariq, 2014.
Added unit tests, reformulated initial density term

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 00:50:57 +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
89c09ebf91 Tidied up the R134a JSON file
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 20:39:50 +02:00
Ian Bell
70c6b26ab1 Reverted pseudo-pure fluid pressure ancillary equations to close https://github.com/CoolProp/CoolProp/issues/65
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 20:39:16 +02:00
Ian Bell
e5055d195a Added conductivity for R134a and test to close https://github.com/CoolProp/CoolProp/issues/101
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 17:16:51 +02:00
Ian Bell
7cf5f3515a Bumped up max temp for propane melting curve
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-18 19:24:06 +02:00
Ian Bell
f7464fcaa2 Implemented Eigen solution for all() function, speed testing next
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-17 21:09:27 +02:00
Ian Bell
2270f9f076 Helmholtz derivatives are all calculated using parallel code - next step is to remove classes from Helmholtz
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-15 21:16:41 +02:00
Ian Bell
42a4c68ee4 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-15 16:05:36 +02:00
Ian Bell
2136f417b9 Updated codelite and added Tabular backend structure
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-15 15:44:55 +02:00
Ian Bell
fd55d9a479 sphinx build does a local install of python 2014-08-15 00:44:52 +02:00
Ian Bell
1df2ae8512 Fixed python buildbot
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 23:14:51 +02:00
Ian Bell
be859fb9cb And again
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 12:39:08 +02:00
Ian Bell
dcf0ac88f3 Once more with feeling
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 12:37:09 +02:00
Ian Bell
933090b370 EES is now built in release mode
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-14 12:31:32 +02:00
Ian Bell
956165b00f sphinx docs do a local install 2014-08-14 00:54:51 +02:00
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