From 803b860923cd1658ebcfaf8c1249eb4de600132b Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 29 Nov 2023 13:41:26 +0100 Subject: [PATCH] move load_raw.csv to resources since it's config file dependent --- doc/retrieve.rst | 2 +- rules/build_electricity.smk | 2 +- rules/retrieve.smk | 2 +- scripts/build_electricity_demand.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/retrieve.rst b/doc/retrieve.rst index ce32715c..f6c92092 100644 --- a/doc/retrieve.rst +++ b/doc/retrieve.rst @@ -91,7 +91,7 @@ None. **Outputs** -- ``data/load_raw.csv`` +- ``resources/load_raw.csv`` Rule ``retrieve_cost_data`` diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk index 0be36ff7..cc4f6f5e 100644 --- a/rules/build_electricity.smk +++ b/rules/build_electricity.smk @@ -24,7 +24,7 @@ rule build_electricity_demand: countries=config["countries"], load=config["load"], input: - ancient("data/load_raw.csv"), + ancient(RESOURCES + "load_raw.csv"), output: RESOURCES + "load.csv", log: diff --git a/rules/retrieve.smk b/rules/retrieve.smk index b830be25..ddb519be 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -195,7 +195,7 @@ if config["enable"]["retrieve"]: static=True, ), output: - "data/load_raw.csv", + RESOURCES + "load_raw.csv", log: LOGS + "retrieve_electricity_demand.log", resources: diff --git a/scripts/build_electricity_demand.py b/scripts/build_electricity_demand.py index 38c75544..781ad991 100755 --- a/scripts/build_electricity_demand.py +++ b/scripts/build_electricity_demand.py @@ -31,7 +31,7 @@ Relevant Settings Inputs ------ -- ``data/load_raw.csv``: +- ``resources/load_raw.csv``: Outputs -------