pandapipes 0.9.0__zip → 0.10.0__zip

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

@@ -99,7 +99,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest nbmake pytest-xdist pytest-split igraph
+          python -m pip install pytest==8.0.2 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

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

@@ -66,7 +66,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          python -m pip install pytest nbmake pytest-xdist pytest-split igraph
+          python -m pip install pytest==8.0.2 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

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

@@ -1,6 +1,25 @@
 Change Log
 =============
 
+[0.10.0] - 2024-04-09
+-------------------------------
+
+- [ADDED] function for plotting pressure profile
+- [ADDED] function for calculating distance to junctions
+- [ADDED] topology function for returning unsupplied junctions
+- [ADDED] topology function for returning elements on path
+- [ADDED] function for getting all branch-component table names
+- [ADDED] function for getting all branch-component models
+- [ADDED] component 'heat_consumer' that combines the two components heat_exchanger and flow_control
+- [CHANGED] moving generalizing pit entries up from specific components to the abstract class
+- [CHANGED] 'JAC_DERIV_DT1' to 'JAC_DERIV_DTOUT'
+- [CHANGED] solving for minit instead of vinit
+- [CHANGED] distinct max. iteration settings for hydraulic and thermal calculation
+- [CHANGED] default tolerances from 1e-4 to 1e-5
+- [FIXED] results of old grid are wrong, pipeflow needs to be conducted again
+- [FIXED] taking norm density instead of real density in Darcy-Weisbach equation
+- [FIXED] in circulation pumps only junctions in-service are considered
+
 [0.9.0] - 2023-12-22
 -------------------------------
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pandapipes
-Version: 0.9.0
+Version: 0.10.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
@@ -17,9 +17,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.8
 Description-Content-Type: text/x-rst
 Provides-Extra: docs
 Provides-Extra: plotting
@@ -110,6 +110,25 @@ the `pandapipes contribution guidelines <https://github.com/e2nIEE/pandapipes/bl
 Change Log
 =============
 
+[0.10.0] - 2024-04-09
+-------------------------------
+
+- [ADDED] function for plotting pressure profile
+- [ADDED] function for calculating distance to junctions
+- [ADDED] topology function for returning unsupplied junctions
+- [ADDED] topology function for returning elements on path
+- [ADDED] function for getting all branch-component table names
+- [ADDED] function for getting all branch-component models
+- [ADDED] component 'heat_consumer' that combines the two components heat_exchanger and flow_control
+- [CHANGED] moving generalizing pit entries up from specific components to the abstract class
+- [CHANGED] 'JAC_DERIV_DT1' to 'JAC_DERIV_DTOUT'
+- [CHANGED] solving for minit instead of vinit
+- [CHANGED] distinct max. iteration settings for hydraulic and thermal calculation
+- [CHANGED] default tolerances from 1e-4 to 1e-5
+- [FIXED] results of old grid are wrong, pipeflow needs to be conducted again
+- [FIXED] taking norm density instead of real density in Darcy-Weisbach equation
+- [FIXED] in circulation pumps only junctions in-service are considered
+
 [0.9.0] - 2023-12-22
 -------------------------------
 

{pandapipes-0.9.0 → pandapipes-0.10.0}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-description-file = installation.rst
+description_file = installation.rst
 license_file = LICENSE
 
 [egg_info]

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

@@ -35,7 +35,7 @@ long_description = '\n\n'.join((install, changelog))
 
 setup(
     name='pandapipes',
-    version='0.9.0',
+    version='0.10.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',
@@ -44,7 +44,7 @@ setup(
     long_description_content_type='text/x-rst',
     url='http://www.pandapipes.org',
     license='BSD',
-    install_requires=["pandapower>=2.13.1", "matplotlib", "shapely"],
+    install_requires=["pandapower>=2.14.6", "matplotlib", "shapely"],
     extras_require={"docs": ["numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex"],
                     "plotting": ["plotly", "igraph"],
                     "test": ["pytest", "pytest-xdist", "nbmake"],

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

@@ -2,8 +2,8 @@
 # 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.9.0'
-__format_version__ = '0.8.0'
+__version__ = '0.10.0'
+__format_version__ = '0.10.0'
 
 import pandas as pd
 import os

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/abstract_models/branch_models.py

@@ -5,7 +5,7 @@
 import numpy as np
 
 from pandapipes.component_models.abstract_models.base_component import Component
-from pandapipes.idx_branch import VINIT, branch_cols
+from pandapipes.idx_branch import MDOTINIT, branch_cols
 from pandapipes.pf.pipeflow_setup import get_table_number, get_lookup
 
 try:
@@ -88,7 +88,7 @@ class BranchComponent(Component):
         from_nodes = junction_idx_lookup[net[cls.table_name()][fn_col].values]
         to_nodes = junction_idx_lookup[net[cls.table_name()][tn_col].values]
         branch_component_pit[:, :] = np.array([branch_table_nr] + [0] * (branch_cols - 1))
-        branch_component_pit[:, VINIT] = 0.1
+        branch_component_pit[:, MDOTINIT] = 0.1
         return branch_component_pit, node_pit, from_nodes, to_nodes
 
     @classmethod

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/abstract_models/branch_w_internals_models.py

@@ -5,11 +5,12 @@
 import numpy as np
 
 from pandapipes.component_models.abstract_models.branch_models import BranchComponent
-from pandapipes.component_models.component_toolbox import set_entry_check_repeat
-from pandapipes.idx_branch import ACTIVE, FROM_NODE, TO_NODE, RHO, ETA, CP, ELEMENT_IDX, TOUTINIT
-from pandapipes.idx_node import L, node_cols, TINIT as TINIT_NODE
+from pandapipes.component_models.component_toolbox import set_entry_check_repeat, vinterp, \
+    p_correction_height_air
+from pandapipes.idx_branch import ACTIVE, FROM_NODE, FROM_NODE_T, TO_NODE, TO_NODE_T, TOUTINIT, ELEMENT_IDX, TOUTINIT
+from pandapipes.idx_node import (L, node_cols, TINIT as TINIT_NODE, HEIGHT, PINIT, PAMB,
+                                 ACTIVE as ACTIVE_ND)
 from pandapipes.pf.pipeflow_setup import add_table_lookup, get_lookup, get_table_number
-from pandapipes.properties.fluids import get_fluid
 
 try:
     import pandaplan.core.pplog as logging
@@ -158,6 +159,17 @@ class BranchWInternalsComponent(BranchComponent):
         junction_indices = get_lookup(net, "node", "index")[junction_table_name]
         fj_nodes = junction_indices[from_junctions]
         tj_nodes = junction_indices[to_junctions]
+
+        int_node_pit[:, HEIGHT] = vinterp(junction_pit[fj_nodes, HEIGHT],
+                                          junction_pit[tj_nodes, HEIGHT], int_node_number)
+        int_node_pit[:, PINIT] = vinterp(junction_pit[fj_nodes, PINIT],
+                                         junction_pit[tj_nodes, PINIT], int_node_number)
+        int_node_pit[:, TINIT_NODE] = vinterp(junction_pit[fj_nodes, TINIT_NODE],
+                                              junction_pit[tj_nodes, TINIT_NODE],
+                                              int_node_number)
+        int_node_pit[:, PAMB] = p_correction_height_air(int_node_pit[:, HEIGHT])
+        int_node_pit[:, ACTIVE_ND] = \
+            np.repeat(net[cls.table_name()][cls.active_identifier()].values, int_node_number)
         return table_nr, int_node_number, int_node_pit, junction_pit, fj_nodes, tj_nodes
 
     @classmethod
@@ -195,13 +207,10 @@ class BranchWInternalsComponent(BranchComponent):
             branch_w_internals_pit, ACTIVE, net[cls.table_name()][cls.active_identifier()].values,
             internal_pipe_number, has_internals)
         branch_w_internals_pit[:, FROM_NODE] = from_nodes
+        branch_w_internals_pit[:, FROM_NODE_T] = from_nodes
         branch_w_internals_pit[:, TO_NODE] = to_nodes
+        branch_w_internals_pit[:, TO_NODE_T] = to_nodes
         branch_w_internals_pit[:, TOUTINIT] = node_pit[to_nodes, TINIT_NODE]
-        tm = (node_pit[from_nodes, TINIT_NODE] + branch_w_internals_pit[:, TOUTINIT]) / 2
-        fluid = get_fluid(net)
-        branch_w_internals_pit[:, RHO] = fluid.get_density(tm)
-        branch_w_internals_pit[:, ETA] = fluid.get_viscosity(tm)
-        branch_w_internals_pit[:, CP] = fluid.get_heat_capacity(tm)
         return branch_w_internals_pit, internal_pipe_number
 
     @classmethod

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/abstract_models/branch_wo_internals_models.py

@@ -4,11 +4,10 @@
 
 from pandapipes.component_models.abstract_models.branch_models import BranchComponent
 
-from pandapipes.idx_branch import FROM_NODE, TO_NODE, TOUTINIT, ELEMENT_IDX, RHO, ETA, CP, ACTIVE
+from pandapipes.idx_branch import FROM_NODE, FROM_NODE_T, TO_NODE, TO_NODE_T, TOUTINIT, ELEMENT_IDX, ACTIVE
 from pandapipes.idx_node import TINIT as TINIT_NODE
 
 from pandapipes.pf.pipeflow_setup import add_table_lookup
-from pandapipes.properties.fluids import get_fluid
 
 try:
     import pandaplan.core.pplog as logging
@@ -81,13 +80,10 @@ class BranchWOInternalsComponent(BranchComponent):
             = super().create_pit_branch_entries(net, branch_pit)
         branch_wo_internals_pit[:, ELEMENT_IDX] = net[cls.table_name()].index.values
         branch_wo_internals_pit[:, FROM_NODE] = from_nodes
+        branch_wo_internals_pit[:, FROM_NODE_T] = from_nodes
         branch_wo_internals_pit[:, TO_NODE] = to_nodes
+        branch_wo_internals_pit[:, TO_NODE_T] = to_nodes
         branch_wo_internals_pit[:, TOUTINIT] = node_pit[to_nodes, TINIT_NODE]
-        tm = (node_pit[from_nodes, TINIT_NODE] + branch_wo_internals_pit[:, TOUTINIT]) / 2
-        fluid = get_fluid(net)
-        branch_wo_internals_pit[:, RHO] = fluid.get_density(tm)
-        branch_wo_internals_pit[:, ETA] = fluid.get_viscosity(tm)
-        branch_wo_internals_pit[:, CP] = fluid.get_heat_capacity(tm)
         branch_wo_internals_pit[:, ACTIVE] = net[cls.table_name()][cls.active_identifier()].values
         return branch_wo_internals_pit
 

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/abstract_models/branch_wzerolength_models.py

@@ -4,7 +4,7 @@
 
 from pandapipes.component_models.abstract_models.branch_wo_internals_models import \
     BranchWOInternalsComponent
-from pandapipes.idx_branch import LENGTH, K
+from pandapipes.idx_branch import LENGTH, K, TEXT, ALPHA
 
 try:
     import pandaplan.core.pplog as logging
@@ -58,6 +58,8 @@ class BranchWZeroLengthComponent(BranchWOInternalsComponent):
             super().create_pit_branch_entries(net, branch_pit)
         branch_wzerolength_pit[:, LENGTH] = 0
         branch_wzerolength_pit[:, K] = 1000
+        branch_wzerolength_pit[:, TEXT] = 293.15
+        branch_wzerolength_pit[:, ALPHA] = 0
         return branch_wzerolength_pit
 
     @classmethod

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/abstract_models/circulation_pump.py

@@ -68,7 +68,7 @@ class CirculationPump(BranchWZeroLengthComponent):
         """
         circ_pump_tbl = net[cls.table_name()][net[cls.table_name()][cls.active_identifier()].values]
 
-        junction = net[cls.table_name()][cls.from_to_node_cols()[1]].values
+        junction = circ_pump_tbl[cls.from_to_node_cols()[1]].values
 
         # TODO: there should be a warning, if any p_bar value is not given or any of the types does
         #       not contain "p", as this should not be allowed for this component

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/compressor_component.py

@@ -8,7 +8,7 @@ from numpy import dtype
 from pandapipes.component_models.component_toolbox import get_component_array
 from pandapipes.component_models.junction_component import Junction
 from pandapipes.component_models.pump_component import Pump
-from pandapipes.idx_branch import VINIT, D, AREA, LOSS_COEFFICIENT as LC, FROM_NODE, PL
+from pandapipes.idx_branch import MDOTINIT, D, AREA, LOSS_COEFFICIENT as LC, FROM_NODE, PL
 from pandapipes.idx_node import PINIT, PAMB
 
 
@@ -76,8 +76,8 @@ class Compressor(Pump):
         p_to_calc = p_from * compressor_array[:, cls.PRESSURE_RATIO]
         pl_abs = p_to_calc - p_from
 
-        v_mps = compressor_branch_pit[:, VINIT]
-        pl_abs[v_mps < 0] = 0  # force pressure lift = 0 for reverse flow
+        m_mps = compressor_branch_pit[:, MDOTINIT]
+        pl_abs[m_mps < 0] = 0  # force pressure lift = 0 for reverse flow
 
         compressor_branch_pit[:, PL] = pl_abs
 

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/flow_control_component.py

@@ -5,12 +5,12 @@
 import numpy as np
 from numpy import dtype
 
-from pandapipes.component_models.abstract_models import BranchWZeroLengthComponent, get_fluid
+from pandapipes.component_models.abstract_models import BranchWZeroLengthComponent
+from pandapipes.properties import get_fluid
 from pandapipes.component_models.component_toolbox import \
     standard_branch_wo_internals_result_lookup, get_component_array
 from pandapipes.component_models.junction_component import Junction
-from pandapipes.idx_branch import D, AREA, JAC_DERIV_DP, JAC_DERIV_DP1, JAC_DERIV_DV, VINIT, \
-    RHO, LOAD_VEC_BRANCHES
+from pandapipes.idx_branch import D, AREA, JAC_DERIV_DP, JAC_DERIV_DP1, JAC_DERIV_DM, MDOTINIT, LOAD_VEC_BRANCHES
 from pandapipes.pf.result_extraction import extract_branch_results_without_internals
 
 
@@ -51,8 +51,7 @@ class FlowControlComponent(BranchWZeroLengthComponent):
         fc_branch_pit = super().create_pit_branch_entries(net, branch_pit)
         fc_branch_pit[:, D] = net[cls.table_name()].diameter_m.values
         fc_branch_pit[:, AREA] = fc_branch_pit[:, D] ** 2 * np.pi / 4
-        fc_branch_pit[:, VINIT] = net[cls.table_name()].controlled_mdot_kg_per_s.values / \
-            (fc_branch_pit[:, AREA] * fc_branch_pit[:, RHO])
+        fc_branch_pit[:, MDOTINIT] = net[cls.table_name()].controlled_mdot_kg_per_s.values
 
     @classmethod
     def create_component_array(cls, net, component_pits):
@@ -83,7 +82,7 @@ class FlowControlComponent(BranchWZeroLengthComponent):
         active = fc_array[:, cls.CONTROL_ACTIVE].astype(np.bool_)
         fc_branch_pit[active, JAC_DERIV_DP] = 0
         fc_branch_pit[active, JAC_DERIV_DP1] = 0
-        fc_branch_pit[active, JAC_DERIV_DV] = 1
+        fc_branch_pit[active, JAC_DERIV_DM] = 1
         fc_branch_pit[active, LOAD_VEC_BRANCHES] = 0
 
     @classmethod

pandapipes-0.10.0/src/pandapipes/component_models/heat_consumer_component.py

@@ -0,0 +1,228 @@
+# Copyright (c) 2020-2023 by Fraunhofer Institute for Energy Economics
+# and Energy System Technology (IEE), Kassel. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+
+import numpy as np
+from numpy import dtype
+
+from pandapipes.component_models import get_fluid, \
+    BranchWZeroLengthComponent, get_component_array, standard_branch_wo_internals_result_lookup
+from pandapipes.component_models.junction_component import Junction
+from pandapipes.idx_branch import D, AREA, MDOTINIT, QEXT, JAC_DERIV_DP1, \
+                                   JAC_DERIV_DM, JAC_DERIV_DP, LOAD_VEC_BRANCHES
+from pandapipes.pf.result_extraction import extract_branch_results_without_internals
+
+
+class HeatConsumer(BranchWZeroLengthComponent):
+    """
+
+    """
+    # columns for internal array
+    MASS = 0
+    QEXT = 1
+    DELTAT = 2
+    TRETURN = 3
+    MODE = 4
+
+    internal_cols = 5
+
+    # numbering of given parameters (for mdot, qext, deltat, treturn)
+    MF = 0
+    QE = 1
+    DT = 2
+    TR = 3
+
+    # heat consumer modes (sum of combinations of given parameters)
+    MF_QE = 1
+    MF_DT = 2
+    MF_TR = 4
+    QE_DT = 3
+    QE_TR = 5
+
+    @classmethod
+    def table_name(cls):
+        return "heat_consumer"
+
+    @classmethod
+    def get_connected_node_type(cls):
+        return Junction
+
+    @classmethod
+    def from_to_node_cols(cls):
+        return "from_junction", "to_junction"
+
+    @classmethod
+    def active_identifier(cls):
+        return "in_service"
+
+    @classmethod
+    def create_pit_branch_entries(cls, net, branch_pit):
+        """
+        Function which creates pit branch entries with a specific table.
+        :param net: The pandapipes network
+        :type net: pandapipesNet
+        :param branch_pit:
+        :type branch_pit:
+        :return: No Output.
+        """
+        hs_pit = super().create_pit_branch_entries(net, branch_pit)
+        hs_pit[:, D] = net[cls.table_name()].diameter_m.values
+        hs_pit[:, AREA] = hs_pit[:, D] ** 2 * np.pi / 4
+        hs_pit[:, MDOTINIT] = net[cls.table_name()].controlled_mdot_kg_per_s.values
+        hs_pit[:, QEXT] = net[cls.table_name()].qext_w.values
+        return hs_pit
+
+    @classmethod
+    def create_component_array(cls, net, component_pits):
+        """
+        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 component_pits: dictionary of component specific arrays
+        :type component_pits: dict
+        :return:
+        :rtype:
+        """
+        tbl = net[cls.table_name()]
+        consumer_array = np.zeros(shape=(len(tbl), cls.internal_cols), dtype=np.float64)
+        consumer_array[:, cls.MASS] = tbl.controlled_mdot_kg_per_s.values
+        consumer_array[:, cls.QEXT] = tbl.qext_w.values
+        consumer_array[:, cls.DELTAT] = tbl.deltat_k.values
+        consumer_array[:, cls.TRETURN] = tbl.treturn_k.values
+        mf = ~np.isnan(consumer_array[:, cls.MASS])
+        qe = ~np.isnan(consumer_array[:, cls.QEXT])
+        dt = ~np.isnan(consumer_array[:, cls.DELTAT])
+        tr = ~np.isnan(consumer_array[:, cls.TRETURN])
+        consumer_array[:, cls.MODE] = np.sum([mf, qe, dt, tr], axis=0)
+        component_pits[cls.table_name()] = consumer_array
+
+    @classmethod
+    def adaption_after_derivatives_hydraulic(cls, net, branch_pit, node_pit, idx_lookups, options):
+        """
+        Perform adaptions to the branch pit after the derivatives have been calculated globally.
+
+        :param net: The pandapipes network containing all relevant info
+        :type net: pandapipesNet
+        :param branch_pit: The branch internal array
+        :type branch_pit: np.ndarray
+        :param node_pit: The node internal array
+        :type node_pit: np.ndarray
+        :param idx_lookups: Lookup for the relevant indices in the pit
+        :type idx_lookups: dict
+        :param options: Options for the pipeflow
+        :type options: dict
+        :return: No Output.
+        :rtype: None
+        """
+        # set all pressure derivatives to 0 and velocity to 1; load vector must be 0, as no change
+        # of velocity is allowed during the pipeflow iteration
+        f, t = idx_lookups[cls.table_name()]
+        fc_branch_pit = branch_pit[f:t, :]
+        fc_array = get_component_array(net, cls.table_name())
+        # TODO: this is more precise, but slower:
+        #       np.isin(fc_array[:, cls.MODE], [cls.MF_QE, cls.MF_DT, cls.MF_TR])
+        mdot_controlled = ~np.isnan(fc_array[:, cls.MASS])
+        fc_branch_pit[mdot_controlled, JAC_DERIV_DP] = 0
+        fc_branch_pit[mdot_controlled, JAC_DERIV_DP1] = 0
+        fc_branch_pit[mdot_controlled, JAC_DERIV_DM] = 1
+        fc_branch_pit[mdot_controlled, LOAD_VEC_BRANCHES] = 0
+
+    # @classmethod
+    # def adaption_before_derivatives_thermal(cls, net, branch_pit, node_pit, idx_lookups, options):
+    #     f, t = idx_lookups[cls.table_name()]
+    #     hs_pit = branch_pit[f:t, :]
+    #     mask_t_return = ~np.isnan(hs_pit[:, TRETURN])
+    #     hs_pit[mask_t_return, TINIT_OUT] = (hs_pit[mask_t_return, TINIT_OUT]
+    #                                         - hs_pit[mask_t_return, DELTAT])
+    #
+    #
+    # @classmethod
+    # def adaption_after_derivatives_thermal(cls, net, branch_pit, node_pit, idx_lookups, options):
+    #     """
+    #
+    #     :param net:
+    #     :type net:
+    #     :param branch_component_pit:
+    #     :type branch_component_pit:
+    #     :param node_pit:
+    #     :type node_pit:
+    #     :return:
+    #     :rtype:
+    #     """
+    #     # -(rho * area * cp * v_init * (-t_init_i + t_init_i1 - tl)
+    #     #   - alpha * (t_amb - t_m) * length + qext)
+    #
+    #     f, t = idx_lookups[cls.table_name()]
+    #     hs_pit = branch_pit[f:t, :]
+    #     from_nodes = hs_pit[:, FROM_NODE_T].astype(np.int32)
+    #
+    #     mask_qext = ~np.isnan(hs_pit[:, QEXT])
+    #     mask_deltat = ~np.isnan(hs_pit[:, DELTAT])
+    #     mask_t_return = ~np.isnan(hs_pit[:, TRETURN])
+    #     mask_mass = ~np.isnan(hs_pit[:, MASS])
+    #     hs_pit[mask_t_return | mask_deltat, JAC_DERIV_DT1] = 0
+
+    @classmethod
+    def get_component_input(cls):
+        """
+
+        Get component input.
+
+        :return:
+        :rtype:
+        """
+        return [("name", dtype(object)),
+                ("from_junction", "u4"),
+                ("to_junction", "u4"),
+                ("qext_w", "f8"),
+                ("controlled_mdot_kg_per_s", "f8"),
+                ("deltat_k", "f8"),
+                ("treturn_k", "f8"),
+                ("diameter_m", "f8"),
+                ("in_service", "bool"),
+                ("type", dtype(object))]
+
+    @classmethod
+    def get_result_table(cls, net):
+        """
+
+        Gets the result table.
+
+        :param net: The pandapipes network
+        :type net: pandapipesNet
+        :return: (columns, all_float) - the column names and whether they are all float type. Only
+                if False, returns columns as tuples also specifying the dtypes
+        :rtype: (list, bool)
+        """
+        if get_fluid(net).is_gas:
+            output = ["v_from_m_per_s", "v_to_m_per_s", "v_mean_m_per_s", "p_from_bar", "p_to_bar",
+                      "t_from_k", "t_to_k", "mdot_from_kg_per_s", "mdot_to_kg_per_s",
+                      "vdot_norm_m3_per_s", "reynolds", "lambda", "normfactor_from",
+                      "normfactor_to"]
+        else:
+            output = ["v_mean_m_per_s", "p_from_bar", "p_to_bar", "t_from_k", "t_to_k",
+                      "mdot_from_kg_per_s", "mdot_to_kg_per_s", "vdot_norm_m3_per_s", "reynolds",
+                      "lambda"]
+        return output, True
+
+    @classmethod
+    def extract_results(cls, net, options, branch_results, mode):
+        """
+
+        :param net:
+        :type net:
+        :param options:
+        :type options:
+        :param branch_results:
+        :type branch_results:
+        :param mode:
+        :type mode:
+        :return:
+        :rtype:
+        """
+        required_results_hyd, required_results_ht = standard_branch_wo_internals_result_lookup(net)
+
+        extract_branch_results_without_internals(net, branch_results, required_results_hyd,
+                                                 required_results_ht, cls.table_name(), mode)

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/heat_exchanger_component.py

@@ -9,7 +9,7 @@ from pandapipes.component_models import standard_branch_wo_internals_result_look
 from pandapipes.component_models.abstract_models.branch_wzerolength_models import \
     BranchWZeroLengthComponent
 from pandapipes.component_models.junction_component import Junction
-from pandapipes.idx_branch import ALPHA, TEXT, QEXT, D, AREA, LOSS_COEFFICIENT as LC, TOUTINIT
+from pandapipes.idx_branch import QEXT, D, AREA, LOSS_COEFFICIENT as LC
 from pandapipes.pf.pipeflow_setup import get_fluid
 from pandapipes.pf.result_extraction import extract_branch_results_without_internals
 
@@ -55,10 +55,7 @@ class HeatExchanger(BranchWZeroLengthComponent):
         heat_exchanger_pit[:, D] = net[cls.table_name()].diameter_m.values
         heat_exchanger_pit[:, AREA] = heat_exchanger_pit[:, D] ** 2 * np.pi / 4
         heat_exchanger_pit[:, LC] = net[cls.table_name()].loss_coefficient.values
-        heat_exchanger_pit[:, ALPHA] = 0
         heat_exchanger_pit[:, QEXT] = net[cls.table_name()].qext_w.values
-        heat_exchanger_pit[:, TEXT] = 293.15
-        heat_exchanger_pit[:, TOUTINIT] = 307
 
     @classmethod
     def extract_results(cls, net, options, branch_results, mode):
@@ -81,7 +78,6 @@ class HeatExchanger(BranchWZeroLengthComponent):
         extract_branch_results_without_internals(net, branch_results, required_results_hyd,
                                                  required_results_ht, cls.table_name(), mode)
 
-
     @classmethod
     def get_component_input(cls):
         """

{pandapipes-0.9.0 → pandapipes-0.10.0}/src/pandapipes/component_models/junction_component.py

@@ -8,11 +8,10 @@ import numpy as np
 from numpy import dtype
 from pandapipes.component_models.abstract_models.node_models import NodeComponent
 from pandapipes.component_models.component_toolbox import p_correction_height_air
-from pandapipes.idx_node import L, ELEMENT_IDX, RHO, PINIT, node_cols, HEIGHT, TINIT, PAMB, \
+from pandapipes.idx_node import L, ELEMENT_IDX, PINIT, node_cols, HEIGHT, TINIT, PAMB, \
     ACTIVE as ACTIVE_ND
 from pandapipes.pf.pipeflow_setup import add_table_lookup, get_table_number, \
     get_lookup
-from pandapipes.properties.fluids import get_fluid
 
 
 class Junction(NodeComponent):
@@ -83,7 +82,6 @@ class Junction(NodeComponent):
         junction_pit[:, HEIGHT] = junctions.height_m.values
         junction_pit[:, PINIT] = junctions.pn_bar.values
         junction_pit[:, TINIT] = junctions.tfluid_k.values
-        junction_pit[:, RHO] = get_fluid(net).get_density(junction_pit[:, TINIT])
         junction_pit[:, PAMB] = p_correction_height_air(junction_pit[:, HEIGHT])
         junction_pit[:, ACTIVE_ND] = junctions.in_service.values