Commit Graph

31 Commits

Author SHA1 Message Date
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
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
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
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
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
2d17cc53ab Renamed CoolPropDLL to CoolPropLib
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-20 22:55:41 +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
79ceae2f5c Diabled copy ctor for now for AbstractStateWrapper class until we figure out how to handle ownership and copying
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-20 13:57:28 +02:00
Ian bell
43904c3cac AbstractStateWrapper now checks whether AbstractState has been instantiated; HumidAirProp instantiation moved to function that is called by all exposed functions
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-20 12:52:26 +02:00
Ian bell
185a216364 Fixed PolyMath to correct name clash with DEBUG macro - should use get/set_debug_level instead
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-19 22:36:06 +02:00
jowr
70fdcf2613 Added build directory to ignore, more on polymath and incompressibles 2014-05-18 17:23:15 +02:00
Ian Bell
8328c271c6 Fixed initialization bug, Octave example compiles and runs on linux now 2014-05-18 00:10:51 +02:00
jowr
8e71eebc3b Added catch tests for polymath 2014-05-16 11:45:25 +02:00
jowr
a884794457 Started on tests 2014-05-16 10:04:04 +02:00
jowr
d830f8a835 Fixed a path typo (Windows, Windows...) 2014-05-16 08:15:27 +02:00
Ian bell
703bbfcec1 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-05-15 22:30:54 +02:00
Ian bell
d1ecc0293e Removed Props1 function for now, might put it back
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-15 22:28:56 +02:00
Ian bell
df0127edea Updated speed test (does it work? not sure)
Signed-off-by: Ian bell <ian.h.bell@gmail.com>
2014-05-15 22:26:22 +02:00
jowr
4f4904cd22 PolyMath generalisation 2014-05-15 19:17:15 +02:00
jowr
849da310e2 PolyMath is not fully implemented, but seems to work. There is a main method for testing. 2014-05-15 19:01:28 +02:00
jowr
3245b7ab74 Did we get anywhere with Polymath? 2014-05-15 18:34:33 +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