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
230 Commits 36 Branches 30 Tags
e45bee6267c139ae93dd533bcdf0e4b34cee2e8d
Commit Graph

98 Commits

Author SHA1 Message Date
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
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
Ian Bell
d741df4e2d All fluid specific transport property correlations implemented - a few tests fail still, need to figure out why 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-27 18:30:30 +02:00
Ian Bell
bb4035467e Added ammonia conductivity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-27 11:49:46 +02:00
Ian Bell
c2a1fa7317 R23 conductivity hardcoded 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-27 10:00:28 +02:00
Ian Bell
f3f41cbcbc Water viscosity hardcoded implemented; Fixed reference for CO2 - need to double check all transport references 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-26 23:25:33 +02:00
Ian Bell
7a862f1a77 Air, nitrogen, oxygen and argon conductivity all are working 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-26 17:38:13 +02:00
Ian Bell
e143f05ee3 Ethane conductivity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-26 11:25:21 +02:00
Ian Bell
1281f52d8a Added R152A, R123, CO2 conductivity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-26 10:52:44 +02:00
Ian Bell
050ec56327 Added propane, dodecane, R1234yf and R1234ze(E) conductivity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 20:24:07 +02:00
Ian Bell
eba2f49e9c Added isobutane, n-butane conductivity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 19:11:35 +02:00
Ian Bell
40206185e7 Added octane nonane decane conductivity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 19:11:09 +02:00
Ian Bell
b845ccbae5 R125 conductivity - not exactly the same as REFPROP - why? But error with REFPROP max of 1.2% 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 17:57:51 +02:00
Ian Bell
ae20496fc1 Regenerated Benzene and n-Hexane JSON file 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 16:05:03 +02:00
Ian Bell
67c862bd0d Added hydrogen and parahydrogen conductivity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 16:04:35 +02:00
Ian Bell
5999c9d4f7 Benzene conductivity - still missing viscosity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 13:29:22 +02:00
Ian Bell
59e0eeed6d Implemented critical constants for Olchowy-Sengers 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 13:28:54 +02:00
Ian Bell
3f449ab890 Fixed typo in SF6 conductivity caused by typo in Assael paper 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 13:11:29 +02:00
Ian Bell
7d542997b1 Conductivity for Ethanol, SF6, Toluene and Heptane 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-23 20:05:24 +02:00