ci modularization fix cutout retrieval and profile in dag

Snakefile

@@ -319,7 +319,7 @@ rule retrieve_ship_raster:
 rule build_ship_raster:
     input:
         ship_density="data/shipdensity_global.zip",
-        cutouts=expand("cutouts/" + CDIR + "{cutouts}.nc", **config["atlite"]),
+        cutouts=expand("cutouts/" + CDIR + "{cutout}.nc", cutout=[config["renewable"][k]['cutout'] for k in config['electricity']['renewable_carriers']])
     output:
         "resources/" + RDIR + "shipdensity_raster.nc",
     log:
@@ -381,9 +381,7 @@ rule build_hydro_profile:
     input:
         country_shapes="resources/" + RDIR + "country_shapes.geojson",
         eia_hydro_generation="data/eia_hydro_annual_generation.csv",
-        cutout=f"cutouts/" + CDIR + config["renewable"]["hydro"]["cutout"] + ".nc"
-        if "hydro" in config["renewable"]
-        else [],
+        cutout=f"cutouts/" + CDIR + config["renewable"]["hydro"]["cutout"] + ".nc",
     output:
         "resources/" + RDIR + "profile_hydro.nc",
     log:
@@ -398,7 +396,7 @@ rule add_electricity:
     input:
         **{
             f"profile_{tech}": "resources/" + RDIR + f"profile_{tech}.nc"
-            for tech in config["renewable"]
+            for tech in config["electricity"]["renewable_carriers"]
         },
         **{
             f"conventional_{carrier}_{attr}": fn

config.default.yaml

@@ -356,8 +356,8 @@ solving:
       solutiontype: 2 # non basic solution, ie no crossover
       barrier_convergetol: 1.e-5
       feasopt_tolerance: 1.e-6
-
     cbc-default: {} # Used in CI
+    glpk-default: {} # Used in CI
 
   mem: 30000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2
 

scripts/add_electricity.py

@@ -720,7 +720,7 @@ if __name__ == "__main__":
     ppl = load_powerplants(snakemake.input.powerplants)
 
     if "renewable_carriers" in snakemake.config["electricity"]:
-        renewable_carriers = set(snakemake.config["renewable"])
+        renewable_carriers = set(snakemake.config["electricity"]["renewable_carriers"])
     else:
         logger.warning(
             "Missing key `renewable_carriers` under config entry `electricity`. "

test/config.test1.yaml

@@ -23,6 +23,8 @@ electricity:
     Store: [H2]
     Link: [H2 pipeline]
 
+  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc]
+
 
 atlite:
   cutouts:
@@ -44,9 +46,12 @@ renewable:
   solar:
     cutout: be-03-2013-era5
 
+  
 clustering:
   exclude_carriers: ["OCGT", "offwind-ac", "coal"]
 
+
 solving:
   solver:
     name: glpk
+    options: "glpk-default"