github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 20:38:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
490 Commits 36 Branches 30 Tags
7133296b98e63de3678036612b8092002a6def51
Commit Graph

490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ian Bell
74449b5151 Reorganized MatrixMath.h header file 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-23 12:26:34 -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
jowr
6360e84a54 Added some new functions to handle volume fractions, hope this does not cause any trouble other places 2014-07-22 17:29:01 +02:00
Ian Bell
85c2e7954f Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-20 10:57:06 -04:00
Ian Bell
e79c5f5d14 Tidied up some transport tests 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-20 10:56:53 -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
Rod Persky
97804bdb6d Update .travis.yml 
Looking at using hipchat instead of emails for notifications, tested on personal branch. Benefits: if it works out then we can all get notifications without putting out email into Travis.yml
 2014-07-18 00:52:37 +10:00
jowr
6be83b1ad3 Tried pointers, but LiBr still does not work. Somnehow the object gets converted to the base class. 2014-07-17 16:34:35 +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
2db80a4c60 Fixed one bug with pseudo-pure saturation calls 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-12 16:39:31 -04:00
Ian Bell
3e4d431318 Fix REFPROP wrapper to allow use of pseudo-pure fluids 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-12 15:08:28 -04:00