diff --git a/Snakefile b/Snakefile index d50dfe8e..c26beb91 100644 --- a/Snakefile +++ b/Snakefile @@ -319,7 +319,13 @@ rule retrieve_ship_raster: rule build_ship_raster: input: ship_density="data/shipdensity_global.zip", - cutouts=expand("cutouts/" + CDIR + "{cutout}.nc", cutout=[config["renewable"][k]['cutout'] for k in config['electricity']['renewable_carriers']]) + 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: diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 7e7fab1f..76a794ad 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -10,7 +10,7 @@ Release Notes Upcoming Release ================ -* The solver configuration in `config.default.yaml` are now modularized. To change the set of solver options, change to value in `solving`: `solver`: `options` to one of the keys `solving`: `solver_options`. +* The solver configuration in `config.default.yaml` are now modularized. To change the set of solver options, change to value in `solving`: `solver`: `options` to one of the keys `solving`: `solver_options`. PyPSA-Eur 0.7.0 (16th February 2023) diff --git a/test/config.test1.yaml b/test/config.test1.yaml index 5ab22d35..cf8e06bc 100755 --- a/test/config.test1.yaml +++ b/test/config.test1.yaml @@ -46,7 +46,7 @@ renewable: solar: cutout: be-03-2013-era5 - + clustering: exclude_carriers: ["OCGT", "offwind-ac", "coal"]