Merge branch 'merge-pypsa-eur-sec' of github.com:PyPSA/pypsa-eur into merge-pypsa-eur-sec
This commit is contained in:
commit
511f30d520
@ -1,7 +1,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
from shutil import copy
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from shutil import copy
|
||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
@ -676,8 +676,7 @@ if __name__ == "__main__":
|
|||||||
logging.basicConfig(level=snakemake.config["logging"]["level"])
|
logging.basicConfig(level=snakemake.config["logging"]["level"])
|
||||||
|
|
||||||
networks_dict = {
|
networks_dict = {
|
||||||
(cluster, lv, opt + sector_opt, planning_horizon):
|
(cluster, lv, opt + sector_opt, planning_horizon): "results/"
|
||||||
"results/"
|
|
||||||
+ snakemake.params.RDIR
|
+ snakemake.params.RDIR
|
||||||
+ f"/postnetworks/elec_s{simpl}_{cluster}_lv{lv}_{opt}_{sector_opt}_{planning_horizon}.nc"
|
+ f"/postnetworks/elec_s{simpl}_{cluster}_lv{lv}_{opt}_{sector_opt}_{planning_horizon}.nc"
|
||||||
for simpl in snakemake.config["scenario"]["simpl"]
|
for simpl in snakemake.config["scenario"]["simpl"]
|
||||||
|
@ -531,9 +531,7 @@ def plot_carbon_budget_distribution(input_eurostat):
|
|||||||
fancybox=True, fontsize=18, loc=(0.01, 0.01), facecolor="white", frameon=True
|
fancybox=True, fontsize=18, loc=(0.01, 0.01), facecolor="white", frameon=True
|
||||||
)
|
)
|
||||||
|
|
||||||
path_cb_plot = (
|
path_cb_plot = "results/" + snakemake.params.RDIR + "/graphs/"
|
||||||
"results/" + snakemake.params.RDIR + "/graphs/"
|
|
||||||
)
|
|
||||||
plt.savefig(path_cb_plot + "carbon_budget_plot.pdf", dpi=300)
|
plt.savefig(path_cb_plot + "carbon_budget_plot.pdf", dpi=300)
|
||||||
|
|
||||||
|
|
||||||
|
@ -3343,11 +3343,7 @@ if __name__ == "__main__":
|
|||||||
if not "cb" in o:
|
if not "cb" in o:
|
||||||
continue
|
continue
|
||||||
limit_type = "carbon budget"
|
limit_type = "carbon budget"
|
||||||
fn = (
|
fn = "results/" + snakemake.params.RDIR + "/csvs/carbon_budget_distribution.csv"
|
||||||
"results/"
|
|
||||||
+ snakemake.params.RDIR
|
|
||||||
+ "/csvs/carbon_budget_distribution.csv"
|
|
||||||
)
|
|
||||||
if not os.path.exists(fn):
|
if not os.path.exists(fn):
|
||||||
emissions_scope = snakemake.config["energy"]["emissions"]
|
emissions_scope = snakemake.config["energy"]["emissions"]
|
||||||
report_year = snakemake.config["energy"]["eurostat_report_year"]
|
report_year = snakemake.config["energy"]["eurostat_report_year"]
|
||||||
|
Loading…
Reference in New Issue
Block a user