1536 Commits

Author SHA1 Message Date
Ian Bell
7a948f63d9 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-01 19:10:43 +02:00
Ian Bell
a30e5a0e9f Fixed typo in master.cfg 2014-08-01 19:06:11 +02:00
Ian Bell
088260f4dc Fixed typo in master.cfg 2014-08-01 19:05:18 +02:00
Ian Bell
4f12d140e8 Added MATLAB 32 bit builder, cleaned up master.cfg 2014-08-01 19:03:08 +02:00
Ian Bell
e37a55004b Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-01 18:53:38 +02:00
jowr
9470f35928 Removed the debug level added the incompressible documentation framework 2014-08-01 17:30:06 +02:00
Ian Bell
2d8f1fab5d Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-01 16:40:32 +02:00
jowr
8f43622439 Added the new JSON files 2014-08-01 16:40:19 +02:00
Ian Bell
d9fcb2eb00 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-01 16:38:47 +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
24d37e0e6d Added h and s to hs_anchor state
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 10:09:12 +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
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
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
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
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
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
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
jowr
867bc32c42 Added the Aspen Temper family, HYCOOL, ice slurries and CO2 are still missing 2014-07-25 19:09:50 +02:00
jowr
ace8d67e15 Added data for T66, added Freezium and TVP 1869 2014-07-25 19:09:49 +02:00
Ian Bell
eb30d38c2b Updated reference states for Ammonia, Argon, R14
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-25 12:47:00 -04:00
Ian Bell
7325305bdb Fix ref state for R123
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-25 12:15:37 -04:00
Ian Bell
3b56a84bfe Added R152A mBWR conversion from Outcalt
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-25 12:15:16 -04:00
Ian Bell
3c9b02bba1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-25 11:06:58 -04:00
Ian Bell
b1b21e351b Fixed bug in R11 EOS and changed reference state coefficients
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-25 11:04:50 -04:00
Ian Bell
23fdaf6cf9 Implemented EOS for R11 from Jacobsen 1992 (FEOS)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-25 09:15:37 -04:00
jowr
f294d3c5e3 Added all fluids from SecCoolFit (not SecCool), tests are apssing 2014-07-24 11:05:04 +02:00
Ian Bell
378eb2fcdc Added translated mBWR EOS for R123 - will do the same for the remaining fluids so that we have the same EOS
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-24 00:52:30 -04:00