Commit Graph

296 Commits

Author SHA1 Message Date
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
Ian Bell
3127ace162 MATLAB works on windows - 32-bit and 64-bit
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-11 12:16:48 +02:00
Ian Bell
86e5b43839 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-11 10:52:39 +02:00
Ian Bell
747a1b3e2e updated shared_ptr header for OSX; Now Java and C# compile on OSX 2014-06-11 01:12:37 +02:00
Ian Bell
501274215a properly load and save the hashes in file 2014-06-11 01:11:39 +02:00
Ian Bell
c241c516c6 Added dependency on generate_headers to most of the wrappers 2014-06-11 01:10:08 +02:00
jowr
602e1f9829 More matrix math and eigen integration 2014-06-10 17:03:28 +02:00
Ian Bell
226dc8ed09 Added mass-based methods to python wrapper
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 15:56:21 +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
45e940204b Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-10 15:50:56 +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
ce5e41412e hashes.json file gets saved in the right place
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 15:24:40 +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
Ian Bell
e34cd9bd9f Added surface tension for fluids covered in Mulero, JPCRD, 2014 (http://scitation.aip.org/content/aip/journal/jpcrd/43/2/10.1063/1.4878755)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 14:42:22 +02:00
Ian Bell
9f857164fd Java works on linux 2014-06-10 12:34:37 +02:00
Ian Bell
066dcfc413 Java now works on windows
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 12:13:29 +02:00
Ian Bell
341ba11a24 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-10 11:31:56 +02:00
Ian Bell
4f1f53881f Preliminary CMake for Java
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 11:31:43 +02:00
Ian Bell
e3282c8059 C# works on linux 2014-06-10 01:16:42 +02:00
jowr
623662a4f7 polymath 2014-06-10 01:01:25 +02:00
Ian Bell
845427a268 C# "works" on windows - "works" meaning that it compiles, but some parts don't yet work properly. Example runs, but many failures
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 00:44:43 +02:00
jowr
1b4ebedc02 Merge branch 'master' into eigenPolynomials
Conflicts:
	CMakeLists.txt
2014-06-10 00:43:05 +02:00
Ian Bell
1d16cc14e1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-10 00:09:30 +02:00
Ian Bell
47486f81e0 Fixed creation of src folder for GCC builds
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-10 00:09:00 +02:00
jowr
7455a4145e polymath... 2014-06-10 00:00:41 +02:00
Ian Bell
db6e794dba Now octave works on xubuntu with main CMake file - have to mkdir src folder - not sure why. 2014-06-09 23:58:29 +02:00
Ian Bell
62e9a2d4de Octave wrapper works on windows with MINGW builds of Octave
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 23:46:43 +02:00
Ian Bell
895c1de278 CMake now working for 64-bit DLL 32-bit/cdecl DLL and 32-bit/stdcall DLL. Swig ones are next.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 21:08:04 +02:00
Ian Bell
a866ad88a3 EES DLF file can now build using CMake - works
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 19:50:10 +02:00
Ian Bell
1fd88a8087 Updated a few melting lines
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 18:44:10 +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
2b32a18e13 Updated .gitignore
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 22:40:17 +02:00
Ian Bell
3bfbecd6f8 Added IncompressibleFluid.h
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 21:31:47 +02:00
Ian Bell
8b43f59eae Fixed relative paths for copying Catch header
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-08 21:22:54 +02:00
Ian Bell
9d80e4aa37 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-08 21:16:08 +02:00