correctly read st_primary_fraction from config

PyPSA · Nov 21, 2024 · be366a7 · be366a7
1 parent f406e1b
commit be366a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/workflow/Snakefile b/workflow/Snakefile
@@ -475,6 +475,7 @@ rule export_ariadne_variables:
         planning_horizons=config_provider("scenario", "planning_horizons"),
         hours=config_provider("clustering", "temporal", "resolution_sector"),
         costs=config_provider("costs"),
+        config_industry=config_provider("industry"),
         energy_totals_year=config_provider("energy", "energy_totals_year"),
         co2_price_add_on_fossils=config_provider("co2_price_add_on_fossils"),
         co2_sequestration_cost=config_provider("sector", "co2_sequestration_cost"),

diff --git a/workflow/scripts/export_ariadne_variables.py b/workflow/scripts/export_ariadne_variables.py
@@ -1796,7 +1796,7 @@ def get_final_energy(
     h2_fossil_fraction = _get_h2_fossil_fraction(n)
     oil_fractions = _get_fuel_fractions(n, region, "oil")
 
-    if config["industry"]["ammonia"]:
+    if config_industry["ammonia"]:
         # MWh/a
         Haber_Bosch_NH3 = (
             n.statistics.supply(bus_carrier="NH3", **kwargs)
@@ -1807,14 +1807,14 @@ def get_final_energy(
         CH4_for_NH3 = (
             Haber_Bosch_NH3
             * h2_fossil_fraction
-            * config["industry"]["MWh_CH4_per_tNH3_SMR"]
-            / config["industry"]["MWh_NH3_per_tNH3"]
+            * config_industry["MWh_CH4_per_tNH3_SMR"]
+            / config_industry["MWh_NH3_per_tNH3"]
             * MWh2PJ
         )
         H2_for_NH3 = (
             Haber_Bosch_NH3
             * (1 - h2_fossil_fraction)
-            / config["industry"]["MWh_H2_per_tNH3_electrolysis"]
+            / config_industry["MWh_H2_per_tNH3_electrolysis"]
             * MWh2PJ
         )
         subcategories = ["HVC", "Methanol", "Chlorine"]
@@ -4433,10 +4433,10 @@ def get_production(region, year):
         "DE", ["Electric arc", "Integrated steelworks", "DRI + Electric arc"]
     ].sum()
     var["Production|Steel|Primary"] = (
-        var["Production|Steel"] * config["industry"]["St_primary_fraction"][year]
+        var["Production|Steel"] * config_industry["St_primary_fraction"][year]
     )
     var["Production|Steel|Secondary"] = var["Production|Steel"] * (
-        1 - config["industry"]["St_primary_fraction"][year]
+        1 - config_industry["St_primary_fraction"][year]
     )
 
     # optional:
@@ -5170,6 +5170,7 @@ def get_data(
         )
     configure_logging(snakemake)
     config = snakemake.config
+    config_industry = snakemake.params.config_industry
     planning_horizons = snakemake.params.planning_horizons
     post_discretization = snakemake.params.post_discretization
     ariadne_template = pd.read_excel(snakemake.input.template, sheet_name=None)