From 7ca769bcf01272cd56cf079ca5faa04f06dd2835 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 29 Nov 2023 12:09:39 +0100
Subject: [PATCH 1/3] option to skip ship_raster download if not added as
 exclusion zone

---
 rules/build_electricity.smk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/build_electricity.smk b/rules/build_electricity.smk
index f9fdc3ac..0be36ff7 100644
--- a/rules/build_electricity.smk
+++ b/rules/build_electricity.smk
@@ -226,7 +226,7 @@ rule build_renewable_profiles:
         ),
         ship_density=lambda w: (
             RESOURCES + "shipdensity_raster.tif"
-            if "ship_threshold" in config["renewable"][w.technology].keys()
+            if config["renewable"][w.technology].get("ship_threshold", False)
             else []
         ),
         country_shapes=RESOURCES + "country_shapes.geojson",

From 803b860923cd1658ebcfaf8c1249eb4de600132b Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 29 Nov 2023 13:41:26 +0100
Subject: [PATCH 2/3] 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
 -------

From 98797e2e30b642574a18703073b3488af5f1c368 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 29 Nov 2023 13:46:28 +0100
Subject: [PATCH 3/3] follow-up to 7ca769bc

---
 scripts/build_renewable_profiles.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build_renewable_profiles.py b/scripts/build_renewable_profiles.py
index 7b08325b..ed7cf434 100644
--- a/scripts/build_renewable_profiles.py
+++ b/scripts/build_renewable_profiles.py
@@ -251,7 +251,7 @@ if __name__ == "__main__":
             snakemake.input.corine, codes=codes, buffer=buffer, crs=3035
         )
 
-    if "ship_threshold" in params:
+    if params.get("ship_threshold"):
         shipping_threshold = (
             params["ship_threshold"] * 8760 * 6
         )  # approximation because 6 years of data which is hourly collected