github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
772 Commits 47 Branches 30 Tags
8bd4227f38cb677c391b2afea456576c6dfa2cad
Commit Graph

52 Commits

Author SHA1 Message Date
Ian Bell
8bd4227f38 Added T for phase determination p calculations 2014-08-10 21:02:15 +02:00
Ian Bell
86641af670 Fixed some errors with two-phase Trho inputs 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-10 20:38:59 +02:00
Ian Bell
c3cc696080 P,Y now works if P > pc 
Add supercritical_gas and supercritical_liquid phase flags for a bit finer granularity

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-09 15:10:09 +02:00
Ian Bell
801aa61485 Implemented psat_max and Tsat_max for pseudo-pure fluids to close https://github.com/CoolProp/CoolProp/issues/89 2014-08-09 12:17:44 +02:00
Ian Bell
faf530d588 Fixed melting curves, PY flash works for subcritical cases 2014-08-09 11:07:21 +02:00
Ian Bell
1aec75df85 PY subcrit superheated tests pass 
There was a typo in umass() function

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-08 11:26:35 +02:00
Ian Bell
a3bf8790a8 Added pmax_sat and Tmax_sat functions for for HEOS in order to help with saturation limits for flahses 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-07 13:30:44 +02:00
Ian Bell
a5bf52b52f Basic algorithm is working for P,Y for vapor - more checking needed, but basically works 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-07 01:50:09 +02:00
Ian Bell
138135f5b7 Added Tmin and Tmax 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-04 18:58:13 +02:00
Ian Bell
90103b50e2 Added two-phase enthalpy and entropy calculations based on vapor quality weighting of saturation properties. Fixed some bugs associated with that. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-01 14:16:59 +02:00
Ian Bell
412504a4d9 When changing reference state, hs_anchor is updated, and ancillary curves still work!! woohoo 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-01 10:50:47 +02:00
Ian Bell
ea3ceeccfe H & S Ancillaries use value minus value at anchor state 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-01 10:34:13 +02:00
Ian Bell
f12d7c0def PH and PS for single phase basically works now, still need to determine guess values 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-31 22:07:08 +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
9202fbce4d Changes to mixture VLE code 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-30 17:17:32 +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
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
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
d545376efd Got Javascript wrapper working again - required changing all std::tr1::shared_ptr to shared_ptr 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 21:59:41 +02:00
Ian Bell
cb497b443c Added crossplatform_shared_ptr to allow shared_ptr cleanly on all architectures without needing variable namespace definition 2014-06-03 20:58:24 +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
c468339768 Implemented test for GERG 2008 residual term and changed include from <tr1/memory> to <memory> 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-01 19:29:09 +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
Ian Bell
10aaae4649 Added tr1/memory include for linux compilation 2014-05-30 12:02:32 +02:00
Ian Bell
7b8606f323 No more deletes used anywhere in the codebase. Only std::tr1::shared_ptr are used. Should be portable solution. 
All tests run, no memory leaks according to VLD

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-28 19:45:04 +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
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
3c8eb8746b Started with conductivity - implemented n-Hexane 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-23 17:13:54 +02:00
Ian Bell
bc5c75d06b Ethane viscosity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-22 23:36:10 +02:00
Ian Bell
f29c329b8c R23 viscosity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-22 23:13:56 +02:00
Ian Bell
809ec14df2 Helium viscosity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-22 22:56:19 +02:00
Ian Bell
c135ca319b SF6 and H2S viscosity - still problems with H2S 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-22 22:03:31 +02:00
Ian Bell
f4980afd1d Friction theory and SF6 viscosity and tests 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-22 16:17:47 +02:00
Ian Bell
f084b843a3 n-Hexane viscosity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-22 14:53:26 +02:00
Ian Bell
f35336b9e5 Hydrogen viscosity 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-22 14:37:54 +02:00
Ian Bell
891af4d131 Water viscosity and moved viscosity specific values into the viscosity entry in JSON files 2014-05-22 11:18:48 +02:00
Ian bell
fe04964cbc R123 viscosity and powers of T dilute term 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-21 20:23:44 +02:00
Ian bell
646aa2f18f Added viscosity for CO2 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-21 14:12:15 +02:00
Ian bell
650ae3c5ed Implemented viscosity correlations (and tests) for Decane,Dodecane,Nonane,Octane,R125 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-21 10:49:01 +02:00
Ian bell
41dacf83c6 HEOS can call transport properties 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:39:04 +02:00
Ian bell
d9d75b9280 nocache version of the derivatives; proper destruction of the the SatL and SatV classes 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-15 22:30:08 +02:00