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
408 Commits 36 Branches 30 Tags
036179990f4f71a0ae4e91da0a3aeee62ff8a90e
Commit Graph

155 Commits

Author SHA1 Message Date
Ian Bell
61c614f183 Updated JSON files and Python files for incompressibles 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-08 16:43:12 +02:00
jowr
bbd14f24ff Merge branch 'master' into eigenPolynomials 2014-07-08 15:41:42 +02:00
Ian Bell
4aa8c5ac61 Fixed incomp JSON files and added prototypes to incompressible backend 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-08 15:40:32 +02:00
Ian Bell
55b7514736 Fix path for virtual environment 2014-07-08 13:58:15 +02:00
jowr
77fa6d9887 Moving files around 2014-07-08 13:49:58 +02:00
jowr
48515b98fd Fixed the coefficients!!!! A minus was missing. 2014-07-08 13:36:08 +02:00
Ian Bell
b08a241a56 Remove apidoc from buildbot 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-08 00:03:41 +02:00
Ian Bell
4d235727d4 Fixed indentation in buildbot master.cfg 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-07 23:18:52 +02:00
Ian Bell
e1a93f5f6f Updated buildbot to build docs using sphinx 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-07 23:14:59 +02:00
Ian Bell
5d06cfa7a5 Fixed JSON file 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-07 21:52:57 +02:00
jowr
fb9421f6d0 Added some basic checks, still need to make sure that rows and columns are valid 2014-07-07 17:37:38 +02:00
jowr
f5a6cc4ef5 Merge branch 'master' into eigenPolynomials 2014-07-07 12:35:50 +02:00
jowr
d3ae8ead88 JSON string formatting, renamed example files 2014-07-07 12:27:14 +02:00
jowr
99e08bf252 Added conversion function for Melinder solutions 2014-07-07 12:11:46 +02:00
Ian Bell
8d3c49b692 Fixed buildbot master.cfg 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-07 00:50:45 +02:00
Ian Bell
054d5418ae moved buildbot authentication out of the master.cfg into private module 2014-07-07 00:27:55 +02:00
Ian Bell
7aa7ea13c2 Updated buildbot docs 2014-07-06 21:11:57 +02:00
Ian Bell
00a5e9f972 Add master.cfg for buildbot - nearly functional 2014-07-06 21:09:09 +02:00
Ian Bell
7d0bf500d4 Update where to start slave 2014-07-06 19:20:04 +02:00
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