diff --git a/scripts/_helpers.py b/scripts/_helpers.py index b41ed60d..3951be18 100644 --- a/scripts/_helpers.py +++ b/scripts/_helpers.py @@ -31,7 +31,7 @@ def mute_print(): def set_scenario_config(snakemake): - if snakemake.config["run"]["scenarios"] and "run" in snakemake.wildcards: + if snakemake.config["run"]["scenarios"] and "run" in snakemake.wildcards.keys(): try: with open(snakemake.config["scenariofile"], "r") as f: scenario_config = yaml.safe_load(f) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 0c1faacc..1ee42a72 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -17,7 +17,12 @@ import numpy as np import pandas as pd import pypsa import xarray as xr -from _helpers import generate_periodic_profiles, update_config_with_sector_opts +from _helpers import ( + configure_logging, + generate_periodic_profiles, + set_scenario_config, + update_config_with_sector_opts, +) from add_electricity import calculate_annuity, sanitize_carriers from build_energy_totals import build_co2_totals, build_eea_co2, build_eurostat_co2 from networkx.algorithms import complement @@ -3286,6 +3291,7 @@ if __name__ == "__main__": ) logging.basicConfig(level=snakemake.config["logging"]["level"]) + set_scenario_config(snakemake) update_config_with_sector_opts(snakemake.config, snakemake.wildcards.sector_opts)