pandapipes 0.12.0.dev1__tar.gz → 0.12.0.dev2__tar.gz

pandapipes-0.12.0.dev2/.github/workflows/relying_test_on_dev_merge.yml

@@ -0,0 +1,34 @@
+# pandapipes-develop branch is designed to work with pandapower-master branch, but checks the ability to
+# work with pandapower-develop branch (relying tests, usually not required for merges) in order to avoid
+# problems in future releases
+
+name: ppipes_relying
+on:
+  pull_request:
+    types:
+      - closed
+  workflow_dispatch:
+
+jobs:
+  relying:
+    name: Relying tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        os:  [ ubuntu-latest, windows-latest ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          uv sync --extra test
+          uv pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
+      - name: List all installed packages
+        run: |
+          uv pip list
+      - name: Test with pytest
+        run: uv run pytest -n auto

pandapipes-0.12.0.dev2/.github/workflows/run_tests_develop.yml

@@ -0,0 +1,121 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# A coverage report will be created for the Python 3.9 version
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: ppipes_dev
+
+on:
+  push:
+    branches-ignore: [ master ]
+  pull_request:
+    branches-ignore: [ master ]
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        os:  [ ubuntu-latest, windows-latest ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: uv sync --extra test
+      - name: List all installed packages
+        run: |
+          uv pip list
+      - name: Test with pytest
+        if: ${{ matrix.python-version != '3.11' }}
+        run: |
+          uv run pytest -n auto
+      - name: Test with pytest and Codecov
+        if: ${{ matrix.python-version == '3.11' }}
+        run: |
+          uv pip install pytest-cov
+          uv run pytest -n auto --cov=./ --cov-report=xml
+      - name: Upload coverage to Codecov
+        if: ${{ matrix.python-version == '3.11' }}
+        uses: codecov/codecov-action@v4
+        with:
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+          dry_run: ${{ github.ref != 'refs/heads/develop' }}
+          exclude: |
+            '**/test/**'
+            '**/__init__.py'
+            'doc/**'
+            'tutorials/**'
+            'pandapipes/networks/network_files/**'
+            '**.yml'
+            '**.rst'
+
+  linting:
+    name: Linting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        with:
+          python-version: 3.11
+      - name: Install dependencies
+        run: |
+          uv sync
+          uv pip install flake8
+      - name: List all installed packages
+        run: |
+          uv pip list
+      - name: Lint with flake8 (syntax errors and undefinded names)
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          uv run flake8 . --exclude .venv --count --select=E9,F63,F7,F82 --show-source --statistics
+      - name: Lint with flake8 (all errors/warnings)
+        run: |
+          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+          uv run flake8 . --exclude .venv --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+
+  tutorial_tests:
+    name: Tutorial tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        os:  [ ubuntu-latest, windows-latest ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          uv sync --extra test --extra plotting
+      - name: List all installed packages
+        run: |
+          uv pip list
+      - name: Test with pytest
+        run: |
+          uv sync --extra test --extra plotting
+          uv run pytest --nbmake -n auto "./tutorials"
+      - name: Test without numba
+        if: ${{ matrix.python-version == '3.11' }}
+        run: |
+          uv pip uninstall numba
+          uv run pytest --nbmake -n auto "./tutorials"
+
+  docs_check:
+    name: Sphinx docs check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check sphinx build
+        uses: ammaraskar/sphinx-action@7.4.7
+        with:
+          pre-build-command: "python -m pip install uv && uv pip install .[docs] --system --link-mode=copy"
+          build-command: "sphinx-build -b html source _build -W"
+          docs-folder: "doc/"

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/.github/workflows/run_tests_master.yml

@@ -20,27 +20,24 @@ jobs:
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["all"]
-        shell: bash
+        run: uv sync --extra test
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         if: ${{ matrix.python-version != '3.11' }}
         run: |
-          python -m pytest
+          uv run pytest -n auto
       - name: Test with pytest, Codecov and Coverage
         if: ${{ matrix.python-version == '3.11' }}
         run: |
-          python -m pip install pytest-cov
-          python -m pytest --nbmake -n=auto --cov=./ --cov-report=xml
+          uv pip install pytest-cov
+          uv run pytest --nbmake -n auto --cov=./ --cov-report=xml
           cp ./coverage.xml ./codecov_coverage.xml
       - name: Upload coverage to Codacy
         if: ${{ matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'}}
@@ -63,12 +60,6 @@ jobs:
             'pandapipes/networks/network_files/**'
             '**.yml'
             '**.rst'
-      - name: Test without numba
-        if: ${{ matrix.python-version == '3.11' }}
-        run: |
-          python -m pip uninstall numba -y
-          python -m pytest -n=auto
-
 
   relying:
     runs-on: ${{ matrix.os }}
@@ -78,29 +69,24 @@ jobs:
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["all"]
-        shell: bash
+          uv sync --extra test
+          uv pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
-        # if: ${{ matrix.python-version != '3.11' }}
-        run: |
-          python -m pytest -n=auto
-      - name: Test without numba
-        if: ${{ matrix.python-version == '3.11' }}
+        if: ${{ matrix.python-version != '3.11' }}
         run: |
-          python -m pip uninstall numba -y
-          python -m pytest -n=auto
+          uv run pytest -n auto
 
   tutorial_tests:
+    name: Tutorial tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -108,44 +94,34 @@ jobs:
         os:  [ ubuntu-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@38f3f104447c67c051c4a08e39b64a148898af3a #v4.2.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install .["all"]
-        shell: bash
+          uv sync --extra test --extra plotting
       - name: List all installed packages
         run: |
-          python -m pip list
+          uv pip list
       - name: Test with pytest
         run: |
-          python -m pytest --nbmake -n=auto "./tutorials"
+          uv run pytest --nbmake -n auto "./tutorials"
       - name: Test without numba
         if: ${{ matrix.python-version == '3.11' }}
         run: |
-          python -m pip uninstall numba -y
-          python -m pytest --nbmake -n=auto "./tutorials"
+          uv pip uninstall numba
+          uv run pytest --nbmake -n auto "./tutorials"
 
 
   docs_check:
+    name: Sphinx docs check
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [ '3.11' ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Check docs for Python ${{ matrix.python-version }}
-        uses: e2nIEE/sphinx-action@master
+      - name: Check sphinx build
+        uses: ammaraskar/sphinx-action@7.4.7
         with:
-          pre-build-command: "apt update && apt upgrade -y && apt install -y build-essential gfortran cmake pkg-config libopenblas-dev;
-            python -m pip install --upgrade pip;
-            python -m pip install .[docs];"
+          pre-build-command: "python -m pip install uv && uv pip install .[docs] --system --link-mode=copy"
           build-command: "sphinx-build -b html source _build -W"
           docs-folder: "doc/"

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/CHANGELOG.rst

@@ -1,6 +1,10 @@
 Change Log
 =============
 
+[upcoming release] - 2025-..-..
+-------------------------------
+- [CHANGED] load JSON file with unknown objects as simple dicts is possible now
+
 [0.11.0] - 2024-11-07
 -------------------------------
 - [ADDED] heat_consumer plotting

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pandapipes
-Version: 0.12.0.dev1
+Version: 0.12.0.dev2
 Summary: A pipeflow calculation tool that complements pandapower in the simulation of multi energy grids
 Author-email: Simon Ruben Drauz-Mauel <simon.ruben.drauz-mauel@iee.fraunhofer.de>, Daniel Lohmeier <daniel.lohmeier@retoflow.de>, Jolando Marius Kisse <jolando.kisse@uni-kassel.de>
 License: Copyright (c) 2020-2024 by Fraunhofer Institute for Energy Economics
@@ -54,14 +54,14 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: pandapower~=2.14.11
+Requires-Dist: pandapower>=3.1
 Requires-Dist: matplotlib
 Requires-Dist: shapely
 Provides-Extra: docs
-Requires-Dist: numpydoc; extra == "docs"
-Requires-Dist: sphinx; extra == "docs"
-Requires-Dist: sphinx_rtd_theme; extra == "docs"
-Requires-Dist: sphinxcontrib.bibtex; extra == "docs"
+Requires-Dist: numpydoc>=1.5.0; extra == "docs"
+Requires-Dist: sphinx>=5.3.0; extra == "docs"
+Requires-Dist: sphinx_rtd_theme>=1.1.1; extra == "docs"
+Requires-Dist: sphinxcontrib.bibtex>=2.5.0; extra == "docs"
 Requires-Dist: sphinx-pyproject; extra == "docs"
 Provides-Extra: plotting
 Requires-Dist: plotly; extra == "plotting"
@@ -74,10 +74,11 @@ Requires-Dist: nbmake; extra == "test"
 Requires-Dist: numba; extra == "test"
 Requires-Dist: setuptools; python_version >= "3.12" and extra == "test"
 Provides-Extra: all
-Requires-Dist: numpydoc; extra == "all"
-Requires-Dist: sphinx; extra == "all"
-Requires-Dist: sphinx_rtd_theme; extra == "all"
-Requires-Dist: sphinxcontrib.bibtex; extra == "all"
+Requires-Dist: numpydoc>=1.5.0; extra == "all"
+Requires-Dist: sphinx>=5.3.0; extra == "all"
+Requires-Dist: sphinx_rtd_theme>=1.1.1; extra == "all"
+Requires-Dist: sphinxcontrib.bibtex>=2.5.0; extra == "all"
+Requires-Dist: sphinx-pyproject; extra == "all"
 Requires-Dist: plotly; extra == "all"
 Requires-Dist: igraph; extra == "all"
 Requires-Dist: pytest; extra == "all"
@@ -86,9 +87,10 @@ Requires-Dist: pytest-split; extra == "all"
 Requires-Dist: nbmake; extra == "all"
 Requires-Dist: numba; extra == "all"
 Requires-Dist: setuptools; python_version >= "3.12" and extra == "all"
+Dynamic: license-file
 
 
-.. image:: https://www.pandapipes.org/images/pp.svg
+.. image:: ./doc/source/pics/pp.svg
    :target: https://www.pandapipes.org
    :width: 300em
    :alt: logo
@@ -142,10 +144,10 @@ Getting started:
 
 pandapipes is a development of the Department for Distribution System Operation at the Fraunhofer
 Institute for Energy Economics and Energy System Technology (IEE), Kassel, and the research group
-Energy Management and Power System Operation, University of Kassel.
+Department for Sustainable Electrical Energy Systems (e2n), University of Kassel.
 
 
-.. image:: https://upload.wikimedia.org/wikipedia/commons/e/ee/FraunhoferIEELogo.gif
+.. image:: ./doc/source/pics/iee.png
     :target: https://www.iee.fraunhofer.de/en.html
     :width: 350
 
@@ -157,8 +159,8 @@ Energy Management and Power System Operation, University of Kassel.
 
 |
 
-.. image:: https://www.uni-kassel.de/eecs/index.php?eID=dumpFile&t=p&p=1674&token=b0509afe2e7c4e41d7cdad83edd0ce49af9fceaa
-    :target: https://www.uni-kassel.de/eecs/en/sections/energiemanagement-und-betrieb-elektrischer-netze/home
+.. image:: ./doc/source/pics/e2n.png
+    :target: https://www.uni-kassel.de/eecs/en/e2n/home
     :width: 250
 
 |

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/README.rst

@@ -1,5 +1,5 @@
 
-.. image:: https://www.pandapipes.org/images/pp.svg
+.. image:: ./doc/source/pics/pp.svg
    :target: https://www.pandapipes.org
    :width: 300em
    :alt: logo
@@ -53,10 +53,10 @@ Getting started:
 
 pandapipes is a development of the Department for Distribution System Operation at the Fraunhofer
 Institute for Energy Economics and Energy System Technology (IEE), Kassel, and the research group
-Energy Management and Power System Operation, University of Kassel.
+Department for Sustainable Electrical Energy Systems (e2n), University of Kassel.
 
 
-.. image:: https://upload.wikimedia.org/wikipedia/commons/e/ee/FraunhoferIEELogo.gif
+.. image:: ./doc/source/pics/iee.png
     :target: https://www.iee.fraunhofer.de/en.html
     :width: 350
 
@@ -68,8 +68,8 @@ Energy Management and Power System Operation, University of Kassel.
 
 |
 
-.. image:: https://www.uni-kassel.de/eecs/index.php?eID=dumpFile&t=p&p=1674&token=b0509afe2e7c4e41d7cdad83edd0ce49af9fceaa
-    :target: https://www.uni-kassel.de/eecs/en/sections/energiemanagement-und-betrieb-elektrischer-netze/home
+.. image:: ./doc/source/pics/e2n.png
+    :target: https://www.uni-kassel.de/eecs/en/e2n/home
     :width: 250
 
 |

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pandapipes"
-version = "0.12.0.dev1"  # File format version '__format_version__' is tracked in __init__.py
+version = "0.12.0.dev2"  # File format version '__format_version__' is tracked in __init__.py
 authors=[
     { name = "Simon Ruben Drauz-Mauel", email = "simon.ruben.drauz-mauel@iee.fraunhofer.de" },
     { name = "Daniel Lohmeier", email = "daniel.lohmeier@retoflow.de" },
@@ -32,7 +32,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12"
 ]
 dependencies = [
-    "pandapower ~= 2.14.11",
+    "pandapower >= 3.1",
     "matplotlib",
     "shapely",
 ]
@@ -51,16 +51,13 @@ Download = "https://pypi.org/project/pandapipes/#files"
 Changelog = "https://github.com/e2nIEE/pandapipes/blob/develop/CHANGELOG.rst"
 
 [project.optional-dependencies]
-docs = ["numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex", "sphinx-pyproject"]
+docs = ["numpydoc>=1.5.0", "sphinx>=5.3.0", "sphinx_rtd_theme>=1.1.1", "sphinxcontrib.bibtex>=2.5.0", "sphinx-pyproject"]
 plotting = ["plotly", "igraph"]
-test = [
-    "pytest", "pytest-xdist", "pytest-split", "nbmake", "numba",
-    "setuptools; python_version >= '3.12'"
-]
+test = ["pytest", "pytest-xdist", "pytest-split", "nbmake", "numba", "setuptools; python_version >= '3.12'"]
 all = [
-    "numpydoc", "sphinx", "sphinx_rtd_theme", "sphinxcontrib.bibtex",
-    "plotly", "igraph", "pytest", "pytest-xdist", "pytest-split", "nbmake", "numba",
-    "setuptools; python_version >= '3.12'"
+    "numpydoc>=1.5.0", "sphinx>=5.3.0", "sphinx_rtd_theme>=1.1.1", "sphinxcontrib.bibtex>=2.5.0", "sphinx-pyproject",
+    "plotly", "igraph",
+    "pytest", "pytest-xdist", "pytest-split", "nbmake", "numba","setuptools; python_version >= '3.12'"
 ]
 
 [tool.setuptools.packages.find]

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/src/pandapipes/__init__.py

@@ -4,7 +4,19 @@
 
 import importlib.metadata
 
-__version__ = importlib.metadata.version("pandapipes")
+try:
+    __version__ = importlib.metadata.version("pandapipes")
+except importlib.metadata.PackageNotFoundError:
+    # if the package is not installed, try reading the toml itself
+    import tomllib
+    from pathlib import Path
+    toml_file = Path(__file__).parent / "../../pyproject.toml"
+    if toml_file.exists() and toml_file.is_file():
+        with toml_file.open("rb") as f:
+            data = tomllib.load(f)
+            if "project" in data and "version" in data["project"]:
+                __version__ = data["project"]["version"]
+
 __format_version__ = '0.11.0'
 
 import pandas as pd

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/src/pandapipes/component_models/abstract_models/branch_models.py

@@ -5,8 +5,14 @@
 import numpy as np
 
 from pandapipes.component_models.abstract_models.base_component import Component
-from pandapipes.idx_branch import MDOTINIT, branch_cols, TEXT, FLOW_RETURN_CONNECT
-from pandapipes.pf.pipeflow_setup import get_table_number, get_lookup, get_net_option
+from pandapipes.idx_branch import (
+    MDOTINIT,
+    branch_cols,
+    TEXT,
+    FLOW_RETURN_CONNECT,
+)
+from pandapipes.pf.pipeflow_setup import get_net_option
+from pandapipes.pf.pipeflow_setup import get_table_number, get_lookup
 
 try:
     import pandaplan.core.pplog as logging
@@ -87,10 +93,11 @@ class BranchComponent(Component):
         fn_col, tn_col = cls.from_to_node_cols()
         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[:, MDOTINIT] = 0.1
-        branch_component_pit[:, TEXT] = get_net_option(net, 'ambient_temperature')
-        branch_component_pit[:, FLOW_RETURN_CONNECT] = False
+        if not get_net_option(net, "transient") or get_net_option(net, "simulation_time_step") == 0:
+            branch_component_pit[:, :] = np.array([branch_table_nr] + [0] * (branch_cols - 1))
+            branch_component_pit[:, MDOTINIT] = 0.1
+            branch_component_pit[:, TEXT] = get_net_option(net, 'ambient_temperature')
+            branch_component_pit[:, FLOW_RETURN_CONNECT] = False
         return branch_component_pit, node_pit, from_nodes, to_nodes
 
     @classmethod

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/src/pandapipes/component_models/abstract_models/branch_w_internals_models.py

@@ -7,10 +7,19 @@ 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, vinterp, \
     p_correction_height_air
-from pandapipes.idx_branch import ACTIVE, FROM_NODE, TO_NODE, 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.idx_branch import ACTIVE, FROM_NODE, TO_NODE, ELEMENT_IDX, TOUTINIT, T_OUT_OLD
+from pandapipes.idx_node import (
+    L,
+    node_cols,
+    TINIT as TINIT_NODE,
+    HEIGHT,
+    PINIT,
+    PAMB,
+    ACTIVE as ACTIVE_ND,
+    TINIT_OLD,
+)
+from pandapipes.pf.pipeflow_setup import add_table_lookup, get_lookup, get_table_number, \
+    get_net_option
 
 try:
     import pandaplan.core.pplog as logging
@@ -151,7 +160,7 @@ class BranchWInternalsComponent(BranchComponent):
         int_node_pit[:, ELEMENT_IDX] = np.arange(t - f)
 
         junction_table_name = cls.get_connected_node_type().table_name()
-        fj_name, tj_name = "from_" + junction_table_name, "to_" + junction_table_name
+        fj_name, tj_name = cls.from_to_node_cols()
         f_junction, t_junction = ft_lookup[junction_table_name]
         junction_pit = node_pit[f_junction:t_junction, :]
         from_junctions = net[cls.table_name()][fj_name].values.astype(np.int32)
@@ -160,16 +169,19 @@ class BranchWInternalsComponent(BranchComponent):
         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)
+        if not get_net_option(net, "transient") or get_net_option(net, "simulation_time_step") == 0:
+            int_node_pit[:, TINIT_NODE] = vinterp(junction_pit[fj_nodes, TINIT_NODE],
+                                                  junction_pit[tj_nodes, TINIT_NODE],
+                                                  int_node_number)
+            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[:, 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)
+        if get_net_option(net, "transient"):
+            int_node_pit[:, TINIT_OLD] = int_node_pit[:, TINIT_NODE].astype(np.float64)
         return table_nr, int_node_number, int_node_pit, junction_pit, fj_nodes, tj_nodes
 
     @classmethod
@@ -208,7 +220,11 @@ class BranchWInternalsComponent(BranchComponent):
             internal_pipe_number, has_internals)
         branch_w_internals_pit[:, FROM_NODE] = from_nodes
         branch_w_internals_pit[:, TO_NODE] = to_nodes
-        branch_w_internals_pit[:, TOUTINIT] = node_pit[to_nodes, TINIT_NODE]
+        if not get_net_option(net, "transient") or get_net_option(net, "simulation_time_step") == 0:
+            branch_w_internals_pit[:, TOUTINIT] = node_pit[to_nodes, TINIT_NODE]
+        if get_net_option(net, "transient"):
+            branch_w_internals_pit[:, T_OUT_OLD] = branch_w_internals_pit[:, TOUTINIT]
+
         return branch_w_internals_pit, internal_pipe_number
 
     @classmethod

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/src/pandapipes/component_models/abstract_models/branch_wo_internals_models.py

@@ -3,11 +3,16 @@
 # Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
 from pandapipes.component_models.abstract_models.branch_models import BranchComponent
-
-from pandapipes.idx_branch import FROM_NODE, TO_NODE, TOUTINIT, ELEMENT_IDX, ACTIVE
+from pandapipes.idx_branch import (
+    FROM_NODE,
+    TO_NODE,
+    TOUTINIT,
+    ELEMENT_IDX,
+    ACTIVE,
+    T_OUT_OLD,
+)
 from pandapipes.idx_node import TINIT as TINIT_NODE
-
-from pandapipes.pf.pipeflow_setup import add_table_lookup
+from pandapipes.pf.pipeflow_setup import add_table_lookup, get_net_option
 
 try:
     import pandaplan.core.pplog as logging
@@ -78,11 +83,14 @@ class BranchWOInternalsComponent(BranchComponent):
         """
         branch_wo_internals_pit, node_pit, from_nodes, to_nodes \
             = 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[:, TO_NODE] = to_nodes
-        branch_wo_internals_pit[:, TOUTINIT] = node_pit[to_nodes, TINIT_NODE]
-        branch_wo_internals_pit[:, ACTIVE] = net[cls.table_name()][cls.active_identifier()].values
+        if not get_net_option(net, "transient") or get_net_option(net, "simulation_time_step") == 0:
+            branch_wo_internals_pit[:, TOUTINIT] = node_pit[to_nodes, TINIT_NODE]
+            branch_wo_internals_pit[:, ELEMENT_IDX] = net[cls.table_name()].index.values
+            branch_wo_internals_pit[:, FROM_NODE] = from_nodes
+            branch_wo_internals_pit[:, TO_NODE] = to_nodes
+            branch_wo_internals_pit[:, ACTIVE] = net[cls.table_name()][cls.active_identifier()].values
+        if get_net_option(net, "transient"):
+            branch_wo_internals_pit[:, T_OUT_OLD] = branch_wo_internals_pit[:, TOUTINIT]
         return branch_wo_internals_pit
 
     @classmethod

{pandapipes-0.12.0.dev1 → pandapipes-0.12.0.dev2}/src/pandapipes/component_models/component_toolbox.py

@@ -225,3 +225,7 @@ def get_component_array(net, component_name, component_type="branch", mode='hydr
     f_all, t_all = get_lookup(net, component_type, "from_to")[component_name]
     in_service_elm = get_lookup(net, component_type, "active_%s"%mode)[f_all:t_all]
     return net["_pit"]["components"][component_name][in_service_elm]
+
+
+def get_std_type_lookup(net, table_name):
+    return np.array(list(net.std_types[table_name].keys()))