Skip to content

Commit ef10cb6

Browse files
committed
0.52.9 release; minor improvements
1 parent 926f78b commit ef10cb6

7 files changed

Lines changed: 21 additions & 11 deletions

File tree

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
name='thermosteam',
1212
packages=['thermosteam'],
1313
license='MIT',
14-
version='0.52.8',
14+
version='0.52.9',
1515
description="BioSTEAM's Premier Thermodynamic Engine",
1616
long_description=open('README.rst', encoding='utf-8').read(),
1717
author='Yoel Cortes-Pena',
1818
install_requires=['numpy==1.26.4',
1919
'pint==0.24.4',
2020
'scipy>=1.15.2',
21-
'thermo>=0.4.2',
21+
'thermo>=0.6.0',
2222
'IPython>=7.9.0',
2323
'colorpalette>=0.3.3',
2424
'pandas>=2.2.2',
2525
'matplotlib>=3.10.1',
2626
'xlrd>=1.2.0',
2727
'openpyxl>=3.0.0',
2828
'flexsolve>=0.5.9',
29-
'numba==0.60.0',
29+
'numba==0.62.1',
3030
'coolprop',
3131
'imageio',
3232
'pydot',

thermosteam/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
# update_module(chemicals, numba)
3232
# use_numba_chemicals()
3333
# del use_numba_chemicals
34-
__version__ = "0.52.8"
34+
__version__ = "0.52.9"
3535

3636
from . import thermo
3737
del thermo

thermosteam/_stream.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2898,7 +2898,17 @@ def _info_df(self, units, notation, composition, N_max, all_IDs, indexer, factor
28982898
return pd.DataFrame(data, columns=[self.ID.replace('_', ' ')],
28992899
index=pd.MultiIndex.from_tuples(index))
29002900

2901-
def _info(self, layout, T, P, flow, composition, N, IDs, sort=None, df=False):
2901+
def _info(self,
2902+
layout: Optional[str] = None,
2903+
T: Optional[str] = None,
2904+
P: Optional[str] = None,
2905+
flow: Optional[str] = None,
2906+
composition: Optional[bool] = None,
2907+
N: Optional[int] = None,
2908+
IDs: Optional[Sequence[str]] = None,
2909+
sort: Optional[bool] = None,
2910+
df: Optional[bool] = None
2911+
):
29022912
"""Return string with all specifications."""
29032913
units, notation = self.get_display_units_and_notation(
29042914
T=T, P=P, flow=flow)

thermosteam/base/functor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def from_obj(cls, data):
236236
return self
237237

238238
def __str__(self):
239-
return display_asfunctor(self)
239+
return display_asfunctor(self).replace(', **kwargs', '')
240240

241241
def __repr__(self):
242242
return f"<{self}>"

thermosteam/equilibrium/partition_coefficients.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ def __call__(self, y, x, T, P):
6262
)
6363

6464
def __repr__(self):
65-
chemicals = ", ".join([i.ID for i in self.fugacities[self.phases[0]].chemicals])
65+
chemicals = ", ".join([i.ID for i in self.fugacities_by_phase[self.phases[0]].chemicals])
6666
return f"{type(self).__name__}({self.phases!r}, [{chemicals}])"
6767

thermosteam/mixture/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ def eos_args(self, phase, mol, T, P):
665665
def Hvap(self, mol, T, P):
666666
phase = 'l'
667667
eos, _, _, eos_mol = self.eos_args(phase, mol, T, P)
668-
return (eos.Hvap(T) * eos_mol).sum()
668+
return eos.Hvap(T) * eos_mol
669669

670670
def dh_dep_dzs(self, phase, mol, T, P):
671671
if phase == 's': return 0 * mol
@@ -752,8 +752,8 @@ def from_chemicals(cls, chemicals, eos_chemical_index=None, cache=True):
752752
753753
>>> from thermosteam import PRMixture
754754
>>> mixture = PRMixture.from_chemicals(['Water', 'Ethanol'])
755-
>>> mixture.Hvap([0.2, 0.8], 350)
756-
39750.62
755+
>>> mixture.Hvap([0.2, 0.8], 350, 101325)
756+
39763.83
757757
758758
Calculate density for a water and ethanol mixture in g/L:
759759

thermosteam/mixture/ideal_mixture_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ class SinglePhaseIdealTPMixtureModel:
222222
223223
Examples
224224
--------
225-
>>> from thermosteam.mixture import SinglePhaseIdealTPMixtureModel
225+
>>> from thermosteam.mixture.ideal_mixture_model import SinglePhaseIdealTPMixtureModel
226226
>>> from thermosteam import Chemicals
227227
>>> chemicals = Chemicals(['Water', 'Ethanol'])
228228
>>> models = [i.V.l for i in chemicals]

0 commit comments

Comments
 (0)