github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-21 03:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,282 Commits 36 Branches 30 Tags
develop
Commit Graph

1536 Commits

Author SHA1 Message Date
Ian Bell
6afa3c1c92 Merge branch 'master' of https://github.com/CoolProp/CoolProp 2014-07-06 19:06:44 +02:00
Ian Bell
fd209a20d5 Some progress getting Octave working on OSX, still not working yet 2014-07-06 19:05:37 +02:00
Ian Bell
dd1020bdad Update docs.md 2014-07-06 17:17:48 +02:00
Ian Bell
935f86a8aa Added information about restarting master buildbot 2014-07-06 17:15:23 +02:00
Ian Bell
ef5d4b69cd docs for .bashrc for buildbot slave 2014-07-06 15:52:48 +02:00
Ian Bell
2aea84cac9 Update docs.md 2014-07-06 15:49:21 +02:00
Ian Bell
cc4eb53f1a Create docs for buildbot 2014-07-06 15:48:55 +02:00
Ian Bell
f4396afdcf Run find_package(Mono) twice again 2014-07-06 15:40:18 +02:00
Ian Bell
038b7a914e Better failure message for CMake if C# not installed 2014-07-06 15:17:13 +02:00
Ian Bell
22d7d0dcaa Fixed C# finders for OSX (and linux)? 2014-07-06 13:59:48 +02:00
Ian Bell
acac55d63c generate_headers.py prints error when JSON file cannot be loaded to localize problem 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-06 11:17:45 +02:00
Ian Bell
0f602c342a Merge branch 'master' of https://github.com/coolprop/coolprop 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-30 17:04:44 +02:00
Ian Bell
d251ff4cea Updated Code::Blocks project 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-30 16:53:18 +02:00
Ian Bell
748f5f64f5 Added some CMake docs 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-30 16:50:25 +02:00
jowr
8fbba41b46 More 2D fitting functions 2014-06-29 22:15:07 +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
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
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
daf40b4117 Merge branch 'master' into eigenPolynomials 2014-06-11 17:54:03 +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
501274215a properly load and save the hashes in file 2014-06-11 01:11:39 +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
e3282c8059 C# works on linux 2014-06-10 01:16:42 +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
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
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
Ian Bell
6b27b5675e Copy Catch header as part of build process 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-08 21:15:16 +02:00
Ian Bell
ec04f41ba4 Update README.rst 2014-06-08 20:39:09 +02:00
Ian Bell
a98041e506 Added README.rst for buildbot instructions 2014-06-08 20:37:16 +02:00
Ian Bell
e45bee6267 Updated code::blocks project 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 21:38:15 +02:00
jowr
f4be09df63 Finally, some luck with the Matrix classes... C++ lessons learned. 2014-06-06 18:39:33 +02:00
Ian Bell
356e0a6897 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-06 14:22:47 +02:00
Ian Bell
7896845a5d Added minimum saturation states to fluid files 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 10:01:09 +02:00
Ian Bell
88ec40895c Added triple point states 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 09:48:33 +02:00
Ian Bell
d5f9c0a382 critical state moved into STATES in json files 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 09:29:25 +02:00
jowr
132c9b602e More TTSE stuff 2014-06-05 13:21:53 +02:00
Ian Bell
81cea06746 JSON packaging is slightly improved - no injection every time; Build incompressible JSON library 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-05 11:14:31 +02:00
Ian Bell
eba0b9c0f0 Fixed typo in incompressible fluid files 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-05 11:11:35 +02:00
Ian Bell
869f9f183d Moved FindOctave.cmake 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 23:38:06 +02:00
Ian Bell
072f1eb9aa Fixed SF6 based on information from Marcia Huber 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 23:12:16 +02:00
Ian Bell
abc9aa872c Removed old Code::Blocks project 2014-06-03 22:24:27 +02:00
Ian Bell
51389300e6 Moved coolprop project file 2014-06-03 22:20:54 +02:00