Merge branch 'dev'

oemof · May 29, 2020 · 6e438cd · 6e438cd
2 parents 62ae6d1 + 2f97e9d
commit 6e438cd
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 95 deletions.
diff --git a/docs/whats_new.rst b/docs/whats_new.rst
@@ -8,6 +8,7 @@ Discover noteable new features and improvements in each release
     :local:
     :backlinks: top
 
+.. include::  whats_new/v0-3-1.rst
 .. include::  whats_new/v0-3-0.rst
 .. include::  whats_new/v0-2-2.rst
 .. include::  whats_new/v0-2-1.rst

diff --git a/docs/whats_new/v0-3-1.rst b/docs/whats_new/v0-3-1.rst
@@ -0,0 +1,11 @@
+v0.3.1 - Fix for Mayer's Merit (May, 29, 2020)
+++++++++++++++++++++++++++++++++++++++++++++++
+
+Bug fixes
+#########
+- Remove a debugging printout in the kA_func of the
+  :py:class:`tespy.components.heat_exchangers.heat_exchanger_simple` class.
+
+Contributors
+############
+- Francesco Witte (`@fwitte <https://github.com/fwitte>`_)
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@ def read(*names, **kwargs):
 
 setup(
     name='TESPy',
-    version='0.3.0',
+    version='0.3.1',
     license='MIT',
     description='Thermal Engineering Systems in Python (TESPy)',
     long_description='%s' % (

diff --git a/src/tespy/__init__.py b/src/tespy/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8
 
-__version__ = '0.3.0 - Mayer\'s Merit'
+__version__ = '0.3.1 - Mayer\'s Merit'
 
 # tespy data and connection import
 from . import connections  # noqa: F401

diff --git a/src/tespy/components/heat_exchangers.py b/src/tespy/components/heat_exchangers.py
@@ -647,8 +647,6 @@ def kA_func(self):
         else:
             td_log = 0
 
-        print(ttd_1, ttd_2)
-
         return i[0] * (o[2] - i[2]) + self.kA.val * td_log
 
     def kA_char_func(self):