pandapipes 0.8.4__zip → 0.9.0__zip

{pandapipes-0.8.4 → pandapipes-0.9.0}/.github/workflows/release.yml

@@ -75,28 +75,30 @@ jobs:
     needs: upload
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest python-igraph pytest-split numba
+          python -m pip install pytest igraph pytest-split
+          if [${{ matrix.python-version != '3.11' }}]; then python -m pip install numba; fi
+        shell: bash
       - name: Install pandapipes from TestPyPI
         if: ${{ inputs.upload_server == 'testpypi'}}
         run: |
-          pip install --no-cache-dir -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple pandapipes
+          python -m pip install --no-cache-dir -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple pandapipes
       - name: Install pandapipes from PyPI
         if: ${{ inputs.upload_server == 'pypi'}}
         run: |
-          pip install pandapipes
+          python -m pip install pandapipes
       - name: List all installed packages
         run: |
-          pip list
+          python -m pip list
       - name: Test with pytest
         run: |
           pytest --pyargs pandapipes.test

{pandapipes-0.8.4 → pandapipes-0.9.0}/.github/workflows/run_tests_develop.yml

@@ -14,36 +14,38 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+        os:  [ ubuntu-latest, windows-latest ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest python-igraph pytest-split numba
+          python -m pip install pytest igraph pytest-split
+          if [${{ matrix.python-version != '3.11' }}]; then python -m pip install numba; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
-          pip install .
+          python -m pip install .
+        shell: bash
       - name: List all installed packages
         run: |
-          pip list
+          python -m pip list
       - name: Test with pytest
         if: ${{ matrix.python-version != '3.9' }}
         run: |
-          pytest
+          python -m pytest
       - name: Test with pytest and Codecov
         if: ${{ matrix.python-version == '3.9' }}
         run: |
           python -m pip install pytest-cov
-          pytest --cov=./ --cov-report=xml
+          python -m pytest --cov=./ --cov-report=xml
       - name: Upload coverage to Codecov
         if: ${{ matrix.python-version == '3.9' }}
         uses: codecov/codecov-action@v1
@@ -51,16 +53,15 @@ jobs:
           verbose: true
 
   linting:
-
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.8']
-
+        python-version: ['3.10']
+        os:  [ ubuntu-latest, windows-latest ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -69,10 +70,11 @@ jobs:
           python -m pip install flake8
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
-          pip install .
+          python -m pip install .
+        shell: bash
       - name: List all installed packages
         run: |
-          pip list
+          python -m pip list
       - name: Lint with flake8 (syntax errors and undefinded names)
         run: |
           # stop the build if there are Python syntax errors or undefined names
@@ -83,39 +85,42 @@ jobs:
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
   tutorial_tests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+        os:  [ ubuntu-latest, windows-latest ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest nbmake pytest-xdist pytest-split python-igraph numba 
+          python -m pip install pytest nbmake pytest-xdist pytest-split igraph
+          if [${{ matrix.python-version != '3.11' }}]; then python -m pip install numba; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
-          pip install .
+          python -m pip install .
+        shell: bash
       - name: List all installed packages
         run: |
-          pip list
+          python -m pip list
       - name: Test with pytest
         run: |
-          pytest --nbmake -n=auto "./tutorials"
+          python -m pytest --nbmake -n=auto "./tutorials"
 
   docs_check:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.8' ]
+        python-version: [ '3.10' ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Check docs for Python ${{ matrix.python-version }}

{pandapipes-0.8.4 → pandapipes-0.9.0}/.github/workflows/run_tests_master.yml

@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-# pandapipes-master branch has to work with pandapower-master branch
+# pandapipes-master branch is designed to work with pandapower-master branch
 
 name: ppipes_master
 
@@ -13,37 +13,38 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+        os:  [ ubuntu-latest, windows-latest ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest python-igraph pytest-split numba
+          python -m pip install pytest igraph pytest-split
+          if [${{ matrix.python-version != '3.11' }}]; then python -m pip install numba; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower
-          pip install .
+          python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower;
+          python -m pip install .
+        shell: bash
       - name: List all installed packages
         run: |
-          pip list
+          python -m pip list
       - name: Test with pytest
         if: ${{ matrix.python-version != '3.9' }}
         run: |
-          pytest
+          python -m pytest
       - name: Test with pytest and Codecov
         if: ${{ matrix.python-version == '3.9' }}
         run: |
           python -m pip install pytest-cov
-          pytest --cov=./ --cov-report=xml
+          python -m pytest --cov=./ --cov-report=xml
       - name: Upload coverage to Codecov
         if: ${{ matrix.python-version == '3.9' }}
         uses: codecov/codecov-action@v1
@@ -51,39 +52,42 @@ jobs:
           verbose: true
 
   tutorial_tests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+        os:  [ ubuntu-latest, windows-latest ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest nbmake pytest-xdist pytest-split python-igraph numba 
+          python -m pip install pytest nbmake pytest-xdist pytest-split igraph
+          if [${{ matrix.python-version != '3.11' }}]; then python -m pip install numba; fi
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
           python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower
-          pip install .
+          python -m pip install .
+        shell: bash
       - name: List all installed packages
         run: |
-          pip list
+          python -m pip list
       - name: Test with pytest
         run: |
-          pytest --nbmake -n=auto "./tutorials"
+          python -m pytest --nbmake -n=auto "./tutorials"
 
   docs_check:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ '3.8' ]
+        python-version: [ '3.10' ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Check docs for Python ${{ matrix.python-version }}

{pandapipes-0.8.4 → pandapipes-0.9.0}/AUTHORS

@@ -1,9 +1,9 @@
-Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
+Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
 and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.
 
 Lead Developers:
     - Daniel Lohmeier
-    - Simon Ruben Drauz
+    - Simon Ruben Drauz-Mauel
     - Jolando Marius Kisse
     
 Main Contributors:

{pandapipes-0.8.4 → pandapipes-0.9.0}/CHANGELOG.rst

@@ -1,6 +1,40 @@
 Change Log
 =============
 
+[0.9.0] - 2023-12-22
+-------------------------------
+
+- [ADDED] multiple creation of heat exchanger
+- [ADDED] support Python 3.11 (now included in test pipeline)
+- [ADDED] after the connectivity check, intercept the pipeflow if no more nodes are in-service (heat and hydraulic)
+- [ADDED] adding biomethane (pure and treated) as additonal fluid
+- [ADDED] result tables can be assembled modularly
+- [CHANGED] dropped support for Python 3.7 (no longer included in test pipeline)
+- [CHANGED] connectivity check now separated by hydraulics and heat_transfer calculation, so that also results can differ in some rows (NaN or not)
+- [CHANGED] dynamic creation of lookups for getting pit as pandas tables
+- [CHANGED] components can have their own internal arrays for specific calculations (e.g. for compressor pressure ratio), so that the pit does not need to include such component specific entries
+- [CHANGED] .readthedocs.yml due to deprecation
+- [CHANGED] changing from setuptools flat-layout into src-layout
+- [CHANGED] calculate thermal derivative globally, adaptions before/after can be done component-wise
+- [CHANGED] moving 'PipeflowNotConverged' error from pipeflow to pipeflow_setup
+- [CHANGED] moving 'result_extraction' under pf folder
+- [FIXED] in STANET converter: bug fix for heat exchanger creation and external temperatures of pipes added
+- [FIXED] build igraph considers all components
+- [FIXED] creating nxgraph and considering pressure circulation pumps correctly
+- [FIXED] error in tutorial 'circular flow in a district heating grid'
+- [FIXED] caused error during 'pip install pandapipes'
+- [REMOVED] broken travis badge removed from readme
+- [REMOVED] branch TINIT removed as it is not a solution variable, temperature determined on the fly
+- [REMOVED] 'converged' setting from options
+
+[0.8.5] - 2023-06-19
+-------------------------------
+- [FIXED] consider ambient pressure in calculation of compression power for pumps/compressors
+- [FIXED] np.bool error in pipeflow calculation due to deprecation of np.bool
+- [FIXED] use igraph package instead of python-igraph (has been renamed)
+- [ADDED] gas specific calculation of heat capacity ration kappa = cp/cv (for pumps/compressors)
+- [REMOVED] Python 3.7 removed from test pipeline due to inconsistencies with pandapower
+
 [0.8.4] - 2023-02-02
 -------------------------------
 - [FIXED] added flow control to nxgraph

{pandapipes-0.8.4 → pandapipes-0.9.0}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
+Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
 and Energy System Technology (IEE), Kassel, and University of Kassel. Further
 contributions by individual contributors (see AUTHORS file for details). All rights reserved.
 

pandapipes-0.9.0/MANIFEST.in

@@ -0,0 +1,3 @@
+graft src
+
+include LICENSE AUTHORS README.rst CHANGELOG.rst .github/**/*.yml

{pandapipes-0.8.4 → pandapipes-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pandapipes
-Version: 0.8.4
+Version: 0.9.0
 Summary: A pipeflow calculation tool that complements pandapower in the simulation of multi energy grids
 Home-page: http://www.pandapipes.org
 Author: Simon Ruben Drauz-Mauel, Daniel Lohmeier, Jolando Marius Kisse
@@ -16,10 +16,10 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.11
 Description-Content-Type: text/x-rst
 Provides-Extra: docs
 Provides-Extra: plotting
@@ -47,10 +47,6 @@ License-File: LICENSE
    :target: http://pandapipes.readthedocs.io/
    :alt: docs
 
-.. image:: https://travis-ci.org/e2nIEE/pandapipes.svg?branch=master
-   :target: https://travis-ci.org/e2nIEE/pandapipes/branches
-   :alt: travis
-
 .. image:: https://codecov.io/gh/e2nIEE/pandapipes/branch/master/graph/badge.svg
    :target: https://codecov.io/github/e2nIEE/pandapipes?branch=master
    :alt: codecov
@@ -114,6 +110,40 @@ the `pandapipes contribution guidelines <https://github.com/e2nIEE/pandapipes/bl
 Change Log
 =============
 
+[0.9.0] - 2023-12-22
+-------------------------------
+
+- [ADDED] multiple creation of heat exchanger
+- [ADDED] support Python 3.11 (now included in test pipeline)
+- [ADDED] after the connectivity check, intercept the pipeflow if no more nodes are in-service (heat and hydraulic)
+- [ADDED] adding biomethane (pure and treated) as additonal fluid
+- [ADDED] result tables can be assembled modularly
+- [CHANGED] dropped support for Python 3.7 (no longer included in test pipeline)
+- [CHANGED] connectivity check now separated by hydraulics and heat_transfer calculation, so that also results can differ in some rows (NaN or not)
+- [CHANGED] dynamic creation of lookups for getting pit as pandas tables
+- [CHANGED] components can have their own internal arrays for specific calculations (e.g. for compressor pressure ratio), so that the pit does not need to include such component specific entries
+- [CHANGED] .readthedocs.yml due to deprecation
+- [CHANGED] changing from setuptools flat-layout into src-layout
+- [CHANGED] calculate thermal derivative globally, adaptions before/after can be done component-wise
+- [CHANGED] moving 'PipeflowNotConverged' error from pipeflow to pipeflow_setup
+- [CHANGED] moving 'result_extraction' under pf folder
+- [FIXED] in STANET converter: bug fix for heat exchanger creation and external temperatures of pipes added
+- [FIXED] build igraph considers all components
+- [FIXED] creating nxgraph and considering pressure circulation pumps correctly
+- [FIXED] error in tutorial 'circular flow in a district heating grid'
+- [FIXED] caused error during 'pip install pandapipes'
+- [REMOVED] broken travis badge removed from readme
+- [REMOVED] branch TINIT removed as it is not a solution variable, temperature determined on the fly
+- [REMOVED] 'converged' setting from options
+
+[0.8.5] - 2023-06-19
+-------------------------------
+- [FIXED] consider ambient pressure in calculation of compression power for pumps/compressors
+- [FIXED] np.bool error in pipeflow calculation due to deprecation of np.bool
+- [FIXED] use igraph package instead of python-igraph (has been renamed)
+- [ADDED] gas specific calculation of heat capacity ration kappa = cp/cv (for pumps/compressors)
+- [REMOVED] Python 3.7 removed from test pipeline due to inconsistencies with pandapower
+
 [0.8.4] - 2023-02-02
 -------------------------------
 - [FIXED] added flow control to nxgraph

{pandapipes-0.8.4 → pandapipes-0.9.0}/README.rst

@@ -18,10 +18,6 @@
    :target: http://pandapipes.readthedocs.io/
    :alt: docs
 
-.. image:: https://travis-ci.org/e2nIEE/pandapipes.svg?branch=master
-   :target: https://travis-ci.org/e2nIEE/pandapipes/branches
-   :alt: travis
-
 .. image:: https://codecov.io/gh/e2nIEE/pandapipes/branch/master/graph/badge.svg
    :target: https://codecov.io/github/e2nIEE/pandapipes?branch=master
    :alt: codecov

{pandapipes-0.8.4 → pandapipes-0.9.0}/setup.py

@@ -1,11 +1,12 @@
-# Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
+# Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
-from setuptools import find_packages
-from setuptools import setup
 import re
 
+from setuptools import find_namespace_packages
+from setuptools import setup
+
 with open('README.rst', 'rb') as f:
     install = f.read().decode('utf-8')
 
@@ -26,7 +27,7 @@ classifiers = [
 
 with open('.github/workflows/run_tests_master.yml', 'rb') as f:
     lines = f.read().decode('utf-8')
-    versions = set(re.findall('3.[7-9]', lines)) | set(re.findall('3.1[0-9]', lines))
+    versions = set(re.findall('3.[8-9]', lines)) | set(re.findall('3.1[0-9]', lines))
     for version in versions:
         classifiers.append('Programming Language :: Python :: %s' % version)
 
@@ -34,22 +35,23 @@ long_description = '\n\n'.join((install, changelog))
 
 setup(
     name='pandapipes',
-    version='0.8.4',
+    version='0.9.0',
     author='Simon Ruben Drauz-Mauel, Daniel Lohmeier, Jolando Marius Kisse',
     author_email='simon.ruben.drauz-mauel@iee.fraunhofer.de, daniel.lohmeier@retoflow.de, '
                  'jolando.kisse@uni-kassel.de',
     description='A pipeflow calculation tool that complements pandapower in the simulation of multi energy grids',
     long_description=long_description,
-	long_description_content_type='text/x-rst',
+    long_description_content_type='text/x-rst',
     url='http://www.pandapipes.org',
     license='BSD',
-    install_requires=["pandapower>=2.11.1", "matplotlib", "shapely"],
+    install_requires=["pandapower>=2.13.1", "matplotlib", "shapely"],
     extras_require={"docs": ["numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex"],
-                    "plotting": ["plotly", "python-igraph"],
+                    "plotting": ["plotly", "igraph"],
                     "test": ["pytest", "pytest-xdist", "nbmake"],
                     "all": ["numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex",
-                            "plotly", "python-igraph", "pytest", "pytest-xdist", "nbmake"]},
-    packages=find_packages(),
+                            "plotly", "igraph", "pytest", "pytest-xdist", "nbmake"]},
+    packages=find_namespace_packages(where='src'),
+    package_dir={"": "src"},
     include_package_data=True,
     classifiers=classifiers
 )

{pandapipes-0.8.4 → pandapipes-0.9.0/src}/pandapipes/__init__.py

@@ -1,8 +1,8 @@
-# Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
+# Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
-__version__ = '0.8.4'
+__version__ = '0.9.0'
 __format_version__ = '0.8.0'
 
 import pandas as pd

{pandapipes-0.8.4 → pandapipes-0.9.0/src}/pandapipes/component_models/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
+# Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 

{pandapipes-0.8.4 → pandapipes-0.9.0/src}/pandapipes/component_models/abstract_models/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
+# Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 

{pandapipes-0.8.4 → pandapipes-0.9.0/src}/pandapipes/component_models/abstract_models/base_component.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
+# Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
 # and Energy System Technology (IEE), Kassel, and University of Kassel. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
@@ -33,7 +33,7 @@ class Component:
         return res_table
 
     @classmethod
-    def extract_results(cls, net, options, branch_results, nodes_connected, branches_connected):
+    def extract_results(cls, net, options, branch_results, mode):
         """
         Function that extracts certain results.
 
@@ -43,10 +43,8 @@ class Component:
         :type options:
         :param branch_results:
         :type branch_results:
-        :param nodes_connected:
-        :type nodes_connected:
-        :param branches_connected:
-        :type branches_connected:
+        :param mode:
+        :type mode:
         :return: No Output.
         """
         raise NotImplementedError
@@ -80,6 +78,15 @@ class Component:
     def adaption_after_derivatives_hydraulic(cls, net, branch_pit, node_pit, idx_lookups, options):
         pass
 
+    @classmethod
+    def adaption_before_derivatives_thermal(cls, net, branch_pit, node_pit, idx_lookups, options):
+        pass
+
+    @classmethod
+    def adaption_after_derivatives_thermal(cls, net, branch_pit, node_pit, idx_lookups, options):
+        pass
+
+
     @classmethod
     def create_node_lookups(cls, net, ft_lookups, table_lookup, idx_lookups, current_start,
                             current_table, internal_nodes_lookup):
@@ -128,65 +135,43 @@ class Component:
         return current_start, current_table
 
     @classmethod
-    def create_pit_node_entries(cls, net, node_pit):
+    def create_component_array(cls, net, component_pits):
         """
-        Function which creates pit branch entries.
+        Function which creates an internal array of the component in analogy to the pit, but with
+        component specific entries, that are not needed in the pit.
 
         :param net: The pandapipes network
         :type net: pandapipesNet
-        :param node_pit:
-        :type node_pit:
-        :return: No Output.
+        :param component_pits: dictionary of component specific arrays
+        :type component_pits: dict
+        :return:
+        :rtype:
         """
         pass
 
     @classmethod
-    def create_pit_branch_entries(cls, net, branch_pit):
+    def create_pit_node_entries(cls, net, node_pit):
         """
         Function which creates pit branch entries.
 
         :param net: The pandapipes network
         :type net: pandapipesNet
-        :param branch_pit:
-        :type branch_pit:
-        :return: No Output.
-        """
-        pass
-
-    @classmethod
-    def calculate_derivatives_hydraulic(cls, net, branch_pit, node_pit, idx_lookups, options):
-        """
-        Function which creates derivatives.
-
-        :param net: The pandapipes network
-        :type net: pandapipesNet
-        :param branch_pit:
-        :type branch_pit:
         :param node_pit:
         :type node_pit:
-        :param idx_lookups:
-        :type idx_lookups:
-        :param options:
-        :type options:
         :return: No Output.
         """
         pass
 
     @classmethod
-    def calculate_derivatives_thermal(cls, net, branch_pit, node_pit, idx_lookups, options):
+    def create_pit_branch_entries(cls, net, branch_pit):
         """
-        Function which creates derivatives.
+        Function which creates pit branch entries.
 
         :param net: The pandapipes network
         :type net: pandapipesNet
         :param branch_pit:
         :type branch_pit:
-        :param node_pit:
-        :type node_pit:
-        :param idx_lookups:
-        :type idx_lookups:
-        :param options:
-        :type options:
         :return: No Output.
         """
         pass
+