Commit Graph

195 Commits

Author SHA1 Message Date
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
jowr
bbd14f24ff Merge branch 'master' into eigenPolynomials 2014-07-08 15:41:42 +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
817510b29e Exported get_parameter_information_string in DLL
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 21:03:18 +02:00
Ian Bell
1fde42f562 Added missing parameters to DataStructures.cpp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 21:02:13 +02:00
Ian Bell
a75dbefd7b Fixed bug with get_csv_parameter_list
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 20:25:16 +02:00
Ian Bell
67d85f72e1 Added csv parameter listing to get_global_parameter
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-07 20:08:51 +02:00
Ian Bell
43c248c0bc Added back test_main.cpp, renamed to test_main.cxx so it won't be found by *.cpp globbing
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-06 23:35:53 +02:00
Ian Bell
fa3fe63c44 Removed references to std::tr1 2014-07-06 20:53:15 +02:00
Ian Bell
7157ae1ba2 Removed std::tr1 from REFPROP 2014-07-06 20:40:33 +02:00
Ian Bell
ae6515030d Removed std::tr1 from AbstractState 2014-07-06 20:37:35 +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
e2a595cbe4 Updates to main.cxx
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:14:12 +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
Ian Bell
3d3cf9dea6 Additional error checking and debugging in Solvers 2014-06-30 17:10:08 +02:00
Ian Bell
cac20d47e2 Updated MatrixMath.cpp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-30 17:09:41 +02:00
jowr
3b02f98879 Merge branch 'master' into eigenPolynomials
Conflicts:
	externals/eigen
	include/MatrixMath.h
	include/PolyMath.h
	src/Backends/Helmholtz/Fluids/Incompressible.cpp
	src/Backends/Helmholtz/Fluids/Incompressible.h
	src/PolyMath.cpp
2014-06-29 18:26:06 +02:00
jowr
00e9ddf291 Added 2D function to JSON readers, fixed 2D polynomial fitting 2014-06-29 18:03:37 +02:00
Ian Bell
5ee6627f65 Updated the F77 wrapper functions in the DLL
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-26 01:04:58 +02:00
jowr
fb5c56a937 Incompressibles passed all tests 2014-06-24 16:55:02 +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
c7a28152ad Ready to merge to incompressibles 2014-06-20 10:26:20 +02:00
jowr
7eeacea301 Fraction class is tested and behaves properly, implementing centered polynomials 2014-06-19 14:38:15 +02:00
jowr
524a2fff29 Solvers for frac classes work 2014-06-19 13:47:20 +02:00
jowr
9ef8a86f04 Added fraction class 2014-06-19 11:03:50 +02:00
jowr
be8a6779de It starts to get messy again. 2014-06-16 17:12:59 +02:00
jowr
b7a6c88e0b Added frac integral 2014-06-16 17:07:20 +02:00
jowr
4e2aa1c404 Started to work on flexible polynomial solvers for fractional exponents 2014-06-13 13:56:08 +02:00
jowr
4a02014439 Added the Nerwton solver to the Polynomial classes 2014-06-12 08:27:49 +02:00
jowr
1ccceeb7a5 Added a bounded Brent solver to Polynomial2D 2014-06-11 19:27:07 +02:00
jowr
daf40b4117 Merge branch 'master' into eigenPolynomials 2014-06-11 17:54:03 +02:00
jowr
e2eee9a1df Added solver and derivative functions, tested and works. Might need to implement our own solvers. Now way of telling Eigen not to find all roots. We know the bounds in most cases... 2014-06-11 17:52:56 +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
jowr
669195f654 Added more PolyMath functions and tests, integration and derivation seems to work. 2014-06-11 13:26:35 +02:00
jowr
602e1f9829 More matrix math and eigen integration 2014-06-10 17:03:28 +02:00
Ian Bell
85ce0bb199 typo
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 15:55:11 +02:00
Ian Bell
6ce2b4426f Small modifications to the conductivity of Heptane
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 15:50:30 +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