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
166 Commits 36 Branches 30 Tags
eef1f9d3159061fa8f380d2faeda1fedaf07b5b6
Commit Graph

166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9e72f88d7d Merge remote-tracking branch 'origin/master' 2014-05-30 12:03:13 +02:00
Ian Bell
10aaae4649 Added tr1/memory include for linux compilation 2014-05-30 12:02:32 +02:00
Ian Bell
9ac42beb4c Update README.rst 2014-05-30 11:36:17 +02:00
Ian Bell
b5f0227392 Update README.rst 
Instructions for how to get VxWorks PPC cross-compiler
 2014-05-30 11:35:16 +02:00
jowr
29ba6cf86f Added more plotting routines 2014-05-29 20:06:23 +02:00
Ian Bell
43255cfd5f Docs for abstract state 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-28 19:55:05 +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
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
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
ab257ec8fe Error if surface tension curves not provided for the fluid; Added keys for EOS and CP0 for the fluid 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 21:21:02 +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
eddbfc0ec1 When building DLL, apply the COOLPROP_LIB macro to export the functions to the DLL 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 19:12:31 +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
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
cb94a3622d Updated Doxygen file for new version of Doxygen 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-24 16:06:10 +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
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
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
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
Ian Bell
dbac65da89 Added docs to AbstractState 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-23 17:13:07 +02:00
Ian Bell
1423afa815 Added note to BibTex for Ammonia 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-23 17:12:31 +02:00
Ian Bell
ea4670c252 Ammonia viscosity and tests 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-23 10:29:19 +02:00
Ian Bell
6ec5574b76 Added remaining tests for viscosity - only a few do not pass 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-05-22 23:52:04 +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