github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-08 21:05:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
264 Commits 36 Branches 30 Tags
86e5b43839c325eb032888fb505ac8d3973a583e
Commit Graph

264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ian Bell
341ba11a24 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-10 11:31:56 +02:00
Ian Bell
4f1f53881f Preliminary CMake for Java 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-10 11:31:43 +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
Ian Bell
1d16cc14e1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-10 00:09:30 +02:00
Ian Bell
47486f81e0 Fixed creation of src folder for GCC builds 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-10 00:09:00 +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
62e9a2d4de Octave wrapper works on windows with MINGW builds of Octave 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-09 23:46:43 +02:00
Ian Bell
895c1de278 CMake now working for 64-bit DLL 32-bit/cdecl DLL and 32-bit/stdcall DLL. Swig ones are next. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-09 21:08:04 +02:00
Ian Bell
a866ad88a3 EES DLF file can now build using CMake - works 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-09 19:50:10 +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
2b32a18e13 Updated .gitignore 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-08 22:40:17 +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
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
b5c447ed6b Updated web stuff 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 21:46:25 +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
Ian Bell
b9582a45e1 Added structure of incompressible library and backend - the core is there, implementation is empty. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 21:22:48 +02:00
Ian Bell
9093f636b1 speed of sound added back to high level wrapper 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 21:21:12 +02:00
Ian Bell
50ca26842e Decreased step size in numerical derivative for Helmholtz tester 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 21:19:42 +02:00
Ian Bell
514e406eea Fixed dDelta3 for Gaussian Helmholtz term (70 tests fail) 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 19:05:13 +02:00
Ian Bell
da7b9c7793 docs for dTau3 derivation from Lemmon2005 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 18:54:35 +02:00
Ian Bell
69c21800bb Fixed derivatives for Lemmon2005 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 18:51:39 +02:00
Ian Bell
356e0a6897 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-06-06 14:22:47 +02:00
Ian Bell
9ed1fdadb7 Updated web files 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-06 14:22:39 +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
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
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