Merge branch 'master' into shipping_raster

This commit is contained in:
Fabian Neumann 2022-08-02 15:01:05 +02:00 committed by GitHub
commit 09d126706e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 1 deletions

View File

@ -122,6 +122,7 @@ renewable:
distance: 1000
distance_grid_codes: [1, 2, 3, 4, 5, 6]
natura: true
excluder_resolution: 100
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-ac:
@ -139,6 +140,7 @@ renewable:
ship_threshold: 400
max_depth: 50
max_shore_distance: 30000
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-dc:
@ -157,6 +159,7 @@ renewable:
ship_threshold: 400
max_depth: 50
min_shore_distance: 30000
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2
solar:
@ -179,6 +182,7 @@ renewable:
corine: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 26, 31, 32]
natura: true
excluder_resolution: 100
potential: simple # or conservative
clip_p_max_pu: 1.e-2
hydro:

View File

@ -78,6 +78,7 @@ renewable:
distance: 1000
distance_grid_codes: [1, 2, 3, 4, 5, 6]
natura: true
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-ac:
@ -91,6 +92,7 @@ renewable:
natura: true
ship_threshold: 400
max_shore_distance: 30000
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-dc:
@ -105,6 +107,7 @@ renewable:
natura: true
ship_threshold: 400
min_shore_distance: 30000
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2
solar:
@ -126,6 +129,7 @@ renewable:
corine: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 26, 31, 32]
natura: true
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2

View File

@ -228,7 +228,8 @@ if __name__ == '__main__':
regions = regions.set_index('name').rename_axis('bus')
buses = regions.index
excluder = atlite.ExclusionContainer(crs=3035, res=100)
res = config.get("excluder_resolution", 100)
excluder = atlite.ExclusionContainer(crs=3035, res=res)
if config['natura']:
excluder.add_raster(snakemake.input.natura, nodata=0, allow_no_overlap=True)

View File

@ -77,6 +77,7 @@ renewable:
distance: 1000
distance_grid_codes: [1, 2, 3, 4, 5, 6]
natura: true
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-ac:
@ -90,6 +91,7 @@ renewable:
natura: true
ship_threshold: 400
max_shore_distance: 30000
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2
offwind-dc:
@ -104,6 +106,7 @@ renewable:
natura: true
ship_threshold: 400
min_shore_distance: 30000
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2
solar:
@ -124,6 +127,7 @@ renewable:
corine: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 26, 31, 32]
natura: true
excluder_resolution: 200
potential: simple # or conservative
clip_p_max_pu: 1.e-2