Commit Graph

175 Commits

Author SHA1 Message Date
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
jowr
623662a4f7 polymath 2014-06-10 01:01:25 +02:00
jowr
1b4ebedc02 Merge branch 'master' into eigenPolynomials
Conflicts:
	CMakeLists.txt
2014-06-10 00:43:05 +02:00
jowr
7455a4145e polymath... 2014-06-10 00:00:41 +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
jowr
44f7288944 A little bit on polynomials 2014-06-07 12:28:53 +02:00
jowr
42e6f941ba Changed the main method for tests 2014-06-07 10:39:03 +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
Ian Bell
9093f636b1 speed of sound added back to high level wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 21:21:12 +02:00
Ian Bell
50ca26842e Decreased step size in numerical derivative for Helmholtz tester
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 21:19:42 +02:00
Ian Bell
514e406eea Fixed dDelta3 for Gaussian Helmholtz term (70 tests fail)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 19:05:13 +02:00
Ian Bell
da7b9c7793 docs for dTau3 derivation from Lemmon2005
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 18:54:35 +02:00
Ian Bell
69c21800bb Fixed derivatives for Lemmon2005
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 18:51:39 +02:00
jowr
f4be09df63 Finally, some luck with the Matrix classes... C++ lessons learned. 2014-06-06 18:39:33 +02:00
jowr
c2b06e301c Tests work again 2014-06-06 16:21:47 +02:00
jowr
0dd5faa31a Fixed some incompressible build problems 2014-06-06 15:33:32 +02:00
jowr
0d845cf966 moved tests to catch 2014-06-06 15:29:41 +02:00
jowr
2e615f1434 Starting to write tests 2014-06-06 15:28:12 +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
jowr
893785fe95 More matrix conversions 2014-06-06 14:07:57 +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