fix: consider ambient pressure in calc. of compression work (#543)

* fix: consider ambient pressure in calc. of compression work

* fix: consider rel. pressure when getting compressibility values

* fix: calculation of kappa instead of 1.4 assumption

* proper pandapower Version handling in GHA (reg.Python 3.7)

* Update pump_component.py

* pump std type from_list now returns the std type

* Update run_tests_develop.yml

* fix: calculation of compression power, add test

* fix np.bool error

* install correct pandapower version for tutorial test in Python 3.7

* fix GHA script for Master

* replaced references to python-igraph as recommended in #547 (#548)

* add example nets of the version

* increase version number


---------

Co-authored-by: dlohmeier <[email protected]>

.github/workflows/release.yml

@@ -85,7 +85,7 @@ jobs:
       - 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 numba
       - name: Install pandapipes from TestPyPI
         if: ${{ inputs.upload_server == 'testpypi'}}
         run: |

.github/workflows/run_tests_develop.yml

@@ -28,9 +28,13 @@ jobs:
       - 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 numba
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          if ${{ matrix.python-version == '3.7' }}; 
+          then pip install pandapower==2.11.1; 
+          else 
           python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
+          fi
           pip install .
       - name: List all installed packages
         run: |
@@ -96,9 +100,13 @@ jobs:
       - 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 numba 
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          if ${{ matrix.python-version == '3.7' }}; 
+          then pip install pandapower==2.11.1; 
+          else 
           python -m pip install git+https://github.com/e2nIEE/pandapower@develop#egg=pandapower
+          fi
           pip install .
       - name: List all installed packages
         run: |

.github/workflows/run_tests_master.yml

@@ -28,9 +28,13 @@ jobs:
       - 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 numba
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower
+          if ${{ matrix.python-version == '3.7' }}; 
+          then pip install pandapower==2.11.1; 
+          else 
+          python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower;
+          fi
           pip install .
       - name: List all installed packages
         run: |
@@ -64,9 +68,13 @@ jobs:
       - 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 numba 
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          if ${{ matrix.python-version == '3.7' }}; 
+          then pip install pandapower==2.11.1; 
+          else 
           python -m pip install git+https://github.com/e2nIEE/pandapower@master#egg=pandapower
+          fi
           pip install .
       - name: List all installed packages
         run: |

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Change Log
 =============
 
+[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)
+
 [0.8.4] - 2023-02-02
 -------------------------------
 - [FIXED] added flow control to nxgraph

doc/source/conf.py

@@ -49,7 +49,7 @@
 # The short X.Y version.
 version = "0.8"
 # The full version, including alpha/beta/rc tags.
-release = "0.8.4"
+release = "0.8.5"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pandapipes/__init__.py

@@ -2,7 +2,7 @@
 # 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.8.5'
 __format_version__ = '0.8.0'
 
 import pandas as pd

pandapipes/component_models/pump_component.py

@@ -148,11 +148,12 @@ def extract_results(cls, net, options, branch_results, nodes_connected, branches
 
         if calc_compr_pow:
             f, t = get_lookup(net, "branch", "from_to")[cls.table_name()]
+            from_nodes = branch_results["from_nodes"][f:t]
+
             res_table = net["res_" + cls.table_name()]
             if net.fluid.is_gas:
-                p_from = branch_results["p_from"][f:t]
-                p_to = branch_results["p_to"][f:t]
-                from_nodes = branch_results["from_nodes"][f:t]
+                p_from = branch_results["p_abs_from"][f:t]
+                p_to = branch_results["p_abs_to"][f:t]
                 t0 = net["_pit"]["node"][from_nodes, TINIT_NODE]
                 mf_sum_int = branch_results["mf_from"][f:t]
                 # calculate ideal compression power
@@ -165,8 +166,9 @@ def extract_results(cls, net, options, branch_results, nodes_connected, branches
                                  ' defined')
                 else:
                     r_spec = 1e3 * R_UNIVERSAL / molar_mass  # [J/(kg * K)]
-                    # 'kappa' heat capacity ratio:
-                    k = 1.4  # TODO: implement proper calculation of kappa
+                    cp = net.fluid.get_heat_capacity(t0)
+                    cv = cp - r_spec
+                    k = cp/cv  # 'kappa' heat capacity ratio
                     w_real_isentr = (k / (k - 1)) * r_spec * compr * t0 * \
                                     (np.divide(p_to, p_from) ** ((k - 1) / k) - 1)
                     res_table['compr_power_mw'].values[:] = \

pandapipes/pipeflow.py

@@ -83,8 +83,8 @@ def pipeflow(net, sol_vec=None, **kwargs):
         nodes_connected, branches_connected = check_connectivity(
             net, branch_pit, node_pit, check_heat=calculate_heat)
     else:
-        nodes_connected = node_pit[:, ACTIVE_ND].astype(np.bool)
-        branches_connected = branch_pit[:, ACTIVE_BR].astype(np.bool)
+        nodes_connected = node_pit[:, ACTIVE_ND].astype(np.bool_)
+        branches_connected = branch_pit[:, ACTIVE_BR].astype(np.bool_)
 
     reduce_pit(net, node_pit, branch_pit, nodes_connected, branches_connected)
 

pandapipes/plotting/generic_geodata.py

@@ -39,9 +39,9 @@ def build_igraph_from_ppipes(net, junctions=None):
     try:
         import igraph as ig
     except (DeprecationWarning, ImportError):
-        raise ImportError("Please install python-igraph with "
-                          "`pip install python-igraph` or "
-                          "`conda install python-igraph` "
+        raise ImportError("Please install igraph with "
+                          "`pip install igraph` or "
+                          "`conda install igraph` "
                           "or from https://www.lfd.uci.edu/~gohlke/pythonlibs")
     g = ig.Graph(directed=True)
     junction_index = net.junction.index if junctions is None else np.array(junctions)

pandapipes/std_types/std_type_class.py

@@ -217,8 +217,9 @@ def from_path(cls, name, path):
     @classmethod
     def from_list(cls, name, x_values, y_values, degree):
         reg_par, x_values, y_values, degree = cls._from_list(x_values, y_values, degree)
-        reg_st = cls(name, reg_par)
-        cls.init_std_type(reg_st, x_values, y_values, degree)
+        pump_st = cls(name, reg_par)
+        cls.init_std_type(pump_st, x_values, y_values, degree)
+        return pump_st
 
     @classmethod
     def load_data(cls, path):