github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-23 04:47:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
366 Commits 36 Branches 30 Tags
fa3fe63c4452cd850fc75fb60cf70b9fa79ab47c
Commit Graph

100 Commits

Author SHA1 Message Date
Ian Bell
7d9c0bffdf Fixed Eigen include in CMake and moved num_rows and num_cols to placate gcc 2014-07-06 11:31:19 +02:00
Ian Bell
54d3b45584 Resort Helmholtz.h 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-30 17:08:39 +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
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
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
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
747a1b3e2e updated shared_ptr header for OSX; Now Java and C# compile on OSX 2014-06-11 01:12:37 +02:00
jowr
602e1f9829 More matrix math and eigen integration 2014-06-10 17:03:28 +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
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
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
3bfbecd6f8 Added IncompressibleFluid.h 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-08 21:31:47 +02:00
jowr
44f7288944 A little bit on polynomials 2014-06-07 12:28:53 +02:00
jowr
f4be09df63 Finally, some luck with the Matrix classes... C++ lessons learned. 2014-06-06 18:39:33 +02:00
jowr
2e615f1434 Starting to write tests 2014-06-06 15:28:12 +02:00
jowr
636df0ec82 Converters seem to work 2014-06-06 14:26:47 +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
jowr
183c93ac3c More testing, changed vector to string functions 2014-06-06 01:03:35 +02:00
jowr
bdf92d95a9 const madness 2014-06-05 18:08:21 +02:00
Ian Bell
a45765ae8f Fixed to shared_ptr header 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 22:02:51 +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
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
a7363b067c Merge remote-tracking branch 'origin/master' 2014-06-03 20:28:48 +02:00
Ian Bell
5e288cb8bf More reliable platform determination 2014-06-03 20:25:49 +02:00
Ian Bell
cf3158fa06 Fixed bug in Aly-Lee extend function (skipped new elements) 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 15:36:59 +02:00
Ian Bell
44a97e9fcb Added docs for conversion of PlankEinstein and PlanckEinstein2 forms to generalized form 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 12:25:24 +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
61b2f28c0b Added mass-based high-level functions for h,s,u, etc. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-02 09:59:18 +02:00
Ian Bell
d537899bf0 Docs for factory function 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-01 21:59:43 +02:00