Commit Graph

1588 Commits

Author SHA1 Message Date
Ian Bell
4456af3f5f More doc tweaking 2025-04-07 11:49:17 -04:00
Ian Bell
ee737d77b4 more nan 2025-04-07 10:14:19 -04:00
Ian Bell
1f9360ed5c Two more np.nan 2025-04-07 07:30:28 -04:00
Ian Bell
fa27c24e94 Remove deprecated use of np.NAN, replace with np.nan 2025-04-07 07:29:46 -04:00
Ian Bell
8a1b1f8bca Jump to python 3.13 for doc builder 2025-04-06 21:35:14 -04:00
Ian Bell
855293c4ce Add pickleshare and nbsphinx to container 2025-04-06 21:16:55 -04:00
Ian Bell
0a41d0d876 jinja2 is now no longer allowed to be < 3.0 by sphinx.
Patch cloud_sptheme, no longer being developed
2025-04-06 14:50:23 -04:00
Ian Bell
c0d5ecb7a4 Add note about how to get the right token 2025-04-06 09:16:26 -04:00
Ian Bell
f224520cbe Catch json errors in loading hashes
This is a new one...
2025-04-05 16:25:08 -04:00
Ian Bell
9891a1df3a Update Dockerfile for doc base image 2025-04-05 08:32:10 -04:00
Ian Bell
bbda2f3c28 A more helpful error message when R_BIN is provided but incorrect 2025-04-04 18:10:38 -04:00
Ian Bell
6489fa3688 Add the raw for the escaped character 2025-04-03 20:45:25 -04:00
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
8484f8fb71 Inject superanc 2025-03-10 20:32:22 -04:00
Ian Bell
747f2b0235 Move to more modern pyproject.toml builds
Backwards compatible with old approach
2025-03-09 12:50:09 -04:00
Ian Bell
dc360fc167 miniz fluids (#2495)
* Ignore depcache files [skip ci]

* Z lib compress the fluid data

And migrate to newer version of miniz

* Add the writing of the .z file

* This works on MSVC, not sure about any other platform

How does one inform the linker about what locations to search for this file?

* Does this give the necessary linking info to the compiler?

* Include the header only for MSVC

* The incbin is still needed for non-windows

* Missing headers for Python

* Add miniz source file

* Missing import

* Provide a solution for compilers that don't support assembly to embed files

* Don't specify standard since we have mixed C/C++

https://stackoverflow.com/questions/49000674/cython-std-c11-error-using-both-c-and-c

* rename miniz to cpp

* And cmake

* Back to .c again

Not sure what to do about Python now

* Build the C library and then link it in

* FIx cmake too

* Location for .z file

* arg to setup function

* Check for z file [skip ci]

* Force build temp to be here

* Try switching to setuptools version

* Force the build_temp to be build before clib construction begins

That was subtle...
2025-03-09 10:38:56 -04:00
Ian Bell
86266727a3 Add rudimentary dependency management on header generation (#2494)
Based file modification times. The hash-based method is good, but quite slow as files get larger
2025-03-08 10:12:09 -05:00
Ian Bell
f03e8aa810 Revert "Modernize use of git in building headers"
This reverts commit 1419689b66.
2025-03-08 08:27:05 -05:00
Ian Bell
1419689b66 Modernize use of git in building headers 2025-03-08 08:11:26 -05:00
Ian Bell
f6f1279c8d Silence a lot of tests that are not serious problems
See #2484
2025-03-02 14:00:15 -05:00
Ian Bell
94695e7c47 Refit S800
Closes #2447
Closes #2488
2025-03-01 14:04:18 -05:00
Ian Bell
a8cce71042 post always wins
So set the modifier to post to ensure that 6.7.1.post1 would get selected before 6.7.0 (which is a standard release)
2025-02-25 21:23:51 -05:00
Ian Bell
63238f4e96 Make them all be dev 2025-02-25 21:20:04 -05:00
Ian Bell
d5117a3b87 According to python sorting rules on testpypi, post wins 2025-02-25 21:15:57 -05:00
Ian Bell
c8784ddee8 I think I fixed the testpypi version numbers
But we shall see
See #2472
2025-02-25 20:52:00 -05:00
Ian Bell
d04e24d62d Update a bunch of states, especially the h,s anchors 2025-02-23 16:47:20 -05:00
Ian Bell
4d1de18261 Fix h,s anchor state for pentane
Closes #1870
Closes #2477
2025-02-23 16:40:52 -05:00
Ian Bell
a19e69662f Update msgpack-c and selectively add boost (#2450)
(like was done in teqp)
2024-12-07 13:06:49 -05:00
Ian Bell
f86cff92ec Fix critical density for cyclopentane
Should have also been updated when updating the EOS
2024-08-29 08:58:12 -04:00
Ian Bell
56b09a6b75 Fix InChi string/key for R1233zd(E)
Previous values were for the mixture of Z and E isomers
2024-08-05 14:43:15 -04:00
Ian Bell
f6eb03742f Copy the viscosity correlation into parahydrogen
Paper indicates it is valid for normal H2 and para-H2
Closes #2371
2024-04-21 09:51:17 -04: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
ffa5a278ab Fix the triple points densities for R-1336mzz(E) (#2329) 2023-12-06 14:08:13 +01:00
Jorrit Wronski
72e0baae5c Rename R1336mzz(E).json_disabled to R1336mzz(E).json
Prepare for merging #2329
2023-12-06 14:08:00 +01:00
Jorrit Wronski
337526d056 Temporarily remove R1336mzz(E) from the list of fluids until #2309 is fixed 2023-11-29 13:42:16 +01:00
Jorrit Wronski
abe3a1b51b Incompresible versions of CoolProp fluids Acetone, Ethanol, Hexane as well as gaseous air
Use an existing CoolProp installation to create data sets for Acetone, Ethanol, Hexane as well as gaseous air. These fluids are added to the list of incompressible fluids for simplified calculations.
2023-11-29 08:34:13 +01:00
Jorrit Wronski
78b4f0e7b5 Fix base temperature and composition problems for incompressible fluids (#2324)
use interpolation to avoid the division by zero when calculating incompressible fluid properties exactly at the base temperature or composition, closes #2295
2023-11-29 08:30:45 +01:00
Jorrit Wronski
7bc07f2473 Food properties as incompressible liquids + ice (#2320)
* Directly include the food properties using the coefficients from Choi and Okos (1986)
---------

Co-authored-by: Martin Ryhl Kærn <mrk@ipu.dk>
2023-11-28 11:10:30 +01:00
Jonas Freißmann
ce9c3e57e4 Addition of EoS JSON of R1336mzz(E) from Akasaka-IJT-2023 (#2309)
* Add EOS JSON for R1336mzz(E) from Akasaka-IJT-2023.

* Add BibTeX entry for Akasaka-IJT-2023.

* Add BibTeX_EOS label in R1336mzz(E).json.

* Update R1336mzz(E).json

Fix the triple point liquid density, without it, VLE calculations fail

---------

Co-authored-by: Ian Bell <ian.h.bell@gmail.com>
2023-11-27 21:32:20 -05:00
Arnab Mahanti
826e77f122 implemented VISC LAESECK-JPCRD-2017-CO2 (#2268) 2023-07-26 10:53:06 -04:00
Arnab Mahanti
377bab8ebe implemented TCX Huber-JPCRD-2016 for CO2 (#2267)
* implemented TCX Huber-JPCRD-2016 for CO2

* added CarbonDioxideHuberJPCRD2016 to json file

* fixed typo in Huber Eq. 3
2023-07-22 07:49:23 -04:00
VikramGovindarajan
95ece84201 Incomp liqna (#2238)
* Liquid sodium properties added in incompressible liquids from range 400 K to 2500 K in steps of 100 K.
np.float changed to float in SecCoolFluids.py (Deprecated alias)
json file generated and added

* a bug in liquid sodium viscosity value corrected

* specific heat capacity fit was not proper for liquid sodium.
after removing two data points at the high temperature end, the fit is reasonable and is retained as of now.

* liquid sodium json file updated

* specific heat fit for liq sodium was not satisfactory for full range 400 K to 2300 K.
hence the range of values for specific heat of liq sodium reduced to 400 K to 1000 K and new coefficients updated
2023-04-16 12:32:47 -04:00
msaitta-mpr
3b51038827 Correct typo in n-Hexane rhoV auxilliary (#2230)
The rhoV auxilliary for n-Hexane had accidentally been set to use
reduced tau. This commit fixes the typo. This prevents bad guesses
for a number of property evaluations which use saturated states.
2023-03-29 20:31:28 -04:00
Andrés Riedemann
abcb4a53a9 update cyclopentane.json (#2225)
following the suggestion on #2051
2023-03-21 22:08:26 -04:00
msaitta-mpr
7da86af494 Topic 2142 (#2223)
* Remove R1233zd(E) hL ancillary

The R1233zd(E) hL ancillary performs poorly. This can result in a
failure to converge when provided inputs (p/h) lie between the
ancillary saturation curve and the true saturation curve. Removing
the ancillary makes CoolProp fall back to a robust saturation
solver.

* Add 0.01 K cushion to Tmax in HSU_P_flash

Within HSU_P_flash, if an ancillary is used it can have a small
error. If the point of interest is near that saturation curve, this
error can prevent the solver from converging. Adding a 0.01 K margin
account for small ancillary errors and allow the solver to converge.

* Correct 0.01K cushion

The 0.01K adjustment should increase the potential range of the
solver. Previously, the minimum was increased, but it should be
decreased.
2023-03-18 08:07:59 -06:00
Jorrit Wronski
8d3aec55c4 Prepare for v6.4.3 2022-12-16 11:35:35 +01:00
Jorrit Wronski
a885a2b4e0 One more typo 2022-12-13 14:12:01 +01:00
Jorrit Wronski
d0e2778734 Update the version extraction to handle builds without revision 2022-12-13 14:10:36 +01:00
Jorrit Wronski
9faf4ae9bb Prepare for v6.4.2 2022-12-13 14:03:39 +01:00