github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 12:28:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
517 Commits 36 Branches 30 Tags
791e42700f2fe539f15434238dfd11cbb4ee79d4
Commit Graph

517 Commits

This Branch
This Branch
All Branches
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
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
Ian Bell
06c098eced Added mBWR conversion iPython notebook 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-25 13:24:56 -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
dc75fa8fea Fixed typo in CoolProp.cpp 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-25 11:06:28 -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
Ian Bell
7f79298796 Added Akasaka paper and journal names are now all abbreviated 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-24 18:46:29 -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
ff8a364a89 Fix condition to check for enthalpies being the same 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-23 12:27:31 -04:00