github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 20:38:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
812 Commits 36 Branches 30 Tags
21f18bf10443fd8564b06f83cd985b336e71cddc
Commit Graph

97 Commits

Author SHA1 Message Date
Ian Bell
c632e823ac Updated triple point states - a bit more work to once Ts(ps) works at low pressure without NR 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-12 21:13:59 +02:00
Ian Bell
12f1cc6b86 Updated fluid files with most of the triple point densities 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-12 20:57:18 +02:00
Ian Bell
8f66b729c0 Fluid hs_anchor states updated to agree with CoolProp v5 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-12 18:42:09 +02:00
Ian Bell
5726d38975 Bump up max temps for melting lines to make them valid up to the maximum pressure of EOS 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-12 12:02:56 +02:00
Ian Bell
36d601490f Lots more work on melting curves, can now make pretty phase diagram for water including the melting line 2014-08-10 19:28:04 +02:00
Ian Bell
faf530d588 Fixed melting curves, PY flash works for subcritical cases 2014-08-09 11:07:21 +02:00
Ian Bell
74a62aa78a Added new EOS for R245fa from Akasaka, Zhou and Lemmon 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-09 10:54:40 +02:00
Ian Bell
a9b8f9f39f "Fixed" R1234ze(E).json by taking EOS from REFPROP 9.1 with permission 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-05 00:06:06 +02:00
Ian Bell
24d37e0e6d Added h and s to hs_anchor state 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-01 10:09:12 +02:00
Ian Bell
54bf7687b0 Updated ancillary curves for all fluids to use h-hanchor and s-sanchor in the fit 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-01 09:04:43 +02:00
Ian Bell
34228b16bd Added hs_anchor state for all fluids 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-01 08:44:29 +02:00
Ian Bell
ebee67ba77 Fixed reference state for R407F 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-01 08:41:41 +02:00
Ian Bell
9499056850 First cut at enthalpy and entropy saturation ancillaries - still need to make them deltas to a fixed known point 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-31 21:11:15 +02:00
Ian Bell
fc7eb55ca2 Added code for liquid enthalpy ancillary for Propane - proof of principle. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-31 19:39:24 +02:00
Ian Bell
7133296b98 Fixed reference state for Air to agree with REFPROP, fixed reference state offsets for humid air 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-28 11:14:52 +02:00
Ian Bell
5d3fa2761c Fixed JSON files (oops) - that's why we unit test 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-27 23:10:07 +02:00
Ian Bell
18aa853da0 Implemented psatmax and Tsatmax states for pseudo-pures to close https://github.com/CoolProp/CoolProp/issues/64 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-27 07:55:24 -04:00
Ian Bell
eb30d38c2b Updated reference states for Ammonia, Argon, R14 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-25 12:47:00 -04:00
Ian Bell
7325305bdb Fix ref state for R123 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-25 12:15:37 -04:00
Ian Bell
3b56a84bfe Added R152A mBWR conversion from Outcalt 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-25 12:15:16 -04:00
Ian Bell
b1b21e351b Fixed bug in R11 EOS and changed reference state coefficients 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-25 11:04:50 -04:00
Ian Bell
23fdaf6cf9 Implemented EOS for R11 from Jacobsen 1992 (FEOS) 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-25 09:15:37 -04:00
Ian Bell
378eb2fcdc Added translated mBWR EOS for R123 - will do the same for the remaining fluids so that we have the same EOS 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-24 00:52:30 -04:00
Ian Bell
ddc0fb6830 Conductivity tests pass now! 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-23 12:25:46 -04:00
Ian Bell
5bac73dd4d Now using the right set of coefficients for n-Butane residual conductivity since we use simplified crossover term 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-23 12:17:26 -04:00
Ian Bell
53611b2535 Corrected hydrogen viscosity as per discussion with Marcia 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-20 10:47:05 -04:00
Ian Bell
c2a6650984 Fixed typo in Air.json in generalized Planck-Einstein term 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-12 12:29:05 -04: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
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
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
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
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
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
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
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
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
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
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