Commit Graph

1057 Commits

Author SHA1 Message Date
Jorrit Wronski
ed788df198 Added generators for the incompressibles. The makefile handles the build process of the report pdfs, we have to avoid building them as much as we can... 2014-09-08 20:32:44 +02:00
Ian Bell
853228f847 Reverted gas constant normalization - implemented constant R_u for mixtures with no other changes
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-08 19:31:07 +02:00
Ian Bell
2524459f47 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-09-08 17:34:22 +02:00
Ian Bell
edf39c7387 Finished normalization of the gas constants
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-08 17:34:05 +02:00
Jorrit Wronski
409dd7c128 Added a call to Python 2014-09-08 17:31:04 +02:00
Ian Bell
b9308f5871 Updated magnifying glass to close https://github.com/CoolProp/CoolProp/issues/131
@jowr - better now?

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-08 16:30:22 +02:00
Ian Bell
068e737388 TP flash basically working again for mixtures
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-08 00:08:18 +02:00
Ian Bell
af03189c5b Fixed a lot of little things to get multi-component phase envelopes to build.
Testing of mixture derivatives entirely refactored - much cleaner

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 21:56:34 +02:00
Ian Bell
3e7c92d5a8 Cython exposes more variables in the phase envelope
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 21:50:55 +02:00
Ian Bell
295f963a45 Phase envelope construction is working - some edge cases to deal with, but looking good overall
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 15:18:20 +02:00
Ian Bell
62beb5814a Excess functions take std::size_t
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 15:06:14 +02:00
Ian Bell
a9bf174e86 Updated codelite project
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 02:15:25 +02:00
Ian Bell
e44f1a5f3d Updated LibreOffice example
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 02:14:20 +02:00
Ian Bell
a586af18bd Added JSON schema for reducing functions for mixtures
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 02:13:45 +02:00
Ian Bell
73c56ef094 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-09-07 01:29:06 +02:00
Ian Bell
2f87567951 Octave on windows should be compiled with MinGW
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 01:28:32 +02:00
Ian Bell
bc5724b259 Update index.rst 2014-09-07 01:20:06 +02:00
Ian Bell
e7c0624a30 Added files for LibreOffice to close https://github.com/CoolProp/CoolProp/issues/123
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 01:15:49 +02:00
Ian Bell
5342ac2204 Clear the phase envelope before making the next one.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 00:54:44 +02:00
Ian Bell
4fee9a154a Python wrapper can now output phase envelopes
import CoolProp
import matplotlib.pyplot as plt

HEOS = CoolProp.AbstractState('HEOS','Methane&Ethane')
for x0 in [0.2, 0.4, 0.6, 0.8]:
    HEOS.set_mole_fractions([x0, 1-x0])
    try:
        HEOS.build_phase_envelope("dummy")
    except: pass
    PE = HEOS.get_phase_envelope_data()
    plt.plot(PE.T, PE.p)

plt.xlabel('Temperature [K]')
plt.ylabel('Pressure [Pa]')
plt.tight_layout()
plt.show()
2014-09-07 00:53:45 +02:00
Ian Bell
518aeca7d8 Fixed MixedParameters.cpp to remove c++11 functionality
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-07 00:34:13 +02:00
Ian Bell
1efc3b3a35 Fixed module finder for windows for octave
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 22:25:08 +02:00
Ian Bell
e92ed95a98 Cleaned up the c_Y functions for GERG to make use of the beta functions relationship beta_ij = 1/beta_ji
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 21:43:53 +02:00
Ian Bell
7466ffd6d5 PhaseEnvelope added to CoolProp.i SWIG interface
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 21:41:41 +02:00
Ian Bell
cdc21e38e8 PhaseEnvelopeData can be extracted using the get_phase_envelope_data function from the AbstractState
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 21:41:14 +02:00
Ian Bell
e9fde257fe PhaseEnvelopeData now in CoolProp namespace
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 21:40:08 +02:00
Ian Bell
783f27f0dc ExcessHEFunction.h all unsigned int replaced with std::size_t
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 21:39:37 +02:00
Ian Bell
b6f9ce89ed Moved PhaseEnvelope.h to include folder
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 21:08:43 +02:00
Ian Bell
a25022e596 Interpolation functions take in std::size_t instead of int
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 20:05:07 +02:00
Ian Bell
e9297e8dc5 Calculate enthalpy and entropy as part of phase envelope
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 19:56:54 +02:00
Ian Bell
46135f69b6 Broke up the critical determination term for easier debugging
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 19:03:02 +02:00
Ian Bell
b8b4187d49 Interpolation for phase envelopes is based on *new* value for rhomolar_vap - much better
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 18:27:05 +02:00
Ian Bell
73c90b4b01 Gas constants are now all set to CODATA 2010 value and terms n_i in residual terms are multiplied by R_u_old/R_u_new
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 18:09:01 +02:00
Ian Bell
05e29c85ae Added value for ideal gas constant from CODATA 2010 for use with normalization of ideal gas constants with mixtures
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 18:01:55 +02:00
Ian Bell
047f63861d Provide a body for the function that MSVC doesn't like
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 18:01:06 +02:00
Ian Bell
ea4bc07273 FlashRoutines uses parameters instead of int for other parameter
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 18:00:41 +02:00
Ian Bell
354c924ca6 Excess is header only completion
Fixed bug with init of Q for phase envelope construction

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 16:10:12 +02:00
Ian Bell
ee6d6ecadc Excess is now header-only
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 15:47:46 +02:00
Ian Bell
8fdd1fddaf Refactor of mixing parameters successful
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-06 15:41:33 +02:00
Ian Bell
8294acb71e Updated generate_headers.py for the new structure of reducing and departure functions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 16:46:45 +01:00
Ian Bell
c0ea8e82d7 Finished refactor of reducing parameters at the level of JSON
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 16:39:17 +01:00
Ian Bell
a2c318f7df First step of refactoring of reducing and departure functions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 16:34:56 +01:00
Ian Bell
f7d639db51 Phase envelope construction working now for Ethane/Propane for a range of mole fractions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 12:03:52 +01:00
Ian Bell
905fec810d Phase envelope code and data structures set up
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-05 10:09:36 +01:00
Ian Bell
ee83f066e7 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-09-03 18:32:53 +01:00
Ian Bell
f5ad4c9595 Updated flash routines at low temperature to close https://github.com/CoolProp/CoolProp/issues/124
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-03 18:32:42 +01:00
Ian Bell
b7b502ef81 Changed the cast for benzene higher-order viscosity
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-03 17:39:02 +01:00
Ian Bell
0c38f2600c Remove std::size_t cast in ReducingFunctions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-03 17:38:13 +01:00
Ian Bell
f021e422e6 Add min_abs_value function
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-03 17:36:55 +01:00
Ian Bell
0cd7b88139 More useful error message for critical spline
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-03 17:36:29 +01:00