374 Commits

Author SHA1 Message Date
Jorrit Wronski
0ee9109ebc Revive the bibtex parser 2014-09-16 08:23:29 +02:00
Ian Bell
c0157c0814 Added the ability to set/unset the phase for the abstract state class
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-15 16:17:01 +02:00
Ian Bell
7060cba653 Updated constants module to include also the phases enum
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-15 16:15:23 +02:00
Ian Bell
91efc95076 Updated docs and cross-linking between them
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-12 20:57:52 +02:00
Ian Bell
a43d25620d smolar added to python output of phase envelope
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-12 20:56:13 +02:00
Ian Bell
c4ea637c90 Deprecated Ph, Ts, etc. plotting functions
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-11 21:41:01 +02:00
Ian Bell
01d1996b59 Updated doxylink paths to give CoolProp:: namespace prefix
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-11 21:36:35 +02:00
Ian Bell
8609a9739c Removed printing of indices for maxima of phase envelope
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-11 13:07:22 +02:00
Ian Bell
58556c6e14 Expose mole fractions of liquid and vapor through python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-11 02:12:44 +02:00
Ian Bell
83c1737416 Set the default unit system for plots back to KSI for backwards compatibility
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-10 16:49:09 +02:00
Ian Bell
86f52bdf4e Phase Envelope calculations now include Tsat_max and psat_max, along with indices thereof.
The Tsat_max and psat_max values are calculated using exact solution based on finding dT/dP and dp/dT equaling zero by a 1D solution in rhov.

See also https://github.com/CoolProp/CoolProp/issues/133

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-10 15:17:19 +02:00
Ian Bell
1243c2af1f Psych chart updates
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-10 10:22:55 +02:00
Ian Bell
7bf4216240 Repaired humid air properties. Validation runs now
Closes https://github.com/CoolProp/CoolProp/issues/125

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-10 10:14:29 +02:00
Ian Bell
37838e5f77 Merge branch 'master' of https://github.com/coolprop/coolprop 2014-09-09 14:30:59 +02:00
Ian Bell
92299092a4 Updated python wrappers of both Abstract State and old kSI based state class
Fixed cp0
Works again with PDSim
Closes https://github.com/CoolProp/CoolProp/issues/134

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-09 14:30:42 +02:00
Ian Bell
359fe8651c Merge pull request #106 from jjfPCSI1/master
Added information for Python/index.rst + Only one iterable in PropsSI calls
2014-09-09 08:43:06 +02:00
Ian Bell
ab88cea2bb Some work on python unit tests - convert or keep? Some of both probably.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-09-09 01:55:26 +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
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
Jean-Julien Fleck
058bfd79c4 Forwarded *args and **kwargs from Ts, Ph, ... to PropsPlot in order to be able to use unit_system='KSI' 2014-08-27 00:05:15 +02:00
Jean-Julien Fleck
5d24d83ad6 Limits correction back in place with KSI unit system 2014-08-26 23:42:18 +02:00
Jean-Julien Fleck
dda75cf04c KSI back in place, still have to find where to set the limits properly 2014-08-26 23:21:31 +02:00
Jean-Julien Fleck
1b33c2f492 Switched default to SI units 2014-08-26 21:44:52 +02:00
Jean-Julien Fleck
6d3330bda3 Corrected typo 2014-08-26 16:37:25 +02:00
Jean-Julien Fleck
58de416859 Added possibility to have only one iterable argument in PropsSI calls 2014-08-26 16:24:03 +02:00
Ian Bell
1d080878a7 ndarray_or_iterable is no longer exposed to python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 14:17:11 +02:00
Ian Bell
5cdb9c5d0e Changed all references to PropsSI in python plotting
See https://github.com/CoolProp/CoolProp/issues/116

Not sure this fixes things entirely, but it goes some way towards it.  Need to think a bit more about axis units

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-26 14:16:40 +02:00
Ian Bell
1cb23c5845 Fixed import/cimport issue
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 11:24:19 +02:00
Ian Bell
94cbeb5758 Fixed python wrappers usage of enums
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 09:11:55 +02:00
Ian Bell
8ddce50b8b Fixed some small errors in psych routines
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-21 00:51:45 +02:00
Ian Bell
1fea8bed8c Re-implemented Props() function in Python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-20 20:42:31 +02:00
Jean-Julien Joseph Fleck
1dc158a4c9 Added self._draw_graph() to new savefig() method 2014-08-20 16:34:58 +02:00
Ian Bell
b5f39490d6 Fixed imports and HAPropsSI python function
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 22:26:36 +02:00
Ian Bell
65283ce408 More work on psych props - still not working yet, something is hanging
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 22:25:26 +02:00
Ian Bell
f43a0b792b Humid air properties now use string instead of char*
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 21:55:23 +02:00
Ian Bell
47c3a49f78 Added savefig function to PropsPlot
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 21:15:18 +02:00
Ian Bell
e5df0d4d1f Fixed typo in CoolProp.pyx to close https://github.com/CoolProp/CoolProp/issues/102
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 21:10:14 +02:00
Ian Bell
467157f319 Python strings are all unicode everywhere, even python 27.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 14:09:15 +02:00
Ian Bell
b31e648d47 Dealt with some more unicode issues to close https://github.com/CoolProp/CoolProp/issues/100
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 13:47:29 +02:00
Ian Bell
e24c5c4652 Cython defaults to use bytes - closes https://github.com/CoolProp/CoolProp/issues/98
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 10:40:59 +02:00
Ian Bell
f6169b073e Removed double printing of inputs when errstring is printed in PropsSI
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-19 01:23:14 +02:00
Ian Bell
4041e88a5e Fully implemented, but a lot slower, why?
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-16 16:13:03 +02:00
Ian Bell
ee36d65eba Prepared prepare_pypi for CoolProp5 -> CoolProp reversion 2014-08-12 18:00:17 +02:00
Ian Bell
e4c8d3f061 Python wrapper is more or less back in action completely. Additional testing is required.
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 16:25:33 +02:00
Ian Bell
a98ef9c44a Renamed python module
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 15:09:38 +02:00
Ian Bell
802495cad3 Last commit before rename of python module to CoolProp
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 15:07:57 +02:00
Ian Bell
c594a3c3c8 Implemented 2-input form of PropsSI function again in Python
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 12:22:36 +02:00
Ian Bell
b7bd58d986 More work on flash routines, number of failures is rapidly decreasing - still have problems for low pressure sat_p calcs
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
2014-08-12 11:21:12 +02:00
Ian Bell
36d601490f Lots more work on melting curves, can now make pretty phase diagram for water including the melting line 2014-08-10 19:28:04 +02:00
Ian Bell
584b975b4b Fixed python files for py3.x I think, though I hate python 3 string handling 2014-08-07 23:27:37 +02:00