Commit Graph

60 Commits

Author SHA1 Message Date
Ian Bell
e4b451276f Added chemical formulas for nearly all fluids; can be retrieved with get_fluid_param_string(self.name, "formula"); closes #564 2015-04-10 20:11:03 -06:00
Ian Bell
4385a34105 Added viscosity dilute powers of Tr 2015-04-05 21:41:08 -06:00
Ian Bell
04145b5c15 Killed off a bunch of order-of-initialization warnings from mingw
Watch out @mkaganski, its not serious, but annoying.

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-03-09 23:30:53 -06:00
mikekaganski
73a8fe2899 Fix Coverity CID 38557 2015-03-09 16:29:58 +10:00
mikekaganski
16b13f3f0f Fix Coverity CID 38567
Add some const methods to allow passing const ref
2015-03-07 20:41:24 +10:00
mikekaganski
993b684168 Fix Coverity CID 38568 2015-03-07 17:42:07 +10:00
mikekaganski
4ae7040d91 Fix Coverity CID 38615 2015-03-06 22:46:07 +10:00
Ian Bell
6b6f2dbb29 Removed pEOS and replaced it with EOS() function - reference state works properly; Closes #524 2015-03-05 20:59:46 -07:00
mikekaganski
1068b724c3 CoolPropDbl
Introduce CoolPropDbl to replace long doubles. This may help to overcome
possible portability problems, and test for efficiency and precision.
2015-02-24 13:24:51 +10:00
Ian Bell
183868dee2 Implement acentric factor through AbstractState and Props1SI; closes #448
Fix all instances of accentric->acentric in fluid files and codebase.

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-03 17:37:53 -05:00
Ian Bell
e84274367d Add a better error message if fluid does not have thermal conductivity or viscosity model
See https://github.com/CoolProp/CoolProp/issues/285

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-05 14:22:48 -05:00
Ian Bell
bd28f0829e Handle multiple solutions in the critical splines better
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 10:31:01 -05:00
Ian Bell
3bcc83a3e4 convert assert to cassert to make VxWorks happier
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-19 22:14:16 -05:00
Ian Bell
8327d54ea2 Replaced all tabs with spaces (finally) in C++ files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-19 12:16:14 -05:00
Ian Bell
441d448198 Once more fixing the critical splines
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-14 15:21:50 +02:00
Ian Bell
9f04472cef Small docs modifications
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-02 17:01:33 +02:00
Ian Bell
853228f847 Reverted gas constant normalization - implemented constant R_u for mixtures with no other changes
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-08 19:31:07 +02:00
Ian Bell
edf39c7387 Finished normalization of the gas constants
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-08 17:34:05 +02:00
Ian Bell
0cd7b88139 More useful error message for critical spline
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-03 17:36:29 +01:00
Ian Bell
fca950907f Implemented benzene viscosity correlation of Avgeri et al. from JPCRD, 2014
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-02 14:56:04 +01:00
Ian Bell
bbc97ac230 Added methanol viscosity correlation to close https://github.com/CoolProp/CoolProp/issues/82
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 23:12:16 +02:00
Ian Bell
229552ff93 Removed debugging commands
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 21:01:24 +02:00
Ian Bell
05f4c64049 Potentially fixed critical spline code for linear and quadratic "splines". Closes https://github.com/CoolProp/CoolProp/issues/111
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 19:31:25 +02:00
Ian Bell
69bbdc693b Reimplemented critical region splines all the way from scripts to build to C++ code
Closes https://github.com/CoolProp/CoolProp/issues/94

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-22 22:14:48 +02:00
Ian Bell
ab98aae25d Added cross-references for transport flags 2014-08-21 01:17:54 +02:00
Ian Bell
b4ff7a8cc5 Implemented viscosity for cyclohexane from Tariq, 2014.
Added unit tests, reformulated initial density term

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 00:50:57 +02:00
Ian Bell
801aa61485 Implemented psat_max and Tsat_max for pseudo-pure fluids to close https://github.com/CoolProp/CoolProp/issues/89 2014-08-09 12:17:44 +02:00
Ian Bell
8e3f4f183b Moved ancillaries into their own header
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-09 10:56:21 +02:00
Ian Bell
17458261b5 Modifications to saturation routines (work great now)
Including:
adding critical pressure parameter
Adding relaxation parameter for NR sat_T
Only evaluate correction step if not near critical temp
Fixed bug with fluids like "n-Propane" that was getting interpreted as an incompressible fluid

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-03 23:36:22 +02:00
Ian Bell
ea3ceeccfe H & S Ancillaries use value minus value at anchor state
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 10:34:13 +02:00
Ian Bell
f12d7c0def PH and PS for single phase basically works now, still need to determine guess values
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-31 22:07:08 +02:00
Ian Bell
fc7eb55ca2 Added code for liquid enthalpy ancillary for Propane - proof of principle.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-31 19:39:24 +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
64946e6017 Added melting lines for many fluids - nearly all that are in REFPROP
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-09 15:48:52 +02:00
Ian Bell
6e287e9454 Update parsing of the fluid JSON files for the new state architecture
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 12:05:55 +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
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
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
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
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
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