Skip to content

Commit

Permalink
Release of versio 0.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
fwitte committed Dec 12, 2019
2 parents 7bc5f96 + 2a3ba2e commit 27ee027
Show file tree
Hide file tree
Showing 10 changed files with 242 additions and 131 deletions.
16 changes: 8 additions & 8 deletions doc/getting_started/tutorial_heat_pump.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ We will start with the consumer as the plant will be designed to deliver a speci
cb = cmp.source('consumer back flow')
cf = cmp.sink('consumer feed flow')
ves = cmp.sink('valve')
va = cmp.sink('valve')
# consumer system
Expand Down Expand Up @@ -82,9 +82,9 @@ In the next steps we will connect the components in order to form a network. Eve
# connection condenser - evaporator system
cd_ves = con.connection(cd, 'out1', ves, 'in1')
cd_va = con.connection(cd, 'out1', va, 'in1')
nw.add_conns(cd_ves)
nw.add_conns(cd_va)
Parametrization
Expand Down Expand Up @@ -160,7 +160,7 @@ This part contains of a valve followed by a drum with evaporator in forced flow
# evaporator system
ves = cmp.valve('valve')
va = cmp.valve('valve')
dr = cmp.drum('drum')
ev = cmp.heat_exchanger('evaporator')
su = cmp.heat_exchanger('superheater')
Expand All @@ -169,19 +169,19 @@ This part contains of a valve followed by a drum with evaporator in forced flow
Connections
+++++++++++

As we already redefined our variable "ves" to be a valve instead of a sink (see above), we do not need any adjustments to the connection between the condenser and the former sink "cd_ves". The valve connects to the drum at the inlet 'in1'. The pump of the forced flow evaporation system connects to the drum's outlet 'out1', the evaporator's cold side connects to the drum's inlet 'in2' and the superheater's cold side connects to the drum's outlet 'out2'. This will add the following connections to the model:
As we already redefined our variable "va" to be a valve instead of a sink (see above), we do not need any adjustments to the connection between the condenser and the former sink "cd_va". The valve connects to the drum at the inlet 'in1'. The pump of the forced flow evaporation system connects to the drum's outlet 'out1', the evaporator's cold side connects to the drum's inlet 'in2' and the superheater's cold side connects to the drum's outlet 'out2'. This will add the following connections to the model:

.. code-block:: python
# evaporator system
ves_dr = con.connection(ves, 'out1', dr, 'in1')
va_dr = con.connection(va, 'out1', dr, 'in1')
dr_pu = con.connection(dr, 'out1', pu, 'in1')
pu_ev = con.connection(pu, 'out1', ev, 'in2')
ev_dr = con.connection(ev, 'out2', dr, 'in2')
dr_su = con.connection(dr, 'out2', su, 'in2')
nw.add_conns(ves_dr, dr_pu, pu_ev, ev_dr, dr_su)
nw.add_conns(va_dr, dr_pu, pu_ev, ev_dr, dr_su)
amb_in_su = con.connection(amb_in, 'out1', su, 'in1')
su_ev = con.connection(su, 'out1', ev, 'in1')
Expand Down Expand Up @@ -215,7 +215,7 @@ Next step is the connetion parametrization: The pressure in the drum and the ent
# evaporator system cold side
pu_ev.set_attr(m=con.ref(ves_dr, 4, 0), p0=5)
pu_ev.set_attr(m=con.ref(va_dr, 4, 0), p0=5)
su_cp1.set_attr(p0=5, h0=1700)
# evaporator system hot side
Expand Down
1 change: 1 addition & 0 deletions doc/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Discover noteable new features and improvements in each release
:local:
:backlinks: top

.. include:: whats_new/v0-1-4.rst
.. include:: whats_new/v0-1-3.rst
.. include:: whats_new/v0-1-2.rst
.. include:: whats_new/v0-1-1.rst
Expand Down
28 changes: 28 additions & 0 deletions doc/whats_new/v0-1-4.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
v0.1.4 (December, 12, 2019)
+++++++++++++++++++++++++++

New Features
############
- Implemented difference pressure vs mass flow characteristic line for valve (`c4eec6d <https://github.com/oemof/tespy/commit/c4eec6d17ce7c8ce260a44757d37aa26214ae2b0>`_).

Documentation
#############
- Fix typos in docstrings in components module (`PR #102 <https://github.com/oemof/tespy/pull/102>`_).

Parameter renaming
##################

Testing
#######

Bug fixes
#########

Other changes
#############
- This is the last release before version 0.2.0.

Contributors
############

- Francesco Witte
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def read(fname):


setup(name='TESPy',
version='0.1.3',
version='0.1.4',
description='Thermal Engineering Systems in Python (TESPy)',
url='http://github.com/oemof/tespy',
author='Francesco Witte',
Expand Down
2 changes: 1 addition & 1 deletion tespy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.. moduleauthor:: Francesco Witte <francesco.witte@hs-flensburg.de>
"""
__version__ = '0.1.3'
__version__ = '0.1.4'

from tespy.components import characteristics as cmp_char, components as cmp, subsystems as subsys
from tespy import connections as con
Expand Down
Loading

0 comments on commit 27ee027

Please sign in to comment.