fix: relax condition on sanitizing "reversed" column

scripts/_helpers.py

@@ -17,6 +17,7 @@
 
 import fiona
 import pandas as pd
+import pypsa
 import pytz
 import requests
 import yaml
@@ -895,6 +896,24 @@ def get_snapshots(snapshots, drop_leap_day=False, freq="h", **kwargs):
     return time
 
 
+def sanitize_custom_columns(n: pypsa.Network):
+    """
+    Sanitize non-standard columns used throughout the workflow.
+
+    Parameters
+    ----------
+        n (pypsa.Network): The network object.
+
+    Returns
+    -------
+        None
+    """
+    if "reversed" in n.links.columns:
+        # Replace NA values with default value False
+        n.links.loc[n.links.reversed.isna(), "reversed"] = False
+        n.links.reversed = n.links.reversed.astype(bool)
+
+
 def rename_techs(label: str) -> str:
     """
     Rename technology labels for better readability.

scripts/add_existing_baseyear.py

@@ -17,6 +17,7 @@
 import xarray as xr
 from _helpers import (
     configure_logging,
+    sanitize_custom_columns,
     set_scenario_config,
     update_config_from_wildcards,
 )
@@ -620,25 +621,6 @@ def add_heating_capacities_installed_before_baseyear(
             )
 
 
-def set_defaults(n):
-    """
-    Set default values for missing values in the network.
-
-    Parameters
-    ----------
-        n (pypsa.Network): The network object.
-
-    Returns
-    -------
-        None
-    """
-    if "Link" in n.components:
-        if "reversed" in n.links.columns:
-            # Replace NA values with default value False
-            n.links.loc[n.links.reversed.isna(), "reversed"] = False
-            n.links.reversed = n.links.reversed.astype(bool)
-
-
 # %%
 if __name__ == "__main__":
     if "snakemake" not in globals():
@@ -706,13 +688,12 @@ def set_defaults(n):
         )
 
     # Set defaults for missing missing values
-    set_defaults(n)
 
     if options.get("cluster_heat_buses", False):
         cluster_heat_buses(n)
 
     n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
 
+    sanitize_custom_columns(n)
     sanitize_carriers(n, snakemake.config)
-
     n.export_to_netcdf(snakemake.output[0])

scripts/prepare_perfect_foresight.py

@@ -12,9 +12,11 @@
 import pypsa
 from _helpers import (
     configure_logging,
+    sanitize_custom_columns,
     set_scenario_config,
     update_config_from_wildcards,
 )
+from add_electricity import sanitize_carriers
 from add_existing_baseyear import add_build_year_to_new_assets
 from pypsa.descriptors import expand_series
 from six import iterkeys
@@ -105,7 +107,6 @@ def hvdc_transport_model(n):
         carrier="DC",
         length=n.lines.length,
         capital_cost=n.lines.capital_cost,
-        reversed=False,
     )
 
     # Remove AC lines
@@ -233,9 +234,6 @@ def concat_networks(years):
         n.investment_period_weightings["years"], social_discountrate
     )
     n.investment_period_weightings["objective"] = objective_w
-    if "reversed" in n.links.columns:
-        # adjust boolean dtype
-        n.links["reversed"] = n.links["reversed"].astype(bool)
     # all former static loads are now time-dependent -> set static = 0
     n.loads["p_set"] = 0
     n.loads_t.p_set.fillna(0, inplace=True)
@@ -577,5 +575,8 @@ def update_heat_pump_efficiency(n: pypsa.Network, years: list[int]):
 
     # update heat pump efficiency
     update_heat_pump_efficiency(n=n, years=years)
+
     # export network
+    sanitize_custom_columns(n)
+    sanitize_carriers(n, snakemake.config)
     n.export_to_netcdf(snakemake.output[0])

scripts/solve_network.py

@@ -784,7 +784,7 @@ def add_battery_constraints(n):
 
 
 def add_lossy_bidirectional_link_constraints(n):
-    if not n.links.p_nom_extendable.any() or "reversed" not in n.links.columns:
+    if not n.links.p_nom_extendable.any() or not any(n.links.get("reversed", [])):
         return
 
     carriers = n.links.loc[n.links.reversed, "carrier"].unique()  # noqa: F841