some more conforming with upstream changes

Author: lindnemi

Snakefile

@@ -588,6 +588,7 @@ rule export_ariadne_variables:
     params:
         planning_horizons=config_provider("scenario", "planning_horizons"),
         hours=config_provider("clustering", "temporal", "resolution_sector"),
+        max_hours=config_provider("electricity", "max_hours"),
         costs=config_provider("costs"),
         config_industry=config_provider("industry"),
         energy_totals_year=config_provider("energy", "energy_totals_year"),
@@ -760,6 +761,7 @@ rule plot_ariadne_report:
         run=config_provider("run", "name"),
         foresight=config_provider("foresight"),
         costs=config_provider("costs"),
+        max_hours=config_provider("electricity", "max_hours"),
         post_discretization=config_provider("solving", "options", "post_discretization"),
         NEP_year=config_provider("costs", "NEP"),
         hours=config_provider("clustering", "temporal", "resolution_sector"),

scripts/pypsa-de/export_ariadne_variables.py

@@ -4670,6 +4670,7 @@ def get_operational_and_capital_costs(year):
     costs = load_costs(
         snakemake.input.costs[ind],
         snakemake.params.costs,
+        snakemake.params.max_hours,
         nyears=1,
     )
 
@@ -5473,6 +5474,7 @@ def get_data(
             lambda _costs: load_costs(
                 _costs,
                 snakemake.params.costs,
+                snakemake.params.max_hours,
                 nyears,
             ).multiply(1e-9),  # in bn €
             snakemake.input.costs,

scripts/pypsa-de/plot_ariadne_report.py

@@ -21,7 +21,7 @@
 
 from scripts._helpers import configure_logging, mock_snakemake
 from scripts.add_electricity import load_costs
-from scripts.plot_power_network import assign_location
+from scripts.make_summary import assign_locations
 
 logger = logging.getLogger(__name__)
 
@@ -1594,7 +1594,7 @@ def group_pipes(df, drop_direction=False):
 def plot_h2_map(n, regions, savepath, only_de=False):
     logger.info("Plotting H2 map")
     logger.info("Assigning location")
-    assign_location(n)
+    assign_locations(n)
 
     h2_storage = n.stores[n.stores.carrier.isin(["H2", "H2 Store"])]
     regions["H2"] = (
@@ -1820,7 +1820,7 @@ def plot_h2_map(n, regions, savepath, only_de=False):
 
 
 def plot_h2_map_de(n, regions, tech_colors, savepath, specify_buses=None):
-    assign_location(n)
+    assign_locations(n)
 
     h2_storage = n.stores[n.stores.carrier.isin(["H2", "H2 Store"])]
     regions["H2"] = (
@@ -2685,6 +2685,7 @@ def plot_h2_trade(
             lambda _costs: load_costs(
                 _costs,
                 snakemake.params.costs,
+                snakemake.params.max_hours,
                 nyears,
             ).multiply(1e-9),  # in bn EUR
             snakemake.input.costs,

scripts/pypsa-de/plot_hydrogen_network_incl_kernnetz.py

@@ -15,7 +15,8 @@
 from pypsa.plot import add_legend_circles, add_legend_lines, add_legend_patches
 
 from scripts._helpers import configure_logging, mock_snakemake, set_scenario_config
-from scripts.plot_power_network import assign_location, load_projection
+from scripts.make_summary import assign_locations
+from scripts.plot_power_network import load_projection
 
 logger = logging.getLogger(__name__)
 
@@ -47,7 +48,7 @@ def plot_h2_map(n, regions):
     # if "H2 pipeline" not in n.links.carrier.unique():
     #     return
 
-    assign_location(n)
+    assign_locations(n)
 
     h2_storage = n.stores.query("carrier == 'H2'")
     regions["H2"] = (