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
814 Commits 47 Branches 30 Tags
acd7f98b74b1d02575d2762388e3620a3c79320f
Commit Graph

82 Commits

Author SHA1 Message Date
Ian Bell
b7bd58d986 More work on flash routines, number of failures is rapidly decreasing - still have problems for low pressure sat_p calcs 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-12 11:21:12 +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
5ee295f639 cleaned up whitespace 2014-08-09 15:12:31 +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
ba8c97d925 Added test for supercritical PY - not passing currently 2014-08-09 12:41:57 +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
53c363990f Added tests for P,Y inputs, though the solvers are not done yet 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-07 12:05:22 +02:00
jowr
4f9df69c96 No problems compiling and running the tests... 2014-08-04 17:14:35 +02:00
Ian Bell
a2f45e29da Added functionality for trivial outputs 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-03 18:55:52 +02:00
Ian Bell
d9fcb2eb00 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-08-01 16:38:47 +02:00
jowr
165298d41e Renamed the enumeration and still no luck 2014-08-01 15:44:02 +02:00
jowr
8ff8332e77 Added some reporting to Python. Untested changes in C++ 2014-08-01 15:13:48 +02:00
Ian Bell
0cbf72e05a Added preliminary tests for saturation properties 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-08-01 14:14:56 +02:00
Ian Bell
3c9b02bba1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-25 11:06:58 -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
jowr
6360e84a54 Added some new functions to handle volume fractions, hope this does not cause any trouble other places 2014-07-22 17:29:01 +02:00
Ian Bell
85c2e7954f Merge branch 'master' of https://github.com/coolprop/coolprop 2014-07-20 10:57:06 -04:00
Ian Bell
e79c5f5d14 Tidied up some transport tests 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-20 10:56:53 -04:00
jowr
e946d84dec Incompressible library and backend work, still need to convert the coefficients from v4. 2014-07-16 13:18:45 +02:00
jowr
cd5873e24a Merge branch 'master' into eigenPolynomials 2014-07-14 17:01:51 +02:00
Ian Bell
5779317fc6 Fixed the H2S tests based on validation data from Sergio 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-12 10:47:50 -04:00
jowr
c28012c00a Started implementing the solvers... Inheritance is a little unclear, wrote todo notes in the source. Added test object factories for consistent testing. 2014-07-11 13:06:43 +02:00
Ian Bell
43c248c0bc Added back test_main.cpp, renamed to test_main.cxx so it won't be found by *.cpp globbing 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-07-06 23:35:53 +02:00
Ian Bell
fa3fe63c44 Removed references to std::tr1 2014-07-06 20:53:15 +02:00
Ian Bell
85ce0bb199 typo 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
 2014-06-10 15:55:11 +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
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
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
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
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
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
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
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
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
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
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