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
198 Commits 36 Branches 30 Tags
a069e68720f98250093eaed16cd6acb04113d471
Commit Graph

57 Commits

Author SHA1 Message Date
Ian Bell
5101ac01dd Implemented the Helium critical conductivity using REFPROP coefficients - relaxed tolerances on testing values due to uncertainty of origin of coefficients and other issues 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 16:31:28 +02:00
Ian Bell
71c8875df4 Added tests for the reference states for fluids in REFPROP 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 15:38:38 +02:00
Ian Bell
615c641530 Added asserts for the lengths of the residual HE vectors loaded 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 14:34:34 +02:00
Ian Bell
17bffeb91f Added failing tests for same reference state between REFPROP and Coolprop for enthalpy and entropy 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 12:54:57 +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
261ec01c71 Added REFPROP names for all fluids - renovated get_fluid_param_string 2014-06-01 20:20:33 +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
b3c2c03192 Fixed water viscosity critical term - all but one test passes for water critical region 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-26 23:55:12 +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
fee23cab03 Can return BibTeX keys for fluid as before. Testing needed for all exposed functions. Maybe wrap into getter/setter for fluid parameters. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 21:27:11 +02:00
Ian Bell
0f02f8cb21 Read CP0 and EOS BibTeX keys from JSON files 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 21:21:40 +02:00
Ian Bell
ba8afe5e7f Added treatment of Olchowy-Sengers critical region term 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 13:30:49 +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
5eb527e730 REFPROP backend can handle pseudo-pure fluids 2014-05-22 22:01:03 +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
a687d5b673 n-Propane viscosity fully loaded from JSON file - just need to implement the rest of fluids 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-21 00:51:59 +02:00
Ian bell
04db9963f0 n-Propane viscosity can mostly be read from JSON, all that remains is the higher order terms, some thinking remains on that front 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 16:27:23 +02:00
Ian bell
f12c749914 Updated paths to CoolPropFluid.h 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 16:25:56 +02:00
Ian bell
82a52554b9 Moved CoolPropFluid.h into include, removed CoolPropFluid.cpp. Started adding structure for viscosity and conductivity inputs. 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-20 16:25:09 +02:00
Ian bell
237a078c4d Fixed incompressible include path 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:40:13 +02:00
Ian bell
1b9ce4b503 Load transport properties (default values for now) 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:39:44 +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
69f76386b1 More work on transport properties. Hardcoded propane values for now. Also implemented tests for viscosity 
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
 2014-05-19 22:38:33 +02:00
Ian bell
de78977e76 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-18 22:09:42 +02:00
Ian bell
23e846e38e Baby steps towards transport properties. 2014-05-18 22:09:29 +02:00