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
207 Commits 36 Branches 30 Tags
a82160c4bf6b59523c13fbb9d6f1684135fdaa01
Commit Graph

121 Commits

Author SHA1 Message Date
Ian Bell
a82160c4bf Clean up shared_ptr mess 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 21:34:26 +02:00
Ian Bell
bffb36cc41 Merge branch 'master' of https://github.com/coolprop/coolprop 
Conflicts:
	src/Helmholtz.cpp
	src/main.cxx

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 21:01:50 +02:00
Ian Bell
aa76065f5a Updated coefficient for transport correlations, HS reference code in main.cxx 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 20:59:55 +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
781fb5b47a Slight improvement in water critical conductivity term - all within 0.02% error now 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 18:52:54 +02:00
Ian Bell
331690de8c Water viscosity can now be evaluated at the critical point 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 17:49:23 +02:00
Ian Bell
a069e68720 Fixed limit for R123 conductivity validation 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 17:01:51 +02:00
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
6e7cf60aee Fixed bug in Helmholtz energy Lemon2005 term (was using integer powers rather than the correct power) 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-03 14:32:02 +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
b78439b72c Added passing tests for generalized PE term 2014-06-03 12:54:26 +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
61b2f28c0b Added mass-based high-level functions for h,s,u, etc. 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-02 09:59:18 +02:00
Ian Bell
06066c52f0 Reference state can now be set to one of IIR, ASHRAE, NBP or RESET. Still need to allow for default reference state values to agree with REFPROP. 
Docs updated.

Still need to implement setting state based on numerical values.

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-01 21:43:25 +02:00
Ian Bell
02f24549e4 Docs for get_fluid_param_string 2014-06-01 20:49:50 +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
3168f15efc Implemented dDelta3; test passes 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-01 19:46:30 +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
fdd329fb7b main.cxx update 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-30 17:15:33 +02:00
Ian Bell
873eab5baa Helmholtz derivative testing gives almost 100% coverage - missing HS offset term 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-30 17:13:23 +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
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
e98f3b6945 "V" and "L" are again supported in PropsSI as input 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 19:12:04 +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
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
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
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
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
83994c1de5 added visc and cond to keyed_output 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-23 17:13:29 +02:00