Commit Graph

43 Commits

Author SHA1 Message Date
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
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
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
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
3d9a99733d HFC pseudo-pure mixtures viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 22:02: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
33f5af0033 Ethanol viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 10:14:37 +02:00
Ian Bell
dd3b30d758 Disabling known failing tests
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-22 00:32:45 +02:00
Ian bell
52c684a3bd R152A viscosity
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 21:19:57 +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
d8aaa2d2cf DimethylEther viscosity
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 17:45:29 +02:00
Ian bell
d1da1fee27 Added R134a viscosity and tests based on REFPROP data
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 17:09:49 +02:00
Ian bell
b25b4e31d3 Added Nitrogen,Argon,Oxygen,Air viscosity
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 16:19:10 +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
d3fef2ff31 Added viscosity validation data for water
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-21 01:24:00 +02:00
Ian bell
a98d9fda71 Switched viscosity to HEOS - but why do we get segfault when using REFPROP?
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-20 14:03:27 +02:00
Ian bell
c18e0801c9 More viscosity validation data
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-20 00:09:26 +02:00
Ian bell
54d1e98e75 Added some more validation data for viscosity
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-19 23:43:36 +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
jowr
47bb064717 Playing with CMake... 2014-05-16 13:47:49 +02:00
Ian bell
b3847c7522 Initial commit for v5, but this time with the right line endings
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-14 12:46:24 +02:00