github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-08 12:55:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
315 Commits 36 Branches 30 Tags
3b02f98879e3ea211589a4b237bc00e7c43cfef9
Commit Graph

315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jorrit Wronski
134297644a Update CMakeLists.txt 
Added Eigen folder
 2014-06-29 18:19:51 +02:00
jowr
00e9ddf291 Added 2D function to JSON readers, fixed 2D polynomial fitting 2014-06-29 18:03:37 +02:00
Ian Bell
2468bc1b08 Added simple example for cross compiling for compact rio - needs the VxWorks cross compiler, see README 2014-06-27 02:07:45 +02:00
Ian Bell
02e6a70aa3 Updated FORTRAN 77 wrapper - works at a rudimentary level, just need to re-enable other functions 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-26 01:50:20 +02:00
Ian Bell
01cf51b979 Updated Catch submodule 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-26 01:33:22 +02:00
Ian Bell
62448d8357 Uppercase eigen external folder 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-26 01:30:48 +02:00
Ian Bell
de6cfd670e Changed verbosity of header generation 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-26 01:28:43 +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
Ian Bell
cd9009e91f Combined several scripts into generate_headers.py 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-26 01:00:26 +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
Ian Bell
1ee68e7a28 CoolPropTools.h 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-21 00:00:40 +02:00
Ian Bell
35ec080139 CoolPropTools.h 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-20 23:58:58 +02:00
jowr
864df6d590 Double-checked entropy equations 2014-06-20 17:02:44 +02:00
Ian Bell
032826e70f Updated FORTRAN wrapper docs 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-20 13:39:36 +02:00
Ian Bell
5c5e077a66 Added COOLPROP_LIB and CONVENTION=__cdecl to static library. Will only impact c-style exports, so should be safe. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-20 13:06:39 +02:00
Ian Bell
5197b469b2 Updated docs for FORTRAN example, tidied up example. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-20 13:05:28 +02:00
Ian Bell
d87ef29780 Added modular FORTRAN wrapper files using ISO_C_BINDING 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-20 12:58:33 +02:00
Ian Bell
315806d9f7 Detailed example working with gfortran/g++ mixed compilation, but without module 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-20 12:40:35 +02:00
Ian Bell
96c216110d Added simple example for mixed-mode FORTRAN/c++ compilation - works 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-20 11:56:35 +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