Merge pull request #2508 from mfisch42/fix/geodata_auxilary_bus

Fix/geodata auxilary bus
e2nIEE · Jan 10, 2025 · 43afaa5 · 43afaa5
2 parents 0c11889 + 5c785c1
commit 43afaa5
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 14 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,25 @@ Change Log
 
 [upcoming release] - 2025-..-..
 -------------------------------
+- [FIXED] Increasing geojson precision as the default precision might cause problems with pandahub
+
+[2.14.11] - 2024-07-08
+-------------------------------
+- [FIXED] Lightsim2grid version
+
+[2.14.10] - 2024-07-08
+-------------------------------
+- [FIXED] geopandas version
+
+[2.14.9] - 2024-06-25
+-------------------------------
+- [FIXED] scipy version
+
+[upcoming release] - 2024-..-..
+-------------------------------
+
+- [ADDED] Static Var Compensator with Voltage Control
+- [ADDED] pf2pp: min/max q_mvar and min/max p_mw limits for sgens and gen will be converted
 - [FIXED] Allow to consider all oos components in nx graph creation
 - [REMOVED] Excluding tests and test_files from built packages
 - [ADDED] Static Var Compensator with Voltage Control

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

diff --git a/pandapower/build_gen.py b/pandapower/build_gen.py
@@ -447,7 +447,8 @@ def _normalise_slack_weights(ppc, gen_mask, xward_mask, xward_pq_buses):
         else:
             # ppc['gen'][subnet_gen_mask, SL_FAC] /= sum_slack_weights
             slack_weights_gen /= sum_slack_weights
-            buses, slack_weights_bus, _ = _sum_by_group(gen_buses[subnet_gen_mask], slack_weights_gen[subnet_gen_mask], slack_weights_gen[subnet_gen_mask])
+            buses, slack_weights_bus, _ = _sum_by_group(gen_buses[subnet_gen_mask], slack_weights_gen[subnet_gen_mask], 
+                                                        slack_weights_gen[subnet_gen_mask])
             ppc['bus'][buses, SL_FAC_BUS] = slack_weights_bus
 
     # raise NotImplementedError if there are several separate zones for distributed slack:

diff --git a/pandapower/converter/powerfactory/pf_export_functions.py b/pandapower/converter/powerfactory/pf_export_functions.py
@@ -25,6 +25,7 @@ def create_network_dict(app, flag_graphics='GPS'):
         'ElmVsc',
         'ElmVscmono',
 
+
         # branch elements:
         'ElmLne',
         'ElmCoup',

diff --git a/pandapower/converter/powerfactory/pp_import_functions.py b/pandapower/converter/powerfactory/pp_import_functions.py
@@ -2907,12 +2907,12 @@ def create_zpu(net, item):
 
     # create auxilary buses
     aux_bus1 = pp.create_bus(net, vn_kv=net.bus.vn_kv.at[bus1], name=net.bus.name.at[bus1]+'_aux',
-                             geodata=net.bus.geo.at[bus1], type="b", zone=net.bus.zone.at[bus1],
-                             in_service=True)
+                             type="b", zone=net.bus.zone.at[bus1], in_service=True)
+    net.bus.loc[aux_bus1, 'geo'] = net.bus.geo.at[bus1]
     params['from_bus'] = aux_bus1
     aux_bus2 = pp.create_bus(net, vn_kv=net.bus.vn_kv.at[bus2], name=net.bus.name.at[bus2]+'_aux',
-                             geodata=net.bus.geo.at[bus2], type="b", zone=net.bus.zone.at[bus2],
-                             in_service=True)
+                             type="b", zone=net.bus.zone.at[bus2], in_service=True)
+    net.bus.loc[aux_bus2, 'geo'] = net.bus.geo.at[bus2]
     params['to_bus'] = aux_bus2
 
     xid = pp.create_impedance(net, **params)
@@ -3042,13 +3042,13 @@ def create_sind(net, item):
         logger.error("Cannot add Sind '%s': not connected" % item.loc_name)
         return
 
-    # create auxilary buses
+    # create auxilary buses 
     aux_bus1 = pp.create_bus(net, vn_kv=net.bus.vn_kv.at[bus1], name=net.bus.name.at[bus1]+'_aux',
-                             geodata=net.bus.geo.at[bus1], type="b", zone=net.bus.zone.at[bus1],
-                             in_service=True)
+                             type="b", zone=net.bus.zone.at[bus1], in_service=True)
+    net.bus.loc[aux_bus1, 'geo'] = net.bus.geo.at[bus1]
     aux_bus2 = pp.create_bus(net, vn_kv=net.bus.vn_kv.at[bus2], name=net.bus.name.at[bus2]+'_aux',
-                             geodata=net.bus.geo.at[bus2], type="b", zone=net.bus.zone.at[bus2],
-                             in_service=True)
+                             type="b", zone=net.bus.zone.at[bus2], in_service=True)
+    net.bus.loc[aux_bus2, 'geo'] = net.bus.geo.at[bus2]
 
     sind = pp.create_series_reactor_as_impedance(net, from_bus=aux_bus1, to_bus=aux_bus2, 
                                                  r_ohm=item.rrea, x_ohm=item.xrea, sn_mva=item.Sn,
@@ -3103,11 +3103,11 @@ def create_scap(net, item):
 
         # create auxilary buses 
         aux_bus1 = pp.create_bus(net, vn_kv=net.bus.vn_kv.at[bus1], name=net.bus.name.at[bus1]+'_aux',
-                                 geodata=net.bus.geo.at[bus1], type="b", zone=net.bus.zone.at[bus1],
-                                 in_service=True)
+                                 type="b", zone=net.bus.zone.at[bus1], in_service=True)
+        net.bus.loc[aux_bus1, 'geo'] = net.bus.geo.at[bus1]
         aux_bus2 = pp.create_bus(net, vn_kv=net.bus.vn_kv.at[bus2], name=net.bus.name.at[bus2]+'_aux',
-                                 geodata=net.bus.geo.at[bus2], type="b", zone=net.bus.zone.at[bus2],
-                                 in_service=True)
+                                 type="b", zone=net.bus.zone.at[bus2], in_service=True)
+        net.bus.loc[aux_bus2, 'geo'] = net.bus.geo.at[bus2]
 
         scap = pp.create_series_reactor_as_impedance(net, from_bus=aux_bus1, to_bus=aux_bus2, r_ohm=r_ohm,
                                                      x_ohm=x_ohm, sn_mva=item.Sn,