Commit Graph

715 Commits

Author SHA1 Message Date
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
Ian Bell
ddc0fb6830 Conductivity tests pass now!
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-23 12:25:46 -04:00
Ian Bell
5bac73dd4d Now using the right set of coefficients for n-Butane residual conductivity since we use simplified crossover term
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-23 12:17:26 -04:00
jowr
82f5097b5b Prepared for adding SecCoolFluids as data files 2014-07-22 19:04:52 +02:00
Ian Bell
85c2e7954f Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-20 10:57:06 -04:00
Ian Bell
53611b2535 Corrected hydrogen viscosity as per discussion with Marcia
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-20 10:47:05 -04:00
jowr
46df4a6510 Added all pure fluids from Melinder's book, incompressible JSON files now check hashes before write, equation based fluids can be fitted as well 2014-07-18 12:40:48 +02:00
jowr
6696f84aab Added LiBr as a polynomial... 2014-07-17 18:50:05 +02:00
jowr
8e66da5d09 Added LiBr and some more fitting scripts 2014-07-17 15:27:40 +02:00
jowr
6409efbacc Pure incompressibles are integrated, tests are still pending. 2014-07-17 12:06:15 +02:00
jowr
2bb3e182e5 Fitting works, some tests do not pass. 2014-07-17 11:52:12 +02:00
jowr
e946d84dec Incompressible library and backend work, still need to convert the coefficients from v4. 2014-07-16 13:18:45 +02:00
jowr
8a888cdf9d Fitting works, still a little sensitive, but there was progress 2014-07-15 18:56:07 +02:00
jowr
a62048d9d8 Started to rework the python files to form a module 2014-07-15 16:41:38 +02:00
jowr
c4a9e399a0 Fitting works again, code needs some cleaning up. 2014-07-15 15:08:40 +02:00
jowr
f26cc22e64 Python, python 2014-07-14 18:04:32 +02:00
jowr
cd5873e24a Merge branch 'master' into eigenPolynomials 2014-07-14 17:01:51 +02:00
jowr
ee04ef05dc Many C++ things are done, working on the Python parts 2014-07-14 16:53:22 +02:00
jowr
79beb6fddc The incompressibles pass the first tests and concentration inputs are read properly 2014-07-14 14:54:09 +02:00
jowr
8dacd33d3b Still problems with the mass fractions 2014-07-13 22:07:33 +02:00
jowr
943eb86d2e Added some more tests and prepared the backend. Example fluids load properly, but there are some bugs. Calculations work, but give wrong results. 2014-07-13 21:04:11 +02:00
Ian Bell
c2a6650984 Fixed typo in Air.json in generalized Planck-Einstein term
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-12 12:29:05 -04:00