Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
fwitte committed Dec 6, 2024
2 parents a1880e7 + b200218 commit 23beebe
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 11 deletions.
4 changes: 1 addition & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ Documentation
You can find the full documentation at
`readthedocs <http://tespy.readthedocs.org>`_. Use the
`project site <http://readthedocs.org/projects/tespy>`_ of readthedocs to
choose the version of the documentation. Go to the
`download page <http://readthedocs.org/projects/tespy/downloads/>`_ to
download different versions and formats (pdf, html, epub) of the documentation.
choose the version of the documentation.

To get the latest news visit and follow our `website <https://www.oemof.org>`_.

Expand Down
1 change: 1 addition & 0 deletions docs/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ What's New

Discover notable new features and improvements in each release

.. include:: whats_new/v0-7-8-001.rst
.. include:: whats_new/v0-7-8.rst
.. include:: whats_new/v0-7-7.rst
.. include:: whats_new/v0-7-6-001.rst
Expand Down
10 changes: 10 additions & 0 deletions docs/whats_new/v0-7-8-001.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
v0.7.8.post1 - Newton's Nature (December, 06, 2024)
+++++++++++++++++++++++++++++++++++++++++++++++++++

Bug Fixes
#########
- Fixed a too low upper value boundary for the new :code:`dp` parameter.

Contributors
############
- Francesco Witte (`@fwitte <https://github.com/fwitte>`__)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exclude = ["docs/_build"]

[project]
name = "tespy"
version = "0.7.8"
version = "0.7.8.post1"
description = "Thermal Engineering Systems in Python (TESPy)"
readme = "README.rst"
authors = [
Expand Down
2 changes: 1 addition & 1 deletion src/tespy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os

__datapath__ = os.path.join(importlib.resources.files("tespy"), "data")
__version__ = '0.7.8 - Newton\'s Nature'
__version__ = '0.7.8.post1 - Newton\'s Nature'

# tespy data and connections import
from . import connections # noqa: F401
Expand Down
10 changes: 6 additions & 4 deletions src/tespy/components/heat_exchangers/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,12 @@ class HeatExchanger(Component):
Outlet to inlet pressure ratio at cold side, :math:`pr/1`.
dp1 : float, dict, :code:`"var"`
Inlet to outlet pressure delta at hot side, :math:`dp/\text{Pa}`.
Inlet to outlet pressure delta at hot side, unit is the network's
pressure unit!.
dp2 : float, dict, :code:`"var"`
Inlet to outlet pressure delta at cold side, :math:`dp/\text{Pa}`.
Inlet to outlet pressure delta at cold side, unit is the network's
pressure unit!.
zeta1 : float, dict, :code:`"var"`
Geometry independent friction coefficient at hot side,
Expand Down Expand Up @@ -255,11 +257,11 @@ def get_parameters(self):
deriv=self.pr_deriv, func=self.pr_func,
func_params={'pr': 'pr2', 'inconn': 1, 'outconn': 1}),
'dp1': dc_cp(
min_val=0, max_val=10000, num_eq=1,
min_val=0, max_val=1e15, num_eq=1,
deriv=self.dp_deriv, func=self.dp_func,
func_params={'dp': 'dp1', 'inconn': 0, 'outconn': 0}),
'dp2': dc_cp(
min_val=0, max_val=10000, num_eq=1,
min_val=0, max_val=1e15, num_eq=1,
deriv=self.dp_deriv, func=self.dp_func,
func_params={'dp': 'dp2', 'inconn': 1, 'outconn': 1}),
'zeta1': dc_cp(
Expand Down
6 changes: 4 additions & 2 deletions src/tespy/components/heat_exchangers/condenser.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,12 @@ class Condenser(HeatExchanger):
Outlet to inlet pressure ratio at cold side, :math:`pr/1`.
dp1 : float, dict, :code:`"var"`
Inlet to outlet pressure delta at hot side, :math:`dp/\text{Pa}`.
Inlet to outlet pressure delta at hot side, unit is the network's
pressure unit!.
dp2 : float, dict, :code:`"var"`
Inlet to outlet pressure delta at cold side, :math:`dp/\text{Pa}`.
Inlet to outlet pressure delta at cold side, unit is the network's
pressure unit!.
zeta1 : float, dict, :code:`"var"`
Geometry independent friction coefficient at hot side,
Expand Down

0 comments on commit 23beebe

Please sign in to comment.