Merge branch 'main' into eu-co2-pipes

Author: bobbyxng

Snakefile

@@ -670,6 +670,8 @@ rule build_existing_chp_de:
         ),
     output:
         german_chp=resources("german_chp_base_s_{clusters}.csv"),
+    resources:
+        mem_mb=4000,
     log:
         logs("build_existing_chp_de_{clusters}.log"),
     script:

scripts/prepare_sector_network.py

@@ -412,7 +412,13 @@ def create_network_topology(
     lk_attrs = n.links.columns.intersection(lk_attrs)
 
     candidates = pd.concat(
-        [n.lines[ln_attrs], n.links.loc[n.links.carrier.isin(carriers), lk_attrs]]
+        [
+            n.lines[ln_attrs],
+            n.links.loc[
+                (n.links.carrier.isin(carriers)) & (n.links.underwater_fraction > 0.1),
+                lk_attrs,
+            ],
+        ]
     ).fillna(0)
 
     # base network topology purely on location not carrier
@@ -4255,7 +4261,7 @@ def add_biomass(
         transport_costs = pd.read_csv(biomass_transport_costs_file, index_col=0)
         transport_costs = transport_costs.squeeze()
         biomass_transport = create_network_topology(
-            n, "biomass transport ", bidirectional=False
+            n, "biomass transport ", carriers=[""], bidirectional=False
         )
 
         # costs

scripts/pypsa-de/additional_functionality.py

@@ -37,7 +37,9 @@ def add_capacity_limits(n, investment_year, limits_capacity, sense="maximum"):
                     valid_components & ~c.static[attr + "_nom_extendable"]
                 ]
                 extendable_index = c.static.index[
-                    valid_components & c.static[attr + "_nom_extendable"] & c.static.active
+                    valid_components
+                    & c.static[attr + "_nom_extendable"]
+                    & c.static.active
                 ]
 
                 existing_capacity = c.static.loc[existing_index, attr + "_nom"].sum()