github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 12:28:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,912 Commits 36 Branches 30 Tags
CMakeDevelopment
Commit Graph

715 Commits

Author SHA1 Message Date
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
Ian Bell
1bd5088dab Added Code::Blocks project 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 21:33:42 +02:00
Ian Bell
3ff3dc898a Relaxed viscosity at critical point to account for not using critical contribution to viscosity (same as in REFPROP) 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 16:58:28 +02:00
Ian Bell
13ba2cfc82 Updated reference states for a few fluids 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 15:37:56 +02:00
Ian Bell
daed4b862b NBP reference states are now set 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 12:27:30 +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
jowr
d0dcad755b Changed to R245fa, things start to look worse... 2014-06-02 17:14:08 +02:00
jowr
2c41fc6eb7 Cleaning the script 2014-06-02 17:14:08 +02:00
jowr
aa4889cc4a More graphs to determine the TTSE ranges 2014-06-02 17:14:07 +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
f830d93b33 Fixed CPO for HFE143m.json 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-02 11:42:02 +02:00
Ian Bell
261ec01c71 Added REFPROP names for all fluids - renovated get_fluid_param_string 2014-06-01 20:20:33 +02:00
Ian Bell
eef1f9d315 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-30 17:17:06 +02:00
Ian Bell
c63b0e95e2 Implemented conductivity for CO2 from Scalabrin. All CO2 tests pass now. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-30 15:16:32 +02:00
jowr
29ba6cf86f Added more plotting routines 2014-05-29 20:06:23 +02:00
Ian Bell
d023f1ed99 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-28 19:15:53 +02:00
Ian Bell
f93aa76210 ECS conductivity work - nearly works, just need to sort out the conformal state solver. 
Goodbye to AbstractStateWrapper - can use std::tr1::shared_ptr, much nicer

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-28 19:15:34 +02:00
jowr
4e12c4cdf4 Added TTSE scripts, just a starting point 2014-05-28 18:28:30 +02:00
Ian Bell
118d7e9ad2 Set critical parameters in the CoolPropFluid class 
Pre-processing of R124 viscosity is all working

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-28 14:34:48 +02:00
Ian Bell
cb15a00699 Added critical parameters for all fluids from CoolProp 4.2 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-28 13:07:35 +02:00
Ian Bell
3367b089fd First cut at adding code for ECS for viscosity. Starting with R124 2014-05-28 12:57:30 +02:00