* 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...
Test whether renaming the project in setup.py is enough. Does not impact the package name (CoolProp) that is included in the wheel so user code should not change
* Update setup.py replace distutils with setuptools
PEP 632 – Deprecate distutils module.
Edit line 4-6:
from distutils.version import LooseVersion
from distutils.sysconfig import get_config_var
from setuptools.command.build_ext import build_ext
To
from packaging.version import Version
from sysconfig import get_config_var
from setuptools.command.build_ext import build_ext
Edit line 291:
cython_version = Version (Cython.__version__)
To
cython_version = str(Version (Cython.__version__))
Edit line 353:
from distutils.errors import CompileError
To
from setuptools import CompileError
Edit line 394:
from Cython.Distutils.extension import Extension
To
from setuptools.extension import Extension
Delete line 396:
from Cython.Distutils import build_ext
This is now handled with line 6 and thus redundant
from setuptools.command.build_ext import build_ext
Edit line 3, 60, 61 62, 66, 77, 229, and 291
Replace all instances of LooseVersion with Version
* Update python_buildwheels.yml
* Update python_cibuildwheel.yml
* Update setup.py
* Update setup.py
* Update setup.py
* Update python_buildwheels.yml
Added module packaging to the list of dependencies.
* Update python_cibuildwheel.yml
Updated cibuildwheel version form 2.17.0 to latest edition 2.21.3 for python 3.13 support.
* Update python_buildwheels.yml
Deleted lines with python specific exclusions for Windows ARM64 as it already excluded generically.
* Update python_buildwheels.yml
Deleted lines with python specific exclusions for MacOS as these are no longer supported.
* Fix build error: `src/Backends/IF97/IF97Backend.h:54:34: error: call of overloaded ‘abs(double)’ is ambiguous`
Found with the manylinux_2_24_x86_64
gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516
* Register MSVC 2019 and 2022 in setup.py
* setup.py: when calling cmake, build in parallel
* Enable using Env variables instead of passing them as args to setup.py
* Github actions for linux: try 1
* use actions/checkout@v3 for submodules
* mod setup.py:; typo
* Random shot for cibuildwheel for all platforms
* I thought package_dir was a flag, but it's positional
* typo in cmake_compiler
* add cython to setup_requires
* try a pryproject.toml to install cython
* try more requirements?
* pywin32 only found on win32 I guess
* Try with CIBW_BEFORE_BUILD instead
* try to enable msvc via vcvarsall on windows, and pass MACOSX_DEPLOYMENT_TARGET
* more tweaks for windoze
* disable tests for now (fails on windows)
* tweak mac again: it seems mac doesn't understand a C++ lambda, so like it's using pre C++11
* tweak
* try 10.15 for mac...
* try to force C++11 since mac picks up the path where lambdas are used...
* Move back down to 10.9 now that C++11 is enabled and it works on mac, it should be enough
* Try to debug win32
* Enable part of the upload step (minus the upload) to list the wheels
* try to allow win32 to fail for now (instead of plain disabling)
* Disable the python_linux.yml workflow, so cibuildwheels works fine.
* Adjust the upload step to point to the right folder
* make LGTM python happy
This fixes many issues:
- Python packages can be built with XCode 10, closes#1782
- Handling of CMake options for OSX stdc++ is streamlined
- TR1 warnings from MSVC 2017 have been silenced
- Nightly builds fixed, closes#1778
- Documentation builds fixed, closes#1762
- Python source packages are updated with recent Cython, closes#1777
This change is somewhat related to #1604 .
* Catch is now at v2.3.0
* Eigen is now at v3.3.5
* FindMathemaica is now at v3.2.4
* fmtlib (formerly cppformat) is now at v4.1.0 (v5.x.x is not compatible with our code).
* msgpack-c is now at v3.0.1
* pybind11 is now at v2.2.3
* All the other submodules have been moved to the latest master commit
* All submodules are sorted alphabetically
* autopep8 whitespace only:
--select="E101,W1,W2"
* revert single file: web2py_online.py
Should this be a .py file at all?
* revert file Tickets/1443.py because the diff looked strange:
maybe there is an encoding problem?
* Rename web2py_online.py to web2py_online.rst
Cython 0.26 changes its compiler directive name from `embed_signature` to `embedsignature`. Hence an if-statement is added to facilitate compilation of Python wrappers using the new compiler directive name when Cython 0.26 is used. `_profiling_enabled` variable is also handled slightly more elegant.
* Bump revision on msgpack-c
* Remove warnings when using Julia 0.4 realease
Some change in Julia 0.4 have occurred since the last update of this wrapper.
This update should now ensure better behaviour with Julia 0.4 which is now in release state.
https://raw.githubusercontent.com/JuliaLang/julia/0ff703b40afddf9b705bd6a06d3a59cb4c089ea5/NEWS.md
* Added PT flash for cubic EOS
* Added PQ and QT inputs for pure fluids with cubic backend
* Added derivation for relationship between saturation pressure and acentric factor
* Fixed T_critical and p_critical for pure fluids with cubic backends
* Bump revision for msgpack-c; everything should work now
* Correct get_parameter_information_string, fixes#974
Put the catch in a more useful way and solves the call to CoolProp::get_parameter_information.
* Relax convergence criterion for TS inputs; closes#956
* Update the updating of the TPD state class
* Fix initial delta value in critical point search routine
* Make CMake+Python integration work on OSX (finally)
* Fix some bugs with cubics and critical point evaluation
* Added conda builds again to please #905 and #956
* Added conda to the release cycle with directory cleaning. Should solve the problems discussed in #956, #905 and #707, but we have to wait for the next nightly build to see if it really works. Remember that the upload token on the server expires in June and uploads will fail silently.
* Added cppformat as external library, see #952 and #907. Does https://github.com/CoolProp/CoolProp/blob/master/dev/codelite/coolprop.project need updating?
* Add ability to get/set kij for cubics by overloading set/set_binary_interaction_double
* Pull in the correct include path for linking with other applications (PDSim, etc.)
* Don't package _JSON.h binary files when distributing CoolProp
* Fixed the docker docs
* Moved the binstar upload into a loop, if a single upload fails, we continue with the next one as mentioned in #905
* Update critical point evaluation routines and remove some double-calculations of critical matrices
* Move search radii into the cpp file
* Bump revision for Eigen to fix annoying warnings in MSVC9 2008
* Added info about Props1SI and other options to docs; closes#970
* Bump number of fluids
* Update CoolProp.jl
Other update due to `Julia 0.4` changes
+ added `CoolProp` functions
* Just a minor fix of the docker docs
* Also add the msgpack headers to CoolProp installation - more annoying than you would imagine...
* Break up tools headers into pieces that make more sense, allowing for potentially smaller binaries and faster compilation
* Fix some header issues
* Update DBL_EPSILON
* Fix _HUGE and accumulate errors
* Add missing fstream include
* One more try with header refactor
* Add header to get thread_local for ftw
* Added the cahced saturation densities to the keyed outputs for REFPROP and Helmholtz, see #977
* Add 'G' as alias for mass-based Gibbs energy
* Eliminated some more warnings regarding missing return values
* Fixed the white-space issues in the header files
* Add IWYU integration to main module; see #983
* Fix order of getting/setting parameters
* Fix order of parameter getting/setting for real this time
* For REFPROP, get/set BIP for mixture with indices
* Fix some edge cases in critical point calculation
* Switch back to the PDF generator for the fitting reports
* Massive improvements to stability of flash routines. Nitrogen now has 0 failures.
* Added Syltherm800 for @adesideri
* Fixes#990 Javascript works again.
* Clarified the docs for #990
* Fix R123ze(E) reference; closes#992
* Some help with #986
* Added the generated cubic header to the ignore files
* Add example showing how to get REFPROP version
* Added two headers that might help with #995
* More sensible error message when using inappropriate version of REFPROP for phase envelope construction
* Add comment about MinGW generator for Android build
* Add example for calling DLL from C; closes#993
* Maybe this fixes multiple papers in the same category from #987
* Introducing limits for build logs to save disk space
* Clean up Android docs
* Kill min and max macros to close#995
* Bump REFPROP header file revision
* Small updates to docs
closes#996closes#997
* Significant improvements to phase envelope construction
Thanks to the critical point evaluation routines
* Also add the configuration key
* Refactor phase envelope packaging with msgpack to remove external msgpack-c include
Also, don't package msgpack or rapidjson with CoolProp. Doesn't seem necessary now
* Refine the phase envelopes in the liquid side based on difference in pressure
Closes#998
* Allow ability to adjust the fineness of the refinement of the phase envelope from the high-level
* Improvement in stability of refinement of phase envelopes
* Cubics library should use all uppercase names for matching
* Got QT inputs working for cubic mixtures
Also implemented the explicit solution for p from Wilson
* Progress with PQ inputs for cubics; some bugs remain still
* Still not obvious why SRK PQ fails.... Updated tests for derivatives of fugacity_coefficient
* Mostly a false alarm. Seems PQ works ok, not at very low pressure though
* Implement 95% of the BIP setting/getting
See #1000
* Fix journal abbreviations; closes#999
* Update mixtures setting/getting BIP docs
* Where possible, remove include paths
Can't do so for Eigen.
closes#994
* Fix include for msgpack-c; see #994
* Fix path for IF97 in HumidAirProp.cpp
* Move error string into solver class; see #985
* Add docs for explicit solution for p from T for Wilson K-factor relationship
* Fix include paths for OSX; see #994
* First attempt at adding python 3.5 wheels; see #1002
* Upgrade cython as part of python build
* Fix typo in coolprop cp 3.5 build in buildbot
* Install cython into the appropriate environment this time
* Fix order of initialization for solver wrapper class
* Wrap all configuration variables into enumerations and a python module
* Added docs for new config strings
* Upgrade cython for sphinx builder
* Fix configuration sample in docs
* Fix constant in Chung method for estimation of e/k and sigma
* Added the Python 3.5 docs for #1002
* Added Python 3.5 to the Linux slaves, this won't work until CoolProp/Dockerfiles#1 is resolved
* Removed unused variables
* Better deal with inputs for tabular backends that are two-phase
* Fix stupid bug with tabular backends trying to evaluate pure_saturation tables when two-phase in first_partial_deriv
* Rename cubics schema file
* Cubics now are validated and new cubic fluids can be added
Lots of changes:
* Cubics are validated against schema
* Schema can be returned as string
* Added preliminary docs for cubics
* Cubic fluids can be added programmatically
* Add cair_sat to DLL/SO; closes#1005
* Add link to cubics page to main dos page
* Actually commit the docs for the cubic EOS this time.
* Fix Android docs formatting
* Add Ar alias for Argon; closes#1007
* Once more addressing #979 thanks to @shrx .
* I am constantly running out of disk space on the Windows machine.
* Add chemical potential as abstract state method
For example:
```
auto fluids = strsplit("Methane&Ethane", '&');
auto x = { 0.6,0.4 };
shared_ptr<CoolProp::AbstractState> RP(CoolProp::AbstractState::factory("HEOS", fluids));
RP->set_mole_fractions(x);
RP->update(PT_INPUTS, 101325, 300);
auto mu1 = RP->chemical_potential(0);
RP.reset(CoolProp::AbstractState::factory("REFPROP", fluids));
RP->set_mole_fractions(x);
RP->update(PT_INPUTS, 101325, 300);
auto mu2 = RP->chemical_potential(0);
```
* Abbreviate JCT properly
* Removed the cython upgrades to get more errors from the builders
* Update references; closes#1011
* Give access to dalphar_ddelta_consttau and dalphar_ddtau_constdelta in high-level api; closes#1010
* Implement stability analysis based on TPD analysis; partly working
* The Windows builder has been upgraded to 4 cores
* Typo in master.cfg
* It is more difficult than I though to have parallel builds
* Add ability to use GERG in REFPROP; closes#923
* Give access to alphar in high-level API; closes#1012
* Add a few more spaces
* And remove the condition on the additional spaces
* Allow beta to be outside (0,1) in stability analysis in first SS part
* Add REFPROP version output to the examples
* Fix typo in use of GERG in docs
* Secant behaves properly now when y1 approx. y2; closes#1015
* target_link_libraries
* clear molar mass in clear function; closes#1021
* Fix docs for tangent_plane_distance; closes#1019
* Typo in TPD fix; see #1019
* Make the gas constant an adjustable parameter and update to CODATA 2014 value
* Skip volume translation for cubics; closes#1018
* Fix typo in R_u update
* Fix copying of kij in cubic backend get_copy function
* Disable some optional checks in specialized low-level update functions
* Finish stability calculations for critical point calculations!
* Remove check of eigenvalues of L* matrix to determine stability (or not)
* Add access to h_Ice, s_Ice, etc. through HAProps_Aux; closes#1017
* Add script to do mingw static library building for python; closes#1016
* Use cmake to build sphinx docs on OSX
* Pad fluid string all the way to 10k characters
* Run R example with Rscript rather than R
* Fix call to Rscript
* Add Rscript to CMake test as well
* Update the Rscript calling stuff
* Fix Rscript calling in example_generator.py
* Fix typo in debugging printing for stability calcs
* Add some info to the Help section
* Describe how to make coolprop static library a clean cmake dependency; closes#1014
* Fix typo in CMake integration
* Fix call to Rscript in CMakeLists.txt?
* Another try with Rscript
* Yet another try with R
* Add new OSX slave for OSX 10.10+
* Try to fix the install path for OSX
* python static library builds should be release builds
* Another try with MATLAB on OSX 10.10
* Another attempt with MATLAB path
* Allow MATLAB tests to be disabled
* Add link to binaries for MATLAB for OSX 10.10; see #1013
* Add coefficients from JCED paper; closes#854
* Fix interaction parameters for new mixtures
* Fix docs for new BIP from JCED paper
* Fix REFPROP version for older version of REFPROP.
* Add updated docs for cubics (WIP)
* Small modifications to finish (?) critical point calculations
* Small bug fixes
* Guard against multiple definitions of "_CRT_SECURE_NO_WARNINGS" macro on Windows
* More macro definitions
* Refactor HMX.BNC path handling for REFPROP
Closes#1028
See #1023
* Add pass-throughs for testing derivatives; closes#1030
* Fix(?) issues with loading multiple predefined mixtures in REFPROP; see #1023
* Fix failures for PQ at triple-point pressure; closes#1009
* Switch python 3.5 windows builds to use vc14 cmake compiler; see #1002
* Remove static library linkage when building pythonn 3.5 wheels; see #1002
* Updates to docs for cubics and VLE tolerances
closes#1024closes#1025
* Fixes STRING conflict between Mathcad library and cppformat
The Mathcad library header, mcadincl.h, defines a STRING constant. This
should be MC_STRING, as STRING is too dangerous and conflicts with
STRING enumeration value in format.h from external/cppformat.
* Move a lot of mixture derivatives to the new formulation; see #1032
* First attempt at fixing logo size in cloud theme. See #1029
* Another try at resizing logo for firefox; see #1029
* a quick fix that might work with #1029
* forgot the match the aspect ratio, see #1029
* Disabled the conda builds again, closes#1033
* Removed scipy references or changed them to be imported locally, fixes#1036
* Circumvent Cython issues from #1039, not sure this is a fix
* Changed the string handling to tackle #979
* manylinux builds for 64-bit linux wheels are up-and-running
Run the ./build_images.sh script, builds docker image, and uses docker image to build the linux wheels
* Small logo instead of big one; see #1029
* Fixed#1040 thanks to the comments by @LORENZOTOCCI
* Pushing the new viscosities to the JSON files, getting ready for an intermediate nightly release
* Removed the conda builds from the docs, they are abandoned for now
* Make the logo smaller
* Disable the python linux builds in preparation of changeover to manylinux1 builds
* More changes for manylinux
* manylinux wheels fully working now
* Copy cppformat to the appropriate location
* Fix typo in OSX build flags
* Fixed Minor MSVC Compiler Warnings (#1041)
* Fixed Minor Warnings from MSVC
Minor type mis-matches, etc.
* Replace int(...) with static_cast<int>(...)
* First attempt at #1044
* Fix PT inputs along critical isobar and critical isotherm; closes#1034
* Add REFPROP version to REFPROP comparison script; closes#1026
* Added a number of new predefined mixtures; see #719
* Tidy up sphinx docs; closes#1029
* Moved more mixture derivatives tests to use new format; see #1032
* Fixed typo in fugacity wrapper function; see #1032
* Add acentric factor for Air; closes#1001
* Fixed units in RP1485 validation tables
* Disable image resizing
Could be done by setting DPI in savefig
* Copy PlatformDetermination.h into the top of CoolPropLib.h; see #946
* Try to resize the font a little bit in the sphinx output
* Mathcad Wrapper Updates for CoolProp 5.x and 6 (#1047)
Minor type mis-matches, etc.
* Update CMakeLists.txt for both Mathcad Prime and Mathad 15
Copied original MATHCAD module and modified for a PRIME module and a
MATHCAD15 module.
* Updated Mathcad Wrapper for version 5 & 6
Changes to CoolPropMathad.cpp:
* Uses PropsSI(), Props1SI(), and HAPropsSI()
* One source for both Prime and Mathcad 15
* Replaced Mathcad error #defines with enumerated values
* Replaced STRING const with MC_STRING enum
* Uses LP* and LPC* types from MCADINCL.h instead of * const
* Implemented get_global_param_string & get_fluid_param_string
* Cleaned up comments
GENERAL:
* Removed batch files (they don't work anymore)
* Updated README.rst in both directories with compile instruct.
* Removed cpp file from Prime directory (no longer needed)
* Removed MCADINCL headers (better to use from install directory)
* Fixed Typo on Props1SI function name
* Add function documentation XML file for Mathcad 15
Puts the functions in the Insert Function panel off the main menu of
Mathcad
* Modify Mathcad 15 README.rst
* Update Prime README.rst
* Update Prime README.rst (again)
* Fixed CmakeLists path and updated README files.
More robust CMake file and updated README info for clarity.
* Fixed RST syntax in README
* Update install commands for cmake, update doc index
* Commit the RST files for MathCAD15 and Prime
* Add MathCAD builders to buildbot
* Finished conversion of derivatives to new formulation; closes#1032
* Fix MathCAD build?
* Fix REFPROP comparison string
* Another try at MathCAD buildbot
* Add apply_simple_mixing_rule to AbstractState; fix bug with SatL and SatV and setting interaction parameters
closes#1048closes#1049
* One more go for MathCAD+buildbot
* Touch the time-stamped file for expensive builds only after success
* Yet another try with MathCAD
* Align Tmax with REFPROP values (#1053)
* Remove non-operative gitignore rule.
This rule matches the /dev/fluids folder and all its
contents, but those were already in the repo, so the
rule is not in effect.
* Align Tmax with REFPROP values. Fixes#257.
I used the list given in #257.
DME, C12, Neon, SF6 values went down.
R11, R123, R152A had two occurences in EOS, I changed both.
* Added "set_reference_state" wrapper for Mathcad and Updated Example Worksheets (#1056)
- Added Mathcad wrapper for set_reference_stateS(), designated
set_reference_state in Mathcad.
- Added to the funcdoc interface (CoolProp_EN.xml)
- Tidy up some formatting in the README files
* Updated Mathcad 15 and Prime Example Sheets + PDFs of Each
@ibell I know we don't like binaries in the rep, but I feel these are
critical. They are updates to the Mathcad worksheets that were already
there and PDF versions for anyone who doesn't have Mathcad (i.e.
@ibell). The files are only about 250 KB each or 1MB total. I don't
expect we'll need to add to them or add more. We might consider how to
put these out with the DLL binaries as well. They are the only
documentation on how to use the wrappers correctly.
* Fixed CMakeList.txt confict and modified M15 worksheet from .xmcd to .xmcdz (compressed file type)
* Install the smaller compressed worksheet for MathCAD 15; see #1056
* Add rho*sr scaling methodology for viscosity from Bell paper in Purdue conference
closes#816closes#665
* Add reference to Purdue paper
* Prep for version 6 release
* Added contributors
