1536 Commits

Author SHA1 Message Date
Ian Bell
599bd58668 Fixed escaping in bb; reverted changes in CMake
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-03 15:49:02 +02:00
coolprop
2251f41928 Fixed octave bb 2014-10-03 06:44:03 -07:00
Ian Bell
3022d1889e Octave might work on windows now
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-03 15:30:57 +02:00
Ian Bell
791efecc26 Updated documentation
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 18:23:58 +02:00
Ian Bell
18aa75c0de Updated some melting curve BibTeX
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 17:00:43 +02:00
coolprop
c25762a6ef Fixed bb to get SWIG+MATLAB working 2014-10-02 07:43:48 -07:00
Ian Bell
3f75d0d555 Updated BibTeX references for some fluids
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 15:09:05 +02:00
Ian Bell
f2caf447e9 Updated swig matlab builder
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 15:06:14 +02:00
Ian Bell
de78c46b65 Swig matlab pre runs on linux slave
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 14:13:28 +02:00
Ian Bell
49f6092331 Fixed download source for swig-matlab
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 13:48:36 +02:00
Ian Bell
53a9dd42e5 Fixed path for py 32 bit installer for windows
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 13:10:06 +02:00
Ian Bell
181307ec5b Fixed to matlab_pre builder
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 13:08:34 +02:00
Ian Bell
dc56dbf6e2 Once more?
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 12:33:41 +02:00
Ian Bell
1be01dfd35 Fixed(?) builder for swig+matlab pre
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 12:30:49 +02:00
Ian Bell
83f3a2fea8 Fixed scheduler
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 12:29:26 +02:00
Ian Bell
ae4724d5ec Merge branch 'master' of https://github.com/coolprop/coolprop 2014-10-02 12:27:01 +02:00
Ian Bell
4562c8bd17 Added dependent scheduler for swig matlab
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 12:26:49 +02:00
coolprop
8b54af3b32 Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-10-02 03:18:09 -07:00
coolprop
28f20d878e Fix path sep for windows 2014-10-02 03:17:49 -07:00
Ian Bell
58f25ae427 First cut at matlab wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 12:14:07 +02:00
coolprop
680e08b190 Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-10-02 02:54:18 -07:00
coolprop
d6bd92116b Fixed typos in bb 2014-10-02 02:53:54 -07:00
Ian Bell
93ead404e7 Zip up swig+matlab for smaller download
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 11:50:27 +02:00
Ian Bell
d5cf2c1295 Add 32-bit python builders and use CMake for python builders on windows
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 11:29:14 +02:00
coolprop
4b79b5d794 Fixed SWIG+MATLAB 2014-10-02 02:11:19 -07:00
coolprop
6f2dea2cb3 Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-10-02 01:57:06 -07:00
coolprop
6847d3f834 Updated PyPI build command in bb 2014-10-02 01:56:47 -07:00
Ian Bell
15fa6feafd Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-10-02 10:51:39 +02:00
Ian Bell
5cfaffa02e Fix swig matlab wrapper 2014-10-02 10:51:20 +02:00
Ian Bell
f9c996a477 Build swig+MATLAB binary
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 10:50:18 +02:00
Ian Bell
6d212e2f5a Update url for pcre
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 10:38:39 +02:00
Ian Bell
82798d8e1c Merge branch 'master' of https://github.com/coolprop/coolprop 2014-10-02 10:25:20 +02:00
Ian Bell
3d0211b4e7 Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-10-02 10:24:24 +02:00
Ian Bell
60910b2d1c Add SWIG-MATLAB build script 2014-10-02 10:23:50 +02:00
Ian Bell
e6001daa41 Nightly runs twice a day instead of once
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 10:08:08 +02:00
Ian Bell
08c762e212 Remove code::blocks files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 10:02:39 +02:00
Ian Bell
1092a2f64f Remove JSON_to_CPP.py
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 09:59:27 +02: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
coolprop
573f1f8707 Fix buildbot for PYPI 2014-10-01 09:08:14 -07:00
Ian Bell
1bff16ee93 Add PYPI slave
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-01 17:55:39 +02:00
Ian Bell
3eab7dcd50 Updated ancillary for SES36 from v4
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 18:01:06 +02:00
Ian Bell
37c3ddc7f7 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-09-27 16:08:09 +02:00
Ian Bell
fc1484f828 Update critical splines
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 11:22:37 +02:00
Ian Bell
71b95eed6b Added mixtures of R32 and R1234yf and R1234ze(E)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 10:30:42 +02:00
Ian Bell
0bcd965b31 Added R134a/R245fa mixture parameters
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 10:12:44 +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
3b97a0e3f5 Updated departure functions for Gernert
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 09:43:38 +02:00
Ian Bell
8addd38cb0 Added Gernert binary pairs and conversion script
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 08:48:39 +02:00
Ian Bell
2f531aaf5e Added departure functions from Gernert
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-27 08:13:41 +02:00
Jorrit Wronski
2f67422591 Changed Melinder coefficients, fixes #161 2014-09-26 11:31:09 +02:00