Commit Graph

177 Commits

Author SHA1 Message Date
Ian Bell
3fbbb4914b Update HeavyWater hs_anchor state 2015-04-26 18:04:42 -06:00
Ian Bell
0f5355be54 Fixed saturated vapor density ancillary for D2O 2015-04-25 17:02:52 -06:00
Ian Bell
77747e0bdd Updated reference for R245fa 2015-04-25 00:00:44 -06:00
Ian Bell
184857ec1a Fixes benzene reference; closes #601 2015-04-18 22:42:21 -06:00
Ian Bell
a1813faebf Update ancillaries for D2O 2015-04-13 23:43:28 -06:00
Ian Bell
a23528253b First cut at D2O - seems there is still a small bug yet 2015-04-12 20:47:25 -06:00
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
d12d4386b5 Merge branch 'master' into methane_pentane 2015-04-10 18:32:31 -06:00
Ian Bell
d5ebfffcfb R1234ZE should be an alias to R1234ze(E), not R1234ze(Z) for compatibility with REFPROP
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-04-06 23:15:29 -06:00
Ian Bell
d2305eafce Methane and pentane friction theory for viscosity 2015-04-05 21:40:16 -06:00
Ian Bell
0cb1e95ba4 Updated Air ancillaries to yield better behavior in critical region; see #481 2015-03-31 21:54:50 -06:00
Ian Bell
f278fe0e85 Fix bug with air around the critical point pressure; closes #481 2015-03-27 19:42:13 -06: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
cbad60e752 Pseudo-pure throw error properly if T > Tmaxsat; Closes #308
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-18 20:24:09 -06:00
Ian Bell
4c82aca6df First cut at conductivity for xylenes
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-10 15:47:02 -05:00
Ian Bell
a5d1ab55cd Implemented viscosity for xylenes
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-10 13:16:25 -05:00
Jorrit Wronski
127a9668f4 Fixes #321 - a request for additonal aliases 2014-12-09 15:13:30 +01:00
Ian Bell
c1f066b82d Added surface tension for HFC fluids. Closes https://github.com/CoolProp/CoolProp/issues/306
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-08 19:43:52 -05:00
Ian Bell
e7fb2d46ba Updated cyclohexane enthalpy and entropy states
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-06 16:31:24 -05:00
Ian Bell
9acd5457fc Tidy up cyclohexane fluid file
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-06 11:51:25 -05:00
Ian Bell
ee4015c5f0 Updated cyclohexane EOS from the form of Zhou, JPCRD, 2014
Closes https://github.com/CoolProp/CoolProp/issues/292

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-06 11:43:55 -05:00
Ian Bell
8ed02eefef Added ECS models for viscosity and thermal conductivity for R11, R143a, R12, R22
See https://github.com/CoolProp/CoolProp/issues/285

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-05 14:10:35 -05:00
Ian Bell
2d4f872bbe Clean up SES36 json file
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 11:19:13 -05:00
Ian Bell
8865d2bb1a Updated critical spline for R134a
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 10:10:18 -05:00
Ian Bell
cd60fcacac Updated density ancillaries for Air
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 09:53:44 -05:00
Ian Bell
3ce533bffb Update PVT ancillaries for SES36
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 02:04:18 -05:00
Ian Bell
b8ba5fc546 Updated PVT ancillaries for R1234ze(E)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 02:02:12 -05:00
Ian Bell
df28a9745c Fixed typo in Propylene melting line
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 01:56:54 -05:00
Ian Bell
e46d33689d Update melting line for Propylene
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 00:34:29 -05:00
Ian Bell
c5a031b09e Fixed oxygen states once more
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 00:17:34 -05:00
Ian Bell
1512267e06 Updated states for oxygen
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-02 00:10:13 -05:00
Ian Bell
3b5ea03500 Removed critical splines for Helium
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 23:48:45 -05:00
Ian Bell
be22865c11 Clean up fluid json
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 23:40:26 -05:00
Ian Bell
9482ff890a Implement REFPROP Planck-Einstein term for Oxygen
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 23:39:49 -05:00
Ian Bell
f1d9192804 Clean up json files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 23:38:34 -05:00
Ian Bell
71a5cb267b Updated melting curves
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 22:49:17 -05:00
Ian Bell
8c181492bb Fixed max temp for butane and heptane
Closes https://github.com/CoolProp/CoolProp/issues/257

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 22:16:54 -05:00
Ian Bell
e15ed3b8c0 Adjusted some melting lines or removed in order to always yield positive pressure
Closes https://github.com/CoolProp/CoolProp/issues/110

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 21:39:01 -05:00
Ian Bell
428bdddf84 cleanup json files for Methanol and R123
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 16:08:50 -05:00
Ian Bell
0dd7fdcb53 Updated ancillaries for R123 and Methanol
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 15:30:00 -05:00
Ian Bell
4391004104 Updated R14 ancillary again
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 14:10:23 -05:00
Ian Bell
3ce78e2d09 Updated ancillaries for R14
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-01 12:54:49 -05:00
Ian Bell
75a1ea7c38 MM hs anchor
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-30 10:09:56 -05:00
Ian Bell
9de43ce271 Updated reference state for HS for MM
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-29 22:16:15 -05:00
Ian Bell
59e0e312a6 Fixed D4 ancillaries
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-29 18:07:42 -05:00
Ian Bell
60f9cb6614 Updated minimum saturation temperature state points
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-29 17:32:49 -05:00
Ian Bell
fd993bd3e7 Disabled acetic acid and R407F
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-29 11:10:05 -05:00
Ian Bell
16bcf7c0b8 Rebuilt HS ancillary curves for pure fluids
Closes https://github.com/CoolProp/CoolProp/issues/242

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-27 11:07:23 -05:00
Ian Bell
89ce772e27 Updated hs anchor states 2014-11-27 10:24:55 -05:00
Ian Bell
951aa83efc Update critical splines for a lot of fluids based on the use of Maxwell solver
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-23 19:56:33 -05:00