Commit Graph

98 Commits

Author SHA1 Message Date
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
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
Ian Bell
4810f8256e REFPROP backend can calculate molar mass
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:10:52 +02:00
jowr
00e9ddf291 Added 2D function to JSON readers, fixed 2D polynomial fitting 2014-06-29 18:03:37 +02:00
jowr
de03057f48 Added the first incompressible test cases and it seems to work... 2014-06-23 17:34:37 +02:00
jowr
864df6d590 Double-checked entropy equations 2014-06-20 17:02:44 +02:00
jowr
daf40b4117 Merge branch 'master' into eigenPolynomials 2014-06-11 17:54:03 +02:00
Ian Bell
ca7fc30a58 Added saturation spline to the AbstractState and REFPROP interfaces
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-11 15:38:49 +02:00
Ian Bell
68d943c92a Updated reference for Heptane
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 15:24:00 +02:00
Ian Bell
b4791ed33a Implemented the viscosity correlation for n-Heptane of Assael, JPCRD, 2014 (http://scitation.aip.org/content/aip/journal/jpcrd/43/2/10.1063/1.4875930) and testing data
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 15:21:24 +02:00
jowr
1b4ebedc02 Merge branch 'master' into eigenPolynomials
Conflicts:
	CMakeLists.txt
2014-06-10 00:43:05 +02:00
Ian Bell
64946e6017 Added melting lines for many fluids - nearly all that are in REFPROP
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 15:48:52 +02:00
Ian Bell
b9582a45e1 Added structure of incompressible library and backend - the core is there, implementation is empty.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 21:22:48 +02:00
jowr
0dd5faa31a Fixed some incompressible build problems 2014-06-06 15:33:32 +02:00
Ian Bell
37549787af Fixed loading bugs of new JSON files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 14:13:08 +02:00
Ian Bell
6e287e9454 Update parsing of the fluid JSON files for the new state architecture
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 12:05:55 +02:00
Ian Bell
d545376efd Got Javascript wrapper working again - required changing all std::tr1::shared_ptr to shared_ptr
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 21:59:41 +02:00
Ian Bell
a82160c4bf Clean up shared_ptr mess
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 21:34:26 +02:00
Ian Bell
bffb36cc41 Merge branch 'master' of https://github.com/coolprop/coolprop
Conflicts:
	src/Helmholtz.cpp
	src/main.cxx

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 21:01:50 +02:00
Ian Bell
cb497b443c Added crossplatform_shared_ptr to allow shared_ptr cleanly on all architectures without needing variable namespace definition 2014-06-03 20:58:24 +02:00
Ian Bell
781fb5b47a Slight improvement in water critical conductivity term - all within 0.02% error now
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 18:52:54 +02:00
Ian Bell
5101ac01dd Implemented the Helium critical conductivity using REFPROP coefficients - relaxed tolerances on testing values due to uncertainty of origin of coefficients and other issues
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 16:31:28 +02:00
Ian Bell
71c8875df4 Added tests for the reference states for fluids in REFPROP
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 15:38:38 +02:00
Ian Bell
615c641530 Added asserts for the lengths of the residual HE vectors loaded
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 14:34:34 +02:00
Ian Bell
17bffeb91f Added failing tests for same reference state between REFPROP and Coolprop for enthalpy and entropy
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 12:54:57 +02:00
Ian Bell
bff7e2afeb PlanckEinstein and PlanckEinstein2 classes replaced with PlanckEinsteinGeneralized. Docs to follow.
Aly-Lee not yet removed.  Next step.

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-03 12:04:16 +02:00
Ian Bell
5accf645d9 IIR HS references set for real this time
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-02 13:21:06 +02:00
Ian Bell
409e2a2d1f Fluids using IIR reference state now all agree with REFPROP
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-02 13:03:17 +02:00
Ian Bell
261ec01c71 Added REFPROP names for all fluids - renovated get_fluid_param_string 2014-06-01 20:20:33 +02:00
Ian Bell
c468339768 Implemented test for GERG 2008 residual term and changed include from <tr1/memory> to <memory>
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-01 19:29:09 +02:00