Commit Graph

126 Commits

Author SHA1 Message Date
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
f19aa35db4 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-01 17:11:59 +02:00
jowr
7fa70b0bee Fixed the mass fractions! 2014-08-01 16:52:16 +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
8ff8332e77 Added some reporting to Python. Untested changes in C++ 2014-08-01 15:13:48 +02:00
Ian Bell
90103b50e2 Added two-phase enthalpy and entropy calculations based on vapor quality weighting of saturation properties. Fixed some bugs associated with that.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 14:16:59 +02:00
Ian Bell
412504a4d9 When changing reference state, hs_anchor is updated, and ancillary curves still work!! woohoo
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 10:50:47 +02:00
Ian Bell
ea3ceeccfe H & S Ancillaries use value minus value at anchor state
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 10:34:13 +02:00
Ian Bell
99af971bcb Changed function return type for successive_substitution to make agree with others in that namespace
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 10:01:21 +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
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
3c9b02bba1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-25 11:06:58 -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
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
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
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
e946d84dec Incompressible library and backend work, still need to convert the coefficients from v4. 2014-07-16 13:18:45 +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
jowr
d867fb96ff ready to implement update and to connect backend to main routines... Set reference states is still missing. 2014-07-12 12:47:59 +02:00
jowr
9452926bd3 IncompressibleBackend passes all preliminary tests, update needs to be implemented. 2014-07-11 16:38:02 +02:00
jowr
c28012c00a Started implementing the solvers... Inheritance is a little unclear, wrote todo notes in the source. Added test object factories for consistent testing. 2014-07-11 13:06:43 +02:00
jowr
ed35139d8a Implement new, more general solvers for the polynomials. Added solvers for rho, c, u and s to the incompressibles. T as function of h is still missing, should got to the backend... 2014-07-10 13:25:17 +02:00
jowr
e486f3f78e minor changes 2014-07-10 00:15:57 +02:00
jowr
8e13547af3 Temperature check does not fail without coefficients 2014-07-09 21:42:38 +02:00
jowr
00f0672f0f Basic incompressible structure running. 2014-07-09 21:18:30 +02:00
jowr
b93c5ced68 Merge remote-tracking branch 'origin/eigenPolynomials' into eigenPolynomials 2014-07-09 18:18:43 +02:00
jowr
a57241bd62 Added checks and conversion functions 2014-07-09 18:18:02 +02:00
Ian Bell
f4764eb929 Incompressibles load and run! ExamplePure works.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-09 18:06:21 +02:00
Ian Bell
c678bdb11a Merge branch 'eigenPolynomials' of https://github.com/coolprop/coolprop into eigenPolynomials 2014-07-09 10:31:34 +02:00
Ian Bell
8e8be7c629 Updated incompressible files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-09 10:28:31 +02:00
jowr
10a7fa5a41 MatrixMath tests work 2014-07-09 10:14:40 +02:00
Ian Bell
4aa8c5ac61 Fixed incomp JSON files and added prototypes to incompressible backend
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-08 15:40:32 +02:00
jowr
77fa6d9887 Moving files around 2014-07-08 13:49:58 +02:00
Ian Bell
7157ae1ba2 Removed std::tr1 from REFPROP 2014-07-06 20:40:33 +02:00
Ian Bell
9202fbce4d Changes to mixture VLE code
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:17:32 +02:00
Ian Bell
fce105ec15 Fixed resizing bug with Excess HE
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:13:28 +02:00