Merge branch 'develop' into develop

e2nIEE · Jan 6, 2025 · ef02702 · ef02702
2 parents f278d8d + 3c0b7b1
commit ef02702
Show file tree

Hide file tree

Showing 8 changed files with 289 additions and 50 deletions.
diff --git a/.github/workflows/upload_release.yml b/.github/workflows/upload_release.yml
@@ -66,12 +66,14 @@ jobs:
 
       # Waste some time
       - name: Sleep for 150s to make release available
+        if: ${{ inputs.upload_server == 'pypi' }}
         uses: juliangruber/sleep-action@v1
         with:
           time: 150s
 
       # Notify fraunhofer ci about the new version
       - uses: eic/trigger-gitlab-ci@v3
+        if: ${{ inputs.upload_server == 'pypi' }}
         with:
           url: https://gitlab.cc-asp.fraunhofer.de
           project_id: 27329
@@ -81,6 +83,7 @@ jobs:
 
       # Run an installation for testing
       - name: Install pandapower from PyPI
+        if: ${{ inputs.upload_server == 'pypi' }}
         run: |
-          python3 -m pip install pandapower
-          python3 -c "import pandapower; print(pandapower.__version__)"
+          python3 -m pip install --pre pandapower
+          python3 -c "import pandapower; print(pandapower.__version__)"
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,7 @@ Change Log
 
 [upcoming release] - 2024-..-..
 -------------------------------
+- [ADDED] Static Var Compensator with Voltage Control
 - [ADDED] Implementation of Allocation Factor WLS (AF-WLS) for non observable distribution grids
 - [FIXED] Deletion of multiple measurements at the same bus or branch
 - [FIXED] Creation of zero injection measurements in WLS estimator
@@ -18,10 +19,12 @@ Change Log
 - [ADDED] converter for European EHV grid data from JAO, the "Single Allocation Platform (SAP) for all European Transmission System Operators (TSOs) that operate in accordance to EU legislation"
 - [ADDED] Add GeographicalRegion and SubGeographicalRegion names and ids to bus df in cim converter
 - [CHANGED] Capitalize first letter of columns busbar_id, busbar_name and substation_id in bus df for cim converter
+- [CHANGED] required standard type parameters are made available by function :code:`required_std_type_parameters()`
 - [CHANGED] toolbox replace functions (e.g. gen replacement by sgens): improved result table implementation and added profiles consideration
 - [FIXED] Do not modify pandas options when importing pandapower
 - [FIXED] fixed copy-paste error in contingency results "max_limit_nminus1" and "min_limit_nminus1"
 - [ADDED] improved lightsim2grid documentation including compatibitliy issues
+- [FIXED] avoid duplicated keys in kwargs and pf_options in run_contingency()
 - [FIXED] cim2pp: set default xml encoding to None to avoid error after changing to lxml
 - [FIXED] PandaModels OPF with 'bus_dc' key errors
 - [FIXED] julia tests

diff --git a/doc/converter/powerfactory.rst b/doc/converter/powerfactory.rst
@@ -28,7 +28,7 @@ The documentation describes how to use the exporter as a function in "Engine mod
  - ElmZpu (pu Impedance)
  - ElmSind (Series Reactor)
  - Elmscap (Series Capacitor)
-
+ - ElmSvs (Static Var Compensator with Voltage Control)
 
 Setup PowerFactory and Python
 =====================================

diff --git a/pandapower/contingency/contingency.py b/pandapower/contingency/contingency.py
@@ -82,10 +82,17 @@ def run_contingency(net, nminus1_cases, pf_options=None, pf_options_nminus1=None
     # set up the dict for results and relevant variables
     # ".get" in case the options have been set in pp.set_user_pf_options:
     raise_errors = kwargs.get("raise_errors", False)
-    if "recycle" in kwargs: kwargs["recycle"] = False  # so that we can be sure it doesn't happen
-    if pf_options is None: pf_options = net.user_pf_options.get("pf_options", net.user_pf_options)
-    if pf_options_nminus1 is None: pf_options_nminus1 = net.user_pf_options.get("pf_options_nminus1",
-                                                                                net.user_pf_options)
+    if "recycle" in kwargs:
+        kwargs["recycle"] = False  # so that we can be sure it doesn't happen
+    if pf_options is None:
+        pf_options = net.user_pf_options.get("pf_options", net.user_pf_options)
+    if pf_options_nminus1 is None:
+        pf_options_nminus1 = net.user_pf_options.get("pf_options_nminus1", net.user_pf_options)
+    if kwargs is not None:
+        # avoid duplicate passing keys to contingency_evaluation_function()
+        pf_options = {key: val for key, val in pf_options.items() if key not in kwargs.keys()}
+        pf_options_nminus1 = {key: val for key, val in pf_options_nminus1.items() if key not in
+                              kwargs.keys()}
 
     contingency_results = {element: {"index": net[element].index.values}
                            for element in ("bus", "line", "trafo", "trafo3w") if len(net[element]) > 0}
@@ -178,7 +185,8 @@ def run_contingency_ls2g(net, nminus1_cases, contingency_evaluation_function=pp.
     n_bus = len(net.bus)
     last_bus = net.bus.index[-1]
     if net.bus.index[0] != 0 or last_bus != n_bus - 1 or sum(net.bus.index) != last_bus * n_bus / 2:
-        raise UserWarning("bus index must be continuous and start with 0 (use pandapower.create_continuous_bus_index)")
+        raise UserWarning("bus index must be continuous and start with 0 "
+                          "(use pandapower.create_continuous_bus_index)")
     contingency_evaluation_function(net, **kwargs)
 
     trafo_flag = False

diff --git a/pandapower/converter/powerfactory/pf_export_functions.py b/pandapower/converter/powerfactory/pf_export_functions.py
@@ -21,6 +21,7 @@ def create_network_dict(app, flag_graphics='GPS'):
         'ElmAsm',
         'ElmShnt',
         'ElmVac',
+        'ElmSvs',
         'ElmVsc',
         'ElmVscmono',
 
@@ -56,6 +57,7 @@ def create_network_dict(app, flag_graphics='GPS'):
         'ElmPvsys': ['W', 'var', 'VA'],
         'ElmXnet': ['W', 'var', 'VA'],
         'ElmSym': ['W', 'var', 'VA'],
+        'ElmSvs': ['W', 'var', 'VA'],
         'ElmAsm': ['W', 'var', 'VA'],
         'ElmShnt': ['W', 'var', 'VA'],
         'ElmZpu': ['W', 'var', 'VA'],