From 4c5ea9e20760823a00ee62a1a11a2c581d2f6c68 Mon Sep 17 00:00:00 2001 From: Thomas Gilon <139848565+tgi-climact@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:27:08 +0200 Subject: [PATCH] Specify input files required to retrieve irena data Co-authored-by: Fabian Neumann --- rules/retrieve.smk | 10 +++------- scripts/retrieve_irena.py | 6 +++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/rules/retrieve.smk b/rules/retrieve.smk index f4188d6b..bd923854 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -40,15 +40,11 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle", if config["enable"].get("retrieve_irena"): - datafiles = [ - "offwind_capacity_IRENA.csv", - "onwind_capacity_IRENA.csv", - "solar_capacity_IRENA.csv", - ] - rule retrieve_irena: output: - expand("data/existing_infrastructure/{file}", file=datafiles), + offwind="data/existing_infrastructure/offwind_capacity_IRENA.csv", + onwind="data/existing_infrastructure/onwind_capacity_IRENA.csv", + solar="data/existing_infrastructure/solar_capacity_IRENA.csv", log: LOGS + "retrieve_irena.log", resources: diff --git a/scripts/retrieve_irena.py b/scripts/retrieve_irena.py index d0f358c2..7b123475 100644 --- a/scripts/retrieve_irena.py +++ b/scripts/retrieve_irena.py @@ -102,6 +102,6 @@ if __name__ == "__main__": ) df_pv = irena[irena.Technology.str.contains("Solar")].drop(columns=["Technology"]) - df_offwind.to_csv(snakemake.output[0]) - df_onwind.to_csv(snakemake.output[1]) - df_pv.to_csv(snakemake.output[2]) + df_offwind.to_csv(snakemake.output["offwind"]) + df_onwind.to_csv(snakemake.output["onwind"]) + df_pv.to_csv(snakemake.output["solar"])