diff --git a/Snakefile b/Snakefile index b4efe832..8fa67830 100644 --- a/Snakefile +++ b/Snakefile @@ -101,7 +101,7 @@ rule build_renewable_profiles: regions=lambda wildcards: ("resources/regions_onshore.geojson" if wildcards.technology in ('onwind', 'solar') else "resources/regions_offshore.geojson"), - cutout=lambda wildcards: "cutouts/" + config["renewable"][wildcards.technology]['cutout'], + cutout=lambda wildcards: "cutouts/" + config["renewable"][wildcards.technology]['cutout'] output: profile="resources/profile_{technology}.nc", resources: mem_mb=5000 @@ -111,7 +111,8 @@ rule build_renewable_profiles: rule build_hydro_profile: input: country_shapes='resources/country_shapes.geojson', - eia_hydro_generation='data/bundle/EIA_hydro_generation_2000_2014.csv' + eia_hydro_generation='data/bundle/EIA_hydro_generation_2000_2014.csv', + cutout="cutouts/" + config["renewable"]['hydro']['cutout'] output: 'resources/profile_hydro.nc' resources: mem_mb=5000 script: 'scripts/build_hydro_profile.py' diff --git a/config.yaml b/config.yaml index 85c0a63c..bfd63483 100644 --- a/config.yaml +++ b/config.yaml @@ -93,7 +93,7 @@ renewable: 18, 19, 20, 26, 31, 32] natura: true hydro: - cutout: europe-2012-2016-era5 + cutout: europe-2013-era5 carriers: [ror, PHS, hydro] PHS_max_hours: 6