Commit Graph

37 Commits

Author SHA1 Message Date
Ian Bell
a72baafc77 Add fluid files with superancillary data (#2503)
* Add fluid files with superancillary data

* Delete the large generated z-compressed header
2025-03-22 21:33:18 -04:00
Ian Bell
d04e24d62d Update a bunch of states, especially the h,s anchors 2025-02-23 16:47:20 -05:00
Ian Bell
0f423dcd20 Go back to the correct ancillary function from Gao
I had the wrong flag for using_tau_r previously

See https://github.com/CoolProp/CoolProp/issues/2356
2024-02-25 10:27:20 -05:00
msaitta-mpr
443a2fd276 Catch singular explosions in saturation_PHSU_pure (#2250)
* Catch singular explosions in saturation_PHSU_pure

Sometimes, the Akasaka solver has issues. This is usually caught and
then it is retried with a new omega. However, sometimes it goes bad
because the J matrix is singular, and this is not caught because the
error is not recalculated.

This commit recalculates the error term to prevent a bad result.

* Add comment to explain error check in saturation_PHSU_pure

* Add extra update check after saturation_PHSU_pure

During saturated PHSU flash calculations, SatL and SatV states have an
imposed phase. This is good for stability, but there is a small chance
that they can both up up with a matching third variable (e.g.,
pressure) that is not actually at the saturation point. This commit
forces a final DT update without this requirement. If an actual solution
has been found, the the error term will still be small. If not, then we
throw an exception and try again.

This continues work on #2245.

* Ensure that saturated phase is specified

In saturation_PHSU_pure, we unspecify the phase of SatL and SatV to
perform a final check. However, for any future updates, these states
*must* be set with specified phase. This commit ensures that no matter
what happens (exception, etc.) the phase is always specified again.

* Revert "Ensure that saturated phase is specified"

This reverts commit c6b650b861.

The commit caused potential recursive lookups and did not solve the
issue at hand.

* Update the ammonio saturated rhoV ancillary

The rhoV ancillary gave somewhat wrong results. This commit provides a
closer fit that prevents errors downstream.
2024-01-15 19:51:04 -05:00
Ian Bell
be204ce8d5 Implement ancillary equation for ammonia. See #2049 2021-10-24 13:29:17 -04:00
Ian Bell
a70719ccb6 update the critical state for ammonia to match reducing state; closes #1962 2020-08-08 12:36:38 -04:00
ian
c12ebbd6ea Add new EOS for ammonia 2019-11-06 20:18:05 -07:00
Ian Bell
02d2da7971 Tidy up whitespace according to python 3 JSON module 2019-01-27 15:55:32 -07:00
Chris Neal
17dcabdf35 Added standard InChi key & string for Ammonia
Values obtained using IUPAC winchi-1 software from Molfile: https://www.ebi.ac.uk/chebi/searchId.do?chebiId=16134
2018-05-09 23:19:57 -04:00
Ian Bell
9bd37e7d64 Add InChI keys and string, SMILES, etc; closes #1069
See also #115
2016-07-27 19:42:31 -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
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
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
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
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
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
655e8f1447 Updated hmolar and smolar for lots of fluids at the triple point states
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-11-07 16:25:42 -05:00
Ian Bell
1ea7c93b2e Added Tmin and Tmax for most h and s ancillaries
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-30 12:56:11 -04:00
Ian Bell
21a2e998af Added enthalpy and entropy for triple point states
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-10-30 00:21:29 -04:00
Ian Bell
4b082029c4 Finally repaired flash routines.
Some edge cases remain

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-24 13:40:46 +02:00
Ian Bell
c632e823ac Updated triple point states - a bit more work to once Ts(ps) works at low pressure without NR
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 21:13:59 +02:00
Ian Bell
12f1cc6b86 Updated fluid files with most of the triple point densities
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 20:57:18 +02:00
Ian Bell
8f66b729c0 Fluid hs_anchor states updated to agree with CoolProp v5
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 18:42:09 +02:00
Ian Bell
24d37e0e6d Added h and s to hs_anchor state
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 10:09:12 +02:00
Ian Bell
54bf7687b0 Updated ancillary curves for all fluids to use h-hanchor and s-sanchor in the fit
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 09:04:43 +02:00
Ian Bell
34228b16bd Added hs_anchor state for all fluids
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-01 08:44:29 +02:00
Ian Bell
9499056850 First cut at enthalpy and entropy saturation ancillaries - still need to make them deltas to a fixed known point
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-31 21:11:15 +02:00
Ian Bell
eb30d38c2b Updated reference states for Ammonia, Argon, R14
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-07-25 12:47:00 -04:00
Ian Bell
7896845a5d Added minimum saturation states to fluid files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 10:01:09 +02:00
Ian Bell
88ec40895c Added triple point states
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 09:48:33 +02:00
Ian Bell
d5f9c0a382 critical state moved into STATES in json files
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-06-06 09:29:25 +02:00
Ian Bell
261ec01c71 Added REFPROP names for all fluids - renovated get_fluid_param_string 2014-06-01 20:20:33 +02:00
Ian Bell
cb15a00699 Added critical parameters for all fluids from CoolProp 4.2
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-05-28 13:07:35 +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
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
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