bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

helpers: fix condition in set_scenario_config

Browse Source 
prepare_sector: insert set_scenario_config
This commit is contained in:
Fabian 2023-08-22 18:15:50 +02:00
parent 1810bbd4b3
commit 7b9ab155f4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/_helpers.py
View File

@ -31,7 +31,7 @@ def mute_print():
def set_scenario_config(snakemake): 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: try:
with open(snakemake.config["scenariofile"], "r") as f: with open(snakemake.config["scenariofile"], "r") as f:
scenario_config = yaml.safe_load(f) scenario_config = yaml.safe_load(f)

8
scripts/prepare_sector_network.py
View File

@ -17,7 +17,12 @@ import numpy as np
import pandas as pd import pandas as pd
import pypsa import pypsa
import xarray as xr 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 add_electricity import calculate_annuity, sanitize_carriers
from build_energy_totals import build_co2_totals, build_eea_co2, build_eurostat_co2 from build_energy_totals import build_co2_totals, build_eea_co2, build_eurostat_co2
from networkx.algorithms import complement from networkx.algorithms import complement
@ -3286,6 +3291,7 @@ if __name__ == "__main__":
) )
logging.basicConfig(level=snakemake.config["logging"]["level"]) logging.basicConfig(level=snakemake.config["logging"]["level"])
set_scenario_config(snakemake)
update_config_with_sector_opts(snakemake.config, snakemake.wildcards.sector_opts) update_config_with_sector_opts(snakemake.config, snakemake.wildcards.sector_opts)