Merge commit '1bade22' into implement-floating
This commit is contained in:
commit
786a2461e2
@ -103,7 +103,7 @@ electricity:
|
||||
H2: 168
|
||||
|
||||
extendable_carriers:
|
||||
Generator: [solar, onwind, offwind-ac, offwind-dc, OCGT]
|
||||
Generator: [solar, onwind, offwind-ac, offwind-dc, offwind-float, OCGT]
|
||||
StorageUnit: [] # battery, H2
|
||||
Store: [battery, H2]
|
||||
Link: [] # H2 pipeline
|
||||
@ -112,7 +112,7 @@ electricity:
|
||||
custom_powerplants: false
|
||||
|
||||
conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
|
||||
renewable_carriers: [solar, onwind, offwind-ac, offwind-dc, hydro]
|
||||
renewable_carriers: [solar, onwind, offwind-ac, offwind-dc, offwind-float, hydro]
|
||||
|
||||
estimate_renewable_capacities:
|
||||
enable: true
|
||||
@ -120,7 +120,7 @@ electricity:
|
||||
year: 2020
|
||||
expansion_limit: false
|
||||
technology_mapping:
|
||||
Offshore: [offwind-ac, offwind-dc]
|
||||
Offshore: [offwind-ac, offwind-dc, offwind-float]
|
||||
Onshore: [onwind]
|
||||
PV: [solar]
|
||||
|
||||
@ -178,7 +178,7 @@ renewable:
|
||||
corine: [44, 255]
|
||||
natura: true
|
||||
ship_threshold: 400
|
||||
max_depth: 50
|
||||
max_depth: 60
|
||||
max_shore_distance: 30000
|
||||
excluder_resolution: 200
|
||||
potential: simple # or conservative
|
||||
@ -193,11 +193,28 @@ renewable:
|
||||
corine: [44, 255]
|
||||
natura: true
|
||||
ship_threshold: 400
|
||||
max_depth: 50
|
||||
max_depth: 60
|
||||
min_shore_distance: 30000
|
||||
excluder_resolution: 200
|
||||
potential: simple # or conservative
|
||||
clip_p_max_pu: 1.e-2
|
||||
offwind-float:
|
||||
cutout: europe-2013-era5
|
||||
resource:
|
||||
method: wind
|
||||
turbine: NREL_ReferenceTurbine_5MW_offshore
|
||||
# ScholzPhd Tab 4.3.1: 10MW/km^2
|
||||
capacity_per_sqkm: 2
|
||||
correction_factor: 0.8855
|
||||
# proxy for wake losses
|
||||
# from 10.1016/j.energy.2018.08.153
|
||||
# until done more rigorously in #153
|
||||
corine: [44, 255]
|
||||
natura: true
|
||||
min_depth: 60
|
||||
max_depth: 1000
|
||||
potential: simple # or conservative
|
||||
clip_p_max_pu: 1.e-2
|
||||
solar:
|
||||
cutout: europe-2013-sarah
|
||||
resource:
|
||||
@ -284,6 +301,7 @@ pypsa_eur:
|
||||
- onwind
|
||||
- offwind-ac
|
||||
- offwind-dc
|
||||
- offwind-float
|
||||
- solar
|
||||
- ror
|
||||
StorageUnit:
|
||||
@ -711,6 +729,7 @@ plotting:
|
||||
CCGT: "Combined-Cycle Gas"
|
||||
offwind-ac: "Offshore Wind (AC)"
|
||||
offwind-dc: "Offshore Wind (DC)"
|
||||
offwind-float: "Offshore Wind (Floating)"
|
||||
onwind: "Onshore Wind"
|
||||
solar: "Solar"
|
||||
PHS: "Pumped Hydro Storage"
|
||||
@ -734,6 +753,9 @@ plotting:
|
||||
offwind-dc: "#74c6f2"
|
||||
offshore wind (DC): "#74c6f2"
|
||||
offshore wind dc: "#74c6f2"
|
||||
offwind-float: "#b5e2fa"
|
||||
offshore wind (float): "#b5e2fa"
|
||||
offshore wind float: "#b5e2fa"
|
||||
# water
|
||||
hydro: '#298c81'
|
||||
hydro reservoir: '#298c81'
|
||||
|
@ -220,7 +220,7 @@ rule build_renewable_profiles:
|
||||
gebco=ancient(
|
||||
lambda w: (
|
||||
"data/bundle/GEBCO_2014_2D.nc"
|
||||
if config["renewable"][w.technology].get("max_depth")
|
||||
if (config["renewable"][w.technology].get("max_depth") or config["renewable"][w.technology].get("min_depth"))
|
||||
else []
|
||||
)
|
||||
),
|
||||
|
@ -32,6 +32,7 @@ Relevant settings
|
||||
distance:
|
||||
natura:
|
||||
max_depth:
|
||||
min_depth:
|
||||
max_shore_distance:
|
||||
min_shore_distance:
|
||||
capacity_per_sqkm:
|
||||
@ -266,6 +267,10 @@ if __name__ == "__main__":
|
||||
# and exclude areas where: -max_depth > grid cell depth
|
||||
func = functools.partial(np.greater, -params["max_depth"])
|
||||
excluder.add_raster(snakemake.input.gebco, codes=func, crs=4326, nodata=-1000)
|
||||
|
||||
if params.get("min_depth"):
|
||||
func = functools.partial(np.greater,-params['min_depth'])
|
||||
excluder.add_raster(snakemake.input.gebco, codes=func, crs=4326, nodata=-1000, invert=True)
|
||||
|
||||
if "min_shore_distance" in params:
|
||||
buffer = params["min_shore_distance"]
|
||||
|
Loading…
Reference in New Issue
Block a user