Fixes/#660 fix ehv clustering

etrago/appl.py

@@ -99,6 +99,7 @@
             "grid_max_abs_foreign": None,  # absolute capacity per voltage level
         },
     },
+    "delete_dispensable_ac_buses": False, # bool. Find and delete unnecesary buses
     "generator_noise": 789456,  # apply generator noise, False or seed number
     "extra_functionality": {},  # Choose function name or {}
     # Spatial Complexity:
@@ -383,6 +384,11 @@ def run_etrago(args, json_path):
             Limit overall energy production country-wise for each generator
             by carrier. Set upper/lower limit in p.u.
 
+    delete_dispensable_ac_buses: bool
+        Choose if unnecessary buses should be identified and deleted from the
+        grid. This buses have no load or generation attached. Additionally,
+        they are just connected to two other buses.
+        Default: False.
     network_clustering_ehv : bool
         Choose if you want to cluster the full HV/EHV dataset down to only the
         EHV buses. In that case, all HV buses are assigned to their closest EHV

etrago/cluster/electrical.py

@@ -321,6 +321,8 @@ def cluster_on_extra_high_voltage(etrago, busmap, with_time=True):
     # Dealing with links
     links = network.links.copy()
     dc_links = links[links["carrier"] == "DC"]
+    # Discard links connected to buses under 220 kV
+    dc_links = dc_links[dc_links.bus0.isin(buses.index)]
     links = links[links["carrier"] != "DC"]
 
     new_links = (

etrago/cluster/spatial.py

@@ -401,6 +401,12 @@ def busmap_by_shortest_path(etrago, scn_name, fromlvl, tolvl, cpu_cores=4):
     transformer = connected_transformer(etrago.network, s_buses)
     mask = transformer.bus1.isin(buses_of_vlvl(etrago.network, tolvl))
 
+    dc = etrago.network.links[etrago.network.links.carrier == "DC"]
+    dc.index = "DC_" + dc.index
+    lines_plus_dc = pd.concat([lines, dc])
+    lines_plus_dc = lines_plus_dc[etrago.network.lines.columns]
+    lines_plus_dc["carrier"] = "AC"
+
     # temporary end points, later replaced by bus1 pendant
     t_buses = transformer[mask].bus0
 
@@ -409,7 +415,8 @@ def busmap_by_shortest_path(etrago, scn_name, fromlvl, tolvl, cpu_cores=4):
 
     # graph creation
     edges = [
-        (row.bus0, row.bus1, row.length, ix) for ix, row in lines.iterrows()
+        (row.bus0, row.bus1, row.length, ix)
+        for ix, row in lines_plus_dc.iterrows()
     ]
     M = graph_from_edges(edges)
 
@@ -538,24 +545,26 @@ def fetch():
 
     busmap = fetch()
 
-    # TODO: Or better try/except/finally
-    if not busmap:
-        print("Busmap does not exist and will be created.\n")
-
-        cpu_cores = etrago.args["network_clustering"]["CPU_cores"]
-        if cpu_cores == "max":
-            cpu_cores = mp.cpu_count()
-        else:
-            cpu_cores = int(cpu_cores)
-
-        busmap_by_shortest_path(
-            etrago,
-            scn_name,
-            fromlvl=[110],
-            tolvl=[220, 380, 400, 450],
-            cpu_cores=cpu_cores,
+    if busmap:
+        print(
+            "Existing busmap will be deleted and a new one will be calculated."
         )
-        busmap = fetch()
+        etrago.engine.execute("""DELETE FROM grid.egon_etrago_hv_busmap""")
+
+    cpu_cores = etrago.args["network_clustering"]["CPU_cores"]
+    if cpu_cores == "max":
+        cpu_cores = mp.cpu_count()
+    else:
+        cpu_cores = int(cpu_cores)
+
+    busmap_by_shortest_path(
+        etrago,
+        scn_name,
+        fromlvl=[110],
+        tolvl=[220, 380, 400, 450],
+        cpu_cores=cpu_cores,
+    )
+    busmap = fetch()
 
     return busmap
 

etrago/tools/utilities.py

@@ -127,6 +127,16 @@ def buses_grid_linked(network, voltage_level):
     mask = (
         network.buses.index.isin(network.lines.bus0)
         | (network.buses.index.isin(network.lines.bus1))
+        | (
+            network.buses.index.isin(
+                network.links.loc[network.links.carrier == "DC", "bus0"]
+            )
+        )
+        | (
+            network.buses.index.isin(
+                network.links.loc[network.links.carrier == "DC", "bus1"]
+            )
+        )
     ) & (network.buses.v_nom.isin(voltage_level))
 
     df = network.buses[mask]
@@ -1079,6 +1089,8 @@ def delete_dispensable_ac_buses(etrago):
     None.
 
     """
+    if etrago.args["delete_dispensable_ac_buses"] is False:
+        return
 
     def delete_buses(delete_buses, network):
         drop_buses = delete_buses.index.to_list()