Merge branch 'master' into ppm-0.5.15

.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ on:
   - cron: "0 5 * * TUE"
 
 env:
-  DATA_CACHE_NUMBER: 1
+  DATA_CACHE_NUMBER: 2
 
 jobs:
   build:

.gitignore

@@ -37,18 +37,16 @@ dconf
 /data/links_p_nom.csv
 /data/*totals.csv
 /data/biomass*
-/data/bundle-sector/emobility/
-/data/bundle-sector/eea*
-/data/bundle-sector/jrc*
+/data/bundle/emobility/
+/data/bundle/eea*
+/data/bundle/jrc*
 /data/heating/
-/data/bundle-sector/eurostat*
+/data/bundle/eurostat*
 /data/odyssee/
 /data/transport_data.csv
-/data/bundle-sector/switzerland*
 /data/.nfs*
-/data/bundle-sector/Industrial_Database.csv
-/data/retro/tabula-calculator-calcsetbuilding.csv
-/data/bundle-sector/nuts*
+/data/retro/*
+/data/bundle/nuts*
 data/gas_network/scigrid-gas/
 data/costs_*.csv
 

config/config.default.yaml

@@ -69,12 +69,9 @@ enable:
   retrieve: auto
   prepare_links_p_nom: false
   retrieve_databundle: true
-  retrieve_sector_databundle: true
   retrieve_cost_data: true
   build_cutout: false
   retrieve_cutout: true
-  build_natura_raster: false
-  retrieve_natura_raster: true
   custom_busmap: false
   drop_leap_day: true
 
@@ -110,7 +107,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
@@ -120,15 +117,15 @@ electricity:
   everywhere_powerplants: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
 
   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
     from_opsd: true
     year: 2020
     expansion_limit: false
     technology_mapping:
-      Offshore: [offwind-ac, offwind-dc]
+      Offshore: [offwind-ac, offwind-dc, offwind-float]
       Onshore: [onwind]
       PV: [solar]
 
@@ -196,7 +193,7 @@ renewable:
     luisa: false # [0, 5230]
     natura: true
     ship_threshold: 400
-    max_depth: 50
+    max_depth: 60
     max_shore_distance: 30000
     excluder_resolution: 200
     clip_p_max_pu: 1.e-2
@@ -212,10 +209,28 @@ renewable:
     luisa: false # [0, 5230]
     natura: true
     ship_threshold: 400
-    max_depth: 50
+    max_depth: 60
     min_shore_distance: 30000
     excluder_resolution: 200
     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
+    ship_threshold: 400
+    excluder_resolution: 200
+    min_depth: 60
+    max_depth: 1000
+    clip_p_max_pu: 1.e-2
   solar:
     cutout: europe-2013-sarah
     resource:
@@ -309,6 +324,7 @@ pypsa_eur:
   - onwind
   - offwind-ac
   - offwind-dc
+  - offwind-float
   - solar
   - ror
   - nuclear
@@ -854,6 +870,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"
@@ -878,6 +895,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'

config/config.entsoe-all.yaml

@@ -38,6 +38,5 @@ lines:
 enable:
   retrieve: true
   retrieve_databundle: true
-  retrieve_sector_databundle: false
   retrieve_cost_data: true
   retrieve_cutout: true

config/test/config.electricity.yaml

@@ -32,7 +32,7 @@ electricity:
     Store: [H2]
     Link: [H2 pipeline]
 
-  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc]
+  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc, offwind-float]
 
 
 atlite:
@@ -53,6 +53,10 @@ renewable:
   offwind-dc:
     cutout: be-03-2013-era5
     max_depth: false
+  offwind-float:
+    cutout: be-03-2013-era5
+    max_depth: false
+    min_depth: false
   solar:
     cutout: be-03-2013-era5
 

config/test/config.myopic.yaml

@@ -42,7 +42,7 @@ electricity:
     Store: [H2]
     Link: [H2 pipeline]
 
-  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc]
+  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc, offwind-float]
 
 atlite:
   default_cutout: be-03-2013-era5
@@ -62,6 +62,10 @@ renewable:
   offwind-dc:
     cutout: be-03-2013-era5
     max_depth: false
+  offwind-float:
+    cutout: be-03-2013-era5
+    max_depth: false
+    min_depth: false
   solar:
     cutout: be-03-2013-era5
 

config/test/config.overnight.yaml

@@ -36,7 +36,7 @@ electricity:
     Store: [H2]
     Link: [H2 pipeline]
 
-  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc]
+  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc, offwind-float]
 
 atlite:
   default_cutout: be-03-2013-era5
@@ -56,6 +56,10 @@ renewable:
   offwind-dc:
     cutout: be-03-2013-era5
     max_depth: false
+  offwind-float:
+    cutout: be-03-2013-era5
+    max_depth: false
+    min_depth: false
   solar:
     cutout: be-03-2013-era5
 

config/test/config.perfect.yaml

@@ -39,7 +39,7 @@ electricity:
     Store: [H2]
     Link: [H2 pipeline]
 
-  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc]
+  renewable_carriers: [solar, onwind, offwind-ac, offwind-dc, offwind-float]
 
 sector:
   min_part_load_fischer_tropsch: 0
@@ -63,6 +63,10 @@ renewable:
   offwind-dc:
     cutout: be-03-2013-era5
     max_depth: false
+  offwind-float:
+    cutout: be-03-2013-era5
+    max_depth: false
+    min_depth: false
   solar:
     cutout: be-03-2013-era5
 

data/ch_cantons.csv

@@ -0,0 +1,27 @@
+Canton,HASC,NUTS
+Aargau,CH.AG,CH033
+Appenzell Inner Rhodes,CH.AI,CH054
+Appenzell Outer Rhodes,CH.AR,CH053
+Basel-Landschaft,CH.BL,CH032
+Basel-Stadt,CH.BS,CH031
+Bern,CH.BE,CH021
+Fribourg,CH.FR,CH022
+Geneva,CH.GE,CH013
+Glarus,CH.GL,CH051
+Graubünden,CH.GR,CH056
+Jura,CH.JU,CH025
+Lucerne,CH.LU,CH061
+Neuchâtel,CH.NE,CH024
+Nidwalden,CH.NW,CH065
+Obwalden,CH.OW,CH064
+Sankt Gallen,CH.SG,CH055
+Schaffhausen,CH.SH,CH052
+Schwyz,CH.SZ,CH063
+Solothurn,CH.SO,CH023
+Thurgau,CH.TG,CH057
+Ticino,CH.TI,CH07
+Uri,CH.UR,CH062
+Valais,CH.VS,CH012
+Vaud,CH.VD,CH011
+Zug,CH.ZG,CH066
+Zurich,CH.ZH,CH04

data/hydro_capacities.csv

@@ -0,0 +1,31 @@
+Country,p_nom_discharge[GW],p_nom_store[GW],E_store[TWh],InflowHourlyAvg[GWh]
+AT,13.08,3.8,3.2,4.02
+BE,1.42,1.31,0,0.04
+BA,2.05,0.62,2.5,0.71
+BG,3.13,0.86,4,0.53
+HR,2,0.61,2.8,0.57
+CZ,2.21,0.68,1.5,0.24
+DK,0.01,0,0,0
+EE,0.01,0,0,0
+FI,3.2,0,5.5,1.59
+FR,25.37,6.99,9.8,7.82
+DE,11.26,6.8,0.3,1.93
+GB,4.43,2.74,0,0.46
+GR,3.24,0.7,2.3,0.26
+HU,0.06,0,0.1,0.02
+IE,0.53,0.29,0,0.08
+IT,21.88,7.55,7.9,5.19
+LV,1.58,0,1.8,0.3
+LT,0.88,0.76,0.2,0.05
+LU,1.13,1.29,0,0
+NL,0.04,0,0,0.01
+NO,30.51,1.35,84.4,14
+PL,2.35,1.4,1.6,0.23
+PT,5.72,1.03,2.6,1.37
+RO,6.55,0.09,12.1,1.95
+RS,2.14,0.61,0,1.18
+SK,2.52,0.92,2.2,0.49
+SI,1.25,0.18,2.2,0.36
+ES,18.55,2.75,18.4,2.61
+SE,16.41,0.1,33.8,7.8
+CH,13.3,4.03,8.4,4.29

doc/configtables/electricity.csv

@@ -28,14 +28,14 @@ everywhere_powerplants,--,"Any subset of {nuclear, oil, OCGT, CCGT, coal, lignit
 ,,,
 conventional_carriers,--,"Any subset of {nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass}","List of conventional power plants to include in the model from ``resources/powerplants.csv``. If an included carrier is also listed in ``extendable_carriers``, the capacity is taken as a lower bound."
 ,,,
-renewable_carriers,--,"Any subset of {solar, onwind, offwind-ac, offwind-dc, hydro}",List of renewable generators to include in the model.
+renewable_carriers,--,"Any subset of {solar, onwind, offwind-ac, offwind-dc, offwind-float, hydro}",List of renewable generators to include in the model.
 estimate_renewable_capacities,,,
 -- enable,,bool,Activate routine to estimate renewable capacities
 -- from_opsd,--,bool,Add renewable capacities from `OPSD database <https://data.open-power-system-data.org/renewable_power_plants/2020-08-25>`_. The value is depreciated but still can be used.
 -- year,--,bool,Renewable capacities are based on existing capacities reported by IRENA (IRENASTAT) for the specified year
 -- expansion_limit,--,float or false,"Artificially limit maximum IRENA capacities to a factor.  For example, an ``expansion_limit: 1.1`` means 110% of capacities . If false are chosen, the estimated renewable potentials determine by the workflow are used."
 -- technology_mapping,,,Mapping between PyPSA-Eur and powerplantmatching technology names
--- -- Offshore,--,"Any subset of {offwind-ac, offwind-dc}","List of PyPSA-Eur carriers that is considered as (IRENA, OPSD) onshore technology."
+-- -- Offshore,--,"Any subset of {offwind-ac, offwind-dc, offwind-float}","List of PyPSA-Eur carriers that is considered as (IRENA, OPSD) onshore technology."
 -- -- Offshore,--,{onwind},"List of PyPSA-Eur carriers that is considered as (IRENA, OPSD) offshore technology."
 -- -- PV,--,{solar},"List of PyPSA-Eur carriers that is considered as (IRENA, OPSD) PV technology."
 autarky,,,

doc/configtables/enable.csv

@@ -2,11 +2,8 @@
 enable,str or bool,"{auto, true, false}","Switch to include (true) or exclude (false) the retrieve_* rules of snakemake into the workflow; 'auto' sets true|false based on availability of an internet connection to prevent issues with snakemake failing due to lack of internet connection."
 prepare_links_p_nom,bool,"{true, false}","Switch to retrieve current HVDC projects from `Wikipedia <https://en.wikipedia.org/wiki/List_of_HVDC_projects>`_"
 retrieve_databundle,bool,"{true, false}","Switch to retrieve databundle from zenodo via the rule :mod:`retrieve_databundle` or whether to keep a custom databundle located in the corresponding folder."
-retrieve_sector_databundle,bool,"{true, false}","Switch to retrieve sector databundle from zenodo via the rule :mod:`retrieve_sector_databundle` or whether to keep a custom databundle located in the corresponding folder."
 retrieve_cost_data,bool,"{true, false}","Switch to retrieve technology cost data from `technology-data repository <https://github.com/PyPSA/technology-data>`_."
 build_cutout,bool,"{true, false}","Switch to enable the building of cutouts via the rule :mod:`build_cutout`."
 retrieve_cutout,bool,"{true, false}","Switch to enable the retrieval of cutouts from zenodo with :mod:`retrieve_cutout`."
-build_natura_raster,bool,"{true, false}","Switch to enable the creation of the raster ``natura.tiff`` via the rule :mod:`build_natura_raster`."
-retrieve_natura_raster,bool,"{true, false}","Switch to enable the retrieval of ``natura.tiff`` from zenodo with :mod:`retrieve_natura_raster`."
 custom_busmap,bool,"{true, false}","Switch to enable the use of custom busmaps in rule :mod:`cluster_network`. If activated the rule looks for provided busmaps at ``data/custom_busmap_elec_s{simpl}_{clusters}.csv`` which should have the same format as ``resources/busmap_elec_s{simpl}_{clusters}.csv``, i.e. the index should contain the buses of ``networks/elec_s{simpl}.nc``."
 drop_leap_day,bool,"{true, false}","Switch to drop February 29 from all time-dependent data in leap years"

doc/configtables/licenses.csv

@@ -5,10 +5,8 @@
 "naturalearth/*",,,,,http://www.naturalearthdata.com/about/terms-of-use/
 "NUTS_2013 _60M_SH/*","x","x",,"x",https://ec.europa.eu/eurostat/web/gisco/geodata/reference-data/administrative-units-statistical-units
 "cantons.csv","x",,"x",,https://en.wikipedia.org/wiki/Data_codes_for_Switzerland
-"eia_hydro_annual_generation.csv","x",,,,https://www.eia.gov/about/copyrights_reuse.php
-"GEBCO_2014_2D.nc","x",,,,https://www.gebco.net/data_and_products/gridded_bathymetry_data/documents/gebco_2014_historic.pdf
+"gebco/GEBCO_2014_2D.nc","x",,,,https://www.gebco.net/data_and_products/gridded_bathymetry_data/documents/gebco_2014_historic.pdf
 "hydro_capacities.csv","x",,,,
 "je-e-21.03.02.xls","x","x",,,https://www.bfs.admin.ch/bfs/en/home/fso/swiss-federal-statistical-office/terms-of-use.html
 "nama_10r_3 gdp.tsv.gz","x",,,"x",https://ec.europa.eu/eurostat/about/policies/copyright
 "nama_10r_3 popgdp.tsv.gz","x",,,"x",https://ec.europa.eu/eurostat/about/policies/copyright
-"time_series_60min _singleindex_filtered.csv","x",,,,https://data.open-power-system-data.org/time_series/2019-06-05/README.md

doc/configtables/load.csv

@@ -4,4 +4,4 @@ time_shift_for_large_gaps,string,string,"Periods which are used for copying time
 manual_adjustments,bool,"{true, false}","Whether to adjust the load data manually according to the function in :func:`manual_adjustment`."
 scaling_factor,--,float,"Global correction factor for the load time series."
 fixed_year,--,Year or False,"To specify a fixed year for the load time series that deviates from the snapshots' year"
-supplement_synthetic,bool,"{true, false}","Whether to supplement missing data for selected time period should be supplemented by synthetic data from https://zenodo.org/record/10820928."
+supplement_synthetic,bool,"{true, false}","Whether to supplement missing data for selected time period should be supplemented by synthetic data from https://zenodo.org/records/10820928."

doc/configuration.rst

@@ -31,7 +31,7 @@ Top-level configuration
 .. _run_cf:
 
 ``run``
-=======
+=============
 
 It is common conduct to analyse energy system optimisation models for **multiple scenarios** for a variety of reasons,
 e.g. assessing their sensitivity towards changing the temporal and/or geographical resolution or investigating how
@@ -265,17 +265,33 @@ Define and specify the ``atlite.Cutout`` used for calculating renewable potentia
 .. literalinclude:: ../config/config.default.yaml
    :language: yaml
    :start-at:   offwind-dc:
-   :end-before:   solar:
+   :end-before:   offwind-float:
 
 .. csv-table::
    :header-rows: 1
    :widths: 22,7,22,33
    :file: configtables/offwind-dc.csv
 
 .. note::
-   both ``offwind-ac`` and ``offwind-dc`` have the same assumption on
+   Both ``offwind-ac`` and ``offwind-dc`` have the same assumption on
    ``capacity_per_sqkm`` and ``correction_factor``.
 
+``offwind-float``
+---------------
+
+.. literalinclude:: ../config/config.default.yaml
+   :language: yaml
+   :start-at:   offwind-float:
+   :end-before:   solar:
+
+.. csv-table::
+   :header-rows: 1
+   :widths: 22,7,22,33
+   :file: configtables/offwind-float.csv
+
+.. note::
+   ``offwind-ac``,  ``offwind-dc`` , ``offwind-float`` have the same assumption on
+   ``capacity_per_sqkm`` and ``correction_factor``.
 ``solar``
 ---------------
 

doc/licenses.rst

@@ -28,16 +28,13 @@ Electricity Systems Databundle
   More details are included in `the description of the
   data bundles on zenodo <https://zenodo.org/record/3517935#.XbGeXvzRZGo>`__.
 
-.. csv-table::
-   :header-rows: 1
-   :file: configtables/licenses.csv
-
 * BY: Attribute Source
 * NC: Non-Commercial Use Only
 * SA: Share Alike
 
-Sector-Coupled Systems Databundle
-=================================
+.. csv-table::
+   :header-rows: 1
+   :file: configtables/licenses.csv
 
 .. csv-table::
    :header-rows: 1