Commit Graph

531 Commits

Author SHA1 Message Date
jowr
3b6173bf83 Updated externals 2014-08-01 16:42:13 +02:00
jowr
8f43622439 Added the new JSON files 2014-08-01 16:40:19 +02:00
jowr
165298d41e Renamed the enumeration and still no luck 2014-08-01 15:44:02 +02:00
jowr
eddeee54e0 Added more fitting stuff, still some problems with the enumerations in C++ 2014-08-01 15:15:35 +02:00
jowr
b8badfba2c fits, fits, fits 2014-08-01 15:13:48 +02:00
jowr
e8f0e2d11b Fixed temperature data sets, now everything is local in the incompressible object, fixed equation selection, exponential fit works, some polynomials have too high orders... 2014-08-01 15:13:48 +02:00
jowr
8ff8332e77 Added some reporting to Python. Untested changes in C++ 2014-08-01 15:13:48 +02:00
Ian Bell
0f392c3309 Update wrappers.rst 2014-08-01 09:54:00 +02:00
Ian Bell
fa2ec0ad9b Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-01 09:05:02 +02:00
Ian Bell
54bf7687b0 Updated ancillary curves for all fluids to use h-hanchor and s-sanchor in the fit
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 09:04:43 +02:00
Ian Bell
34228b16bd Added hs_anchor state for all fluids
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 08:44:29 +02:00
Ian Bell
ebee67ba77 Fixed reference state for R407F
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 08:41:41 +02:00
Ian Bell
94b6c0baed added configs for windows slaves 2014-08-01 01:00:31 +02:00
Ian Bell
0686a1c2de added configs for windows slaves 2014-08-01 00:59:18 +02:00
coolprop
791e42700f Updated MATLAB builder on windows 2014-07-31 15:49:08 -07:00
Ian Bell
6d6ce92f1a Updated MATLAB windows builder 2014-08-01 00:38:19 +02:00
Ian Bell
1b843750bf Updated MATLAB windows builder 2014-08-01 00:35:28 +02:00
Ian Bell
5f073b4d5f Updated MATLAB windows builder 2014-08-01 00:28:40 +02:00
Ian Bell
8e8a58c2f5 changed matlab windows builder 2014-08-01 00:23:38 +02:00
Ian Bell
9e5e012643 added windows builders 2014-08-01 00:09:51 +02:00
Ian Bell
f12d7c0def PH and PS for single phase basically works now, still need to determine guess values
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-31 22:07:08 +02:00
Ian Bell
9499056850 First cut at enthalpy and entropy saturation ancillaries - still need to make them deltas to a fixed known point
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-31 21:11:15 +02:00
Ian Bell
fc7eb55ca2 Added code for liquid enthalpy ancillary for Propane - proof of principle.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-31 19:39:24 +02:00
Ian Bell
33b5fe0e28 Added script to fit rational functions for enthalpy and entropy ancillaries
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-31 18:09:12 +02:00
Ian Bell
e7391bb60c Fixed include path for java on linux
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 23:34:52 +02:00
Ian Bell
01511f3c46 Trying again with MATLAB
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 23:24:16 +02:00
Ian Bell
4942987eea Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-30 23:21:58 +02:00
Ian Bell
945c016134 Fixed matlab building on linux hopefully
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 23:21:42 +02:00
Ian Bell
f34e0c9f06 Update docs.md 2014-07-30 22:50:48 +02:00
Ian Bell
fef8609697 Update docs.md 2014-07-30 22:39:29 +02:00
Ian Bell
2a14f3c0d0 Fixed case of install
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 21:11:04 +02:00
Ian Bell
1ac4672a56 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-30 20:49:52 +02:00
Ian Bell
e2e6da6e20 Fixed typo in master.cfg
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 20:49:40 +02:00
Ian Bell
a04ea9b4cd Fixed typo in master.cfg 2014-07-30 20:48:21 +02:00
Ian Bell
d36d79e542 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-30 20:46:16 +02:00
Ian Bell
226447bf76 Updated files to compile MATLAB wrapper on OSX and windows
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-30 20:45:51 +02:00
Ian Bell
0575f2f483 Modified CMake files to get MATLAB working on OSX 2014-07-30 18:05:08 +02:00
Ian Bell
36785a61da another php attempt
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-28 17:28:10 +02:00
Ian Bell
ca3693df29 php embedded
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-28 17:21:05 +02:00
Ian Bell
3e92097d04 link to php
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-28 17:06:35 +02:00
Ian Bell
bfdf4ba0b1 testing php
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-28 16:48:04 +02:00
Ian Bell
7133296b98 Fixed reference state for Air to agree with REFPROP, fixed reference state offsets for humid air
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-28 11:14:52 +02:00
Ian Bell
403ab174f9 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-28 10:49:47 +02:00
Ian Bell
db3515007b Fixed humid air properties to take into account reference state for air and water to close https://github.com/CoolProp/CoolProp/issues/47
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-28 10:49:24 +02:00
Ian Bell
2da87c2e48 Updated CMake for Octave to check more intelligently for libc++ 2014-07-28 00:03:35 +02:00
Ian Bell
fa25d1b4c0 Fixed CMake for for Octave 2014-07-27 23:33:38 +02:00
Ian Bell
5d3fa2761c Fixed JSON files (oops) - that's why we unit test
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-27 23:10:07 +02:00
Ian Bell
18aa853da0 Implemented psatmax and Tsatmax states for pseudo-pures to close https://github.com/CoolProp/CoolProp/issues/64
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-27 07:55:24 -04:00
Ian Bell
f5929ea5ca Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-25 23:46:21 -04:00
Ian Bell
1701f69e49 Fixed humid air errors with wet bulb
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-25 14:02:26 -04:00