From dc83fd8e0912f6a27e67d64ea8d1cce5e339344f Mon Sep 17 00:00:00 2001 From: martacki Date: Fri, 14 Jan 2022 15:13:44 +0100 Subject: [PATCH] fix small bugs --- scripts/make_summary.py | 7 +++---- scripts/plot_p_nom_max.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/make_summary.py b/scripts/make_summary.py index a283fd20..3f8ee728 100644 --- a/scripts/make_summary.py +++ b/scripts/make_summary.py @@ -403,8 +403,7 @@ def make_summaries(networks_dict, paths, config, country='all'): n = n[n.buses.country == country] Nyears = n.snapshot_weightings.objective.sum() / 8760. - costs = load_costs(tech_costs = paths[0], config = config['costs'], - elec_config = config['electricity'], Nyears) + costs = load_costs(paths[0], config['costs'], config['electricity'], Nyears) update_transmission_costs(n, costs, simple_hvdc_costs=False) assign_carriers(n) @@ -448,9 +447,9 @@ if __name__ == "__main__": os.path.join(network_dir, f'elec_s{simpl}_' f'{clusters}_ec_l{l}_{opts}.nc') for simpl in expand_from_wildcard("simpl", config) - for clusters in expand_from_wildcard("clusters") + for clusters in expand_from_wildcard("clusters", config) for l in ll - for opts in expand_from_wildcard("opts")} + for opts in expand_from_wildcard("opts", config)} dfs = make_summaries(networks_dict, paths, config, country=wildcards.country) diff --git a/scripts/plot_p_nom_max.py b/scripts/plot_p_nom_max.py index 540608f9..ea66d612 100644 --- a/scripts/plot_p_nom_max.py +++ b/scripts/plot_p_nom_max.py @@ -19,7 +19,7 @@ Description """ import logging -from _helpers import configure_logging +from _helpers import configure_logging, retrieve_snakemake_keys import pypsa import pandas as pd