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

..

rapidjson

Added 2D function to JSON readers, fixed 2D polynomial fitting

2014-06-29 18:03:37 +02:00

AbstractState.h

Added saturation spline to the AbstractState and REFPROP interfaces

2014-06-11 15:38:49 +02:00

CachedElement.h

Initial commit for v5, but this time with the right line endings

2014-05-14 12:46:24 +02:00

CoolProp.h

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

CoolPropFluid.h

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

2014-06-10 15:21:24 +02:00

CoolPropLib.h

Updated the F77 wrapper functions in the DLL

2014-06-26 01:04:58 +02:00

CoolPropTools.h

Merge branch 'master' into eigenPolynomials

2014-06-29 18:26:06 +02:00

crossplatform_shared_ptr.h

updated shared_ptr header for OSX; Now Java and C# compile on OSX

2014-06-11 01:12:37 +02:00

DataStructures.h

Initial commit for v5, but this time with the right line endings

2014-05-14 12:46:24 +02:00

Exceptions.h

Initial commit for v5, but this time with the right line endings

2014-05-14 12:46:24 +02:00

Helmholtz.h

Fixed bug in Aly-Lee extend function (skipped new elements)

2014-06-03 15:36:59 +02:00

HumidAirProp.h

Initial commit for v5, but this time with the right line endings

2014-05-14 12:46:24 +02:00

Ice.h

Initial commit for v5, but this time with the right line endings

2014-05-14 12:46:24 +02:00

IncompressibleFluid.h

Added 2D function to JSON readers, fixed 2D polynomial fitting

2014-06-29 18:03:37 +02:00

MatrixMath.h

Started to work on flexible polynomial solvers for fractional exponents

2014-06-13 13:56:08 +02:00

PlatformDetermination.h

More reliable platform determination

2014-06-03 20:25:49 +02:00

PolyMath.h

Double-checked entropy equations

2014-06-20 17:02:44 +02:00

Solvers.h

Initial commit for v5, but this time with the right line endings

2014-05-14 12:46:24 +02:00

SpeedTest.h

Updated speed test (does it work? not sure)

2014-05-15 22:26:22 +02:00

Tests.h

Initial commit for v5, but this time with the right line endings

2014-05-14 12:46:24 +02:00