Move generation of inflow to new cutout

This commit is contained in:
Jonas Hörsch 2018-08-06 21:38:36 +02:00
parent 92530f370a
commit fabbae8add
2 changed files with 4 additions and 3 deletions

View File

@ -101,7 +101,7 @@ rule build_renewable_profiles:
regions=lambda wildcards: ("resources/regions_onshore.geojson" regions=lambda wildcards: ("resources/regions_onshore.geojson"
if wildcards.technology in ('onwind', 'solar') if wildcards.technology in ('onwind', 'solar')
else "resources/regions_offshore.geojson"), else "resources/regions_offshore.geojson"),
cutout=lambda wildcards: "cutouts/" + config["renewable"][wildcards.technology]['cutout'], cutout=lambda wildcards: "cutouts/" + config["renewable"][wildcards.technology]['cutout']
output: output:
profile="resources/profile_{technology}.nc", profile="resources/profile_{technology}.nc",
resources: mem_mb=5000 resources: mem_mb=5000
@ -111,7 +111,8 @@ rule build_renewable_profiles:
rule build_hydro_profile: rule build_hydro_profile:
input: input:
country_shapes='resources/country_shapes.geojson', 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' output: 'resources/profile_hydro.nc'
resources: mem_mb=5000 resources: mem_mb=5000
script: 'scripts/build_hydro_profile.py' script: 'scripts/build_hydro_profile.py'

View File

@ -93,7 +93,7 @@ renewable:
18, 19, 20, 26, 31, 32] 18, 19, 20, 26, 31, 32]
natura: true natura: true
hydro: hydro:
cutout: europe-2012-2016-era5 cutout: europe-2013-era5
carriers: [ror, PHS, hydro] carriers: [ror, PHS, hydro]
PHS_max_hours: 6 PHS_max_hours: 6