Commit Graph

198 Commits

Author SHA1 Message Date
Ian Bell
4f17726bb4 Run json cleanup script on fluid files 2015-09-03 22:58:17 -06:00
Ian Bell
b984de35bb Fit ECS curves for viscosity for R1234yf and R1234ze(E); closes #746 2015-08-30 00:54:59 -06:00
Ian Bell
70c2209cb0 Remove acentric factor for Air (not defined); closes #772 2015-08-29 16:44:59 -06:00
Ian Bell
fc62c3ba62 Fix references of EOS for R115 and R13I1 2015-08-23 23:27:16 -06:00
Ian Bell
133b19ca8a Implement viscosity for toluene; closes #785 2015-08-21 22:03:02 -06:00
Ian Bell
33c8081e6e Add R13I1 equation of state & update reference 2015-08-11 22:14:25 -06:00
Ian Bell
ec4cce6b20 Add first EOS for R115 2015-08-11 21:45:41 -06:00
Ian Bell
3ccaba9903 Fix states for HeavyWater and Novec 649 2015-07-21 08:29:03 -06:00
Ian Bell
710c963895 Fix mass/molar bug in state injection script 2015-07-21 01:22:29 -06:00
Ian Bell
c0b33ca518 Finalize implementation of Novec 649; closes #731
Also updated state injection script
2015-07-21 00:06:44 -06:00
Ian Bell
7d2330f6b4 Implemented surface tension for R1234ze(Z) and bib entry 2015-07-20 21:32:34 -06:00
Ian Bell
96178b7ec8 For pure fluids, only use one saturation pressure curve, pS, instead of pL and pV in json files; closes #711 2015-07-20 20:34:26 -06:00
Ian Bell
c2f1d0dbdf Merge pull request #732 from CoolProp/Novec649
Implement Novec649 EOS
2015-07-19 20:00:16 -06:00
Ian Bell
e6eed0093a Implement surface tension for R1233zd(E); closes #720 2015-07-18 20:02:26 -06:00
Ian Bell
f207271c36 First attempt (not good) at Novec649 2015-07-15 23:48:18 -06:00
Ian Bell
5dc98bbc14 Fix hs_anchor state for HeavyWater
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-05-05 21:21:47 -06:00
Ian Bell
537e5af103 Goodbye melting line for heavy water 2015-05-04 22:04:02 -06:00
Ian Bell
3cd7cc2af7 Fix to R407C max_sat_T state 2015-05-04 21:53:21 -06:00
Ian Bell
7c23fc02fb Test that HS are the same for all fixed state points and reference states; closes #627 2015-05-04 20:53:58 -06:00
Ian Bell
8969eb5a24 Implemented viscosity and conductivity for heavy water; closes #638 2015-05-01 22:47:45 -06:00
Ian Bell
d29818aa19 Methane conductivity almost working; see #631
Seems like there might be a bug in Friend paper?
2015-04-27 23:19:02 -06:00
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