diff --git a/rules/solve_perfect.smk b/rules/solve_perfect.smk index 93c5096a..bfd441f1 100644 --- a/rules/solve_perfect.smk +++ b/rules/solve_perfect.smk @@ -190,39 +190,7 @@ rule make_summary_perfect: "../scripts/make_summary_perfect.py" -rule plot_summary_perfect: - input: - **{ - f"costs_{year}": f"data/costs_{year}.csv" - for year in config["scenario"]["planning_horizons"] - }, - costs_csv=RESULTS + "csvs/costs.csv", - energy=RESULTS + "csvs/energy.csv", - balances=RESULTS + "csvs/supply_energy.csv", - eea="data/eea/UNFCCC_v24.csv", - countries=RESULTS + "csvs/nodal_capacities.csv", - co2_emissions=RESULTS + "csvs/co2_emissions.csv", - capacities=RESULTS + "csvs/capacities.csv", - capital_cost=RESULTS + "csvs/capital_cost.csv", - output: - costs1=RESULTS + "graphs/costs.pdf", - costs2=RESULTS + "graphs/costs2.pdf", - costs3=RESULTS + "graphs/total_costs_per_year.pdf", - # energy="results" + '/' + config['run'] + '/graphs/energy.pdf', - balances=RESULTS + "graphs/balances-energy.pdf", - co2_emissions=RESULTS + "graphs/carbon_budget_plot.pdf", - capacities=RESULTS + "graphs/capacities.pdf", - threads: 2 - resources: - mem_mb=10000, - log: - LOGS + "plot_summary_perfect.log", - benchmark: - (BENCHMARKS + "plot_summary_perfect") - conda: - "../envs/environment.yaml" - script: - "../scripts/plot_summary_perfect.py" + ruleorder: add_existing_baseyear > add_brownfield diff --git a/scripts/plot_summary.py b/scripts/plot_summary.py index 376ac9df..8405bd8f 100644 --- a/scripts/plot_summary.py +++ b/scripts/plot_summary.py @@ -356,7 +356,6 @@ def plot_balances(): fig.savefig(snakemake.output.balances[:-10] + k + ".pdf", bbox_inches="tight") - plt.cla() def historical_emissions(countries): @@ -478,7 +477,7 @@ def plot_carbon_budget_distribution(input_eurostat): # add other years https://sdi.eea.europa.eu/data/0569441f-2853-4664-a7cd-db969ef54de0 emissions.loc[2019] = 2.971372 emissions.loc[2020] = 2.691958 - emissions.loc[2020] = 2.869355 + emissions.loc[2021] = 2.869355 if snakemake.config["foresight"] == "myopic": @@ -534,15 +533,15 @@ def plot_carbon_budget_distribution(input_eurostat): ) plt.grid(axis="y") - - plt.savefig(snakemake.output.co2_emissions, bbox_inches="tight") + path = snakemake.output.balances.split("balances")[0] + "carbon_budget.pdf" + plt.savefig(path, bbox_inches="tight") #%% if __name__ == "__main__": if "snakemake" not in globals(): from _helpers import mock_snakemake - snakemake = mock_snakemake("plot_summary_perfect") + snakemake = mock_snakemake("plot_summary") logging.basicConfig(level=snakemake.config["logging"]["level"])