Commit Graph

97 Commits

Author SHA1 Message Date
Ian Bell
4542f9d093 Merge into release (#1057)
* 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 #996
closes #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 #1024
closes #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 #1048
closes #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 #816
closes #665

* Add reference to Purdue paper

* Prep for version 6 release

* Added contributors
2016-05-10 22:20:22 -06:00
Ian Bell
2dd5a90ab7 Add the ability to change the EOS for a given pure fluid 2015-12-26 13:38:50 -07:00
Ian Bell
fcf641ee64 Expose enough of the AbstractState API in order to generate phase envelopes - works!; closes #819 2015-12-19 18:36:12 -07:00
Ian Bell
1d48b8bcea Move mass_to_molar_inputs into AbstractState base class 2015-12-06 14:59:56 -07:00
Ian Bell
108f3c4289 Added get_mass_fractions function to AbstractState; see #812
Also added get_mass_fractions to python wrapper
2015-10-23 12:22:45 +02:00
Ian Bell
e05d58efa3 Hack AbstractState and its SWIG wrapper to expose the liquid and vapor mole fractions; see #824 2015-09-30 23:21:01 -06:00
Ian Bell
da015ffb68 Add the ability to access all the critical points in C++ and python; closes #807 2015-09-03 22:28:46 -06:00
Ian Bell
3ee7edb607 Add ability to get contributions to conductivity and viscosity; closes #800 2015-08-29 21:56:20 -06:00
Ian Bell
00a9b756ad Fix long double and double confusion in guesses structure 2015-08-29 21:26:29 -06:00
Ian Bell
eb1c140ca9 Add access to conformal state in AbstractState; closes #799 2015-08-29 17:27:57 -06:00
Ian Bell
2a1cae6f5a Add ability to set BIP for HEOS and REFPROP with common interface; closes #793
Serious problem remains with the setting/getting of betaT and betaV in REFPROP since asymmetry not taken into account
2015-08-28 22:59:33 -06:00
Ian Bell
c4efcceb38 Make clear() overridable (see #770) and improve docs in AbstractState 2015-08-20 14:09:32 -05:00
Ian Bell
58e7edd1dc Move fluid_param_string into backends, allowing access to CAS for REFPROP; closes #678 2015-07-26 13:35:39 -06:00
Ian Bell
e2911531b1 Unit documentation for dipole moment 2015-07-26 12:06:56 -06:00
Ian Bell
0bd20b8798 Implement access to dipole moment from REFPROP; closes #725 2015-07-26 12:05:08 -06:00
Ian Bell
3c0fc7e0b4 Fix access to Gibbs function; closes #724 2015-07-13 18:54:06 -06:00
Ian Bell
111371df98 Implement fugacity through low-level interface; closes #699 2015-06-30 22:04:08 -06:00
Ian Bell
89c7100c54 Fixed second_saturation_deriv names; closes #691
I hope this fixes it finally
2015-06-28 19:00:00 -06:00
Ian Bell
ef929fcd2a Fix cp0 for tabular backends; closes #696 2015-06-28 12:31:09 -06:00
Ian Bell
23dd866ad6 Fix variable names for second_partial_deriv and calc_second_partial_deriv; see #691 2015-06-12 05:56:25 -06:00
Ian Bell
a58a64658d Implemented ideal curves at C++ level; see #654 2015-05-29 00:40:28 -06:00
Ian Bell
0987a11480 Disable Tabular backends in high-level interface using PropsSI; closes #617 2015-05-08 20:28:35 -06:00
Ian Bell
01da76f6a0 parameters instead of int for keyed_output and trivial_keyed_output
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-05-08 19:39:52 -06:00
Ian Bell
04897ee1e3 Calculate true critical point using REFPROP backend; closes #652 2015-05-07 21:28:57 -06:00
Ian Bell
dd795aec57 Implement the PIP parameter of Venkatharathnam for HEOS backend through to python and B and C virial coefficients
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-05-06 23:27:23 -06:00
Ian Bell
8f9817b1ae Export up to 4th order derivatives of the residual Helmholtz energy term 2015-04-23 10:05:11 -06:00
Ian Bell
d190704c3a REFPROP PHI0dll function seems to be working by some miracle; closes #555 2015-03-26 22:33:07 -06:00
Ian Bell
927a394b88 Added snippets/HighLevelLowLevel.cxx
Fixed bug with rhomass for Tabular methods
2015-03-17 21:27:55 -06:00
Ian Bell
ea214085c1 Merge pull request #529 from mikekaganski/master
First bunch of Coverity Scan static analysis warning fixes
2015-03-09 07:05:50 +01:00
Ian Bell
7a375952e0 Implement calling a flash routine with guess values provided at the low-level (PQ only for now) 2015-03-06 15:38:25 -07:00
mikekaganski
af3107ed9a Fix Coverity CID 38616 2015-03-06 22:14:30 +10:00
Ian Bell
716c5a34d0 Merge branch 'master' into tabular
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-24 20:20:00 -07:00
mikekaganski
1068b724c3 CoolPropDbl
Introduce CoolPropDbl to replace long doubles. This may help to overcome
possible portability problems, and test for efficiency and precision.
2015-02-24 13:24:51 +10:00
Ian Bell
bea9f8ad6b Merge branch 'master' into tabular 2015-02-22 23:34:39 -07:00
Ian Bell
aff594bb25 Fix reducing state access for REFPROP; closes #487
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-02-22 23:11:40 -07:00
Ian Bell
a43693de58 Single-phase HmolarP_INPUTS are working with TTSE 2015-02-22 21:08:32 -07:00
Ian Bell
58519d5fbf Good progress on tabular interpolation code - single-phase tables can be constructed and written to file and then reloaded 2015-02-22 02:27:13 -07: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
ad978bf294 Expose second derivatives through AbstractState and add test (passes)
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-01-04 00:34:45 -05:00
Ian Bell
9e5c3d6035 Preliminary work on two-phase derivatives and splines
Added two-phase derivative, works!
Spline for drho/dh|p works
Spline for drho/dh|p NOT WORKING

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2015-01-01 22:58:05 -05:00
Ian Bell
50b611bd4a Move predefined mixture parsing to HelmholtzEOS initializer function; Closes #373
Renamed functions for Helmholtz backend for getting const or non-const reference to mole fractions

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-31 18:06:12 -05:00
Ian Bell
733cf60b31 Call clear() in instantiator for AbstractState
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-30 23:04:03 -05:00
Ian Bell
9c05e93fd6 Refactor AbstractState::factory to take vector of strings
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-30 16:06:07 -05:00
Ian Bell
6dc00552e4 Implement the Prandtl number. Closes #372
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-27 00:38:37 -05:00
Ian Bell
a8375c3912 Added saturated_liquid_keyed_output and saturated_vapor_keyed_output functions to get access to internals for saturation state
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-26 22:24:25 -05:00
Ian Bell
884a3ff8ff Implemented second saturation derivatives with respect to p; Closes #238
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-19 17:39:47 -06:00
Ian Bell
19353c764c Merge branch 'master' into refprop_derivative_support
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-10 00:39:00 -05:00
Ian Bell
751a92232a Implemented second partial derivatives in the AbstractState class
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-10 00:37:04 -05:00
Ian Bell
fe1e41f0eb Expose fluid names through the AbstractState. Closes #322
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-10 00:05:55 -05:00
Ian Bell
1a9f0a4e32 Derivatives are working, seems like a bug in REFPROP PHI0dll function is the only remaining problem
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-12-09 18:55:52 -05:00