Merge branch 'master' into implement-floating

This commit is contained in:
Fabian Neumann 2024-05-13 10:04:42 +02:00 committed by GitHub
commit 84d6634af0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
47 changed files with 795 additions and 1023 deletions

View File

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

14
.gitignore vendored
View File

@ -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

View File

@ -30,7 +30,3 @@ License: CC0-1.0
Files: borg-it
Copyright: 2017-2024 The PyPSA-Eur Authors
License: CC0-1.0
Files: graphics/*
Copyright: 2017-2024 The PyPSA-Eur Authors
License: CC-BY-4.0

View File

@ -80,7 +80,7 @@ all greenhouse gas emitters except waste management and land use.
This diagram gives an overview of the sectors and the links between
them:
![sector diagram](graphics/multisector_figure.png)
![sector diagram](doc/img/multisector_figure.png)
Each of these sectors is built up on the transmission network nodes
from [PyPSA-Eur](https://github.com/PyPSA/pypsa-eur):

View File

@ -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

View File

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

27
data/ch_cantons.csv Normal file
View File

@ -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
1 Canton HASC NUTS
2 Aargau CH.AG CH033
3 Appenzell Inner Rhodes CH.AI CH054
4 Appenzell Outer Rhodes CH.AR CH053
5 Basel-Landschaft CH.BL CH032
6 Basel-Stadt CH.BS CH031
7 Bern CH.BE CH021
8 Fribourg CH.FR CH022
9 Geneva CH.GE CH013
10 Glarus CH.GL CH051
11 Graubünden CH.GR CH056
12 Jura CH.JU CH025
13 Lucerne CH.LU CH061
14 Neuchâtel CH.NE CH024
15 Nidwalden CH.NW CH065
16 Obwalden CH.OW CH064
17 Sankt Gallen CH.SG CH055
18 Schaffhausen CH.SH CH052
19 Schwyz CH.SZ CH063
20 Solothurn CH.SO CH023
21 Thurgau CH.TG CH057
22 Ticino CH.TI CH07
23 Uri CH.UR CH062
24 Valais CH.VS CH012
25 Vaud CH.VD CH011
26 Zug CH.ZG CH066
27 Zurich CH.ZH CH04

31
data/hydro_capacities.csv Normal file
View File

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

View File

@ -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"

1 Unit Values Description
2 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.
3 prepare_links_p_nom bool {true, false} Switch to retrieve current HVDC projects from `Wikipedia <https://en.wikipedia.org/wiki/List_of_HVDC_projects>`_
4 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.
5 retrieve_cost_data bool {true, false} Switch to retrieve technology cost data from `technology-data repository <https://github.com/PyPSA/technology-data>`_.
6 build_cutout bool {true, false} Switch to enable the building of cutouts via the rule :mod:`build_cutout`.
7 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`.
8 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``.
9 drop_leap_day bool {true, false} Switch to drop February 29 from all time-dependent data in leap years

View File

@ -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

1 Files BY NC SA Mark Changes Detail
5 naturalearth/* http://www.naturalearthdata.com/about/terms-of-use/
6 NUTS_2013 _60M_SH/* x x x https://ec.europa.eu/eurostat/web/gisco/geodata/reference-data/administrative-units-statistical-units
7 cantons.csv x x https://en.wikipedia.org/wiki/Data_codes_for_Switzerland
8 eia_hydro_annual_generation.csv gebco/GEBCO_2014_2D.nc x https://www.eia.gov/about/copyrights_reuse.php https://www.gebco.net/data_and_products/gridded_bathymetry_data/documents/gebco_2014_historic.pdf
GEBCO_2014_2D.nc x https://www.gebco.net/data_and_products/gridded_bathymetry_data/documents/gebco_2014_historic.pdf
9 hydro_capacities.csv x
10 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
11 nama_10r_3 gdp.tsv.gz x x https://ec.europa.eu/eurostat/about/policies/copyright
12 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

View File

@ -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."

1 Unit Values Description
4 manual_adjustments bool {true, false} Whether to adjust the load data manually according to the function in :func:`manual_adjustment`.
5 scaling_factor -- float Global correction factor for the load time series.
6 fixed_year -- Year or False To specify a fixed year for the load time series that deviates from the snapshots' year
7 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. Whether to supplement missing data for selected time period should be supplemented by synthetic data from https://zenodo.org/records/10820928.

View File

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 98 KiB

View File

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

View File

Before

Width:  |  Height:  |  Size: 533 KiB

After

Width:  |  Height:  |  Size: 533 KiB

View File

Before

Width:  |  Height:  |  Size: 269 KiB

After

Width:  |  Height:  |  Size: 269 KiB

View File

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 2.3 MiB

View File

Before

Width:  |  Height:  |  Size: 290 KiB

After

Width:  |  Height:  |  Size: 290 KiB

View File

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 110 KiB

View File

Before

Width:  |  Height:  |  Size: 523 KiB

After

Width:  |  Height:  |  Size: 523 KiB

View File

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 99 KiB

View File

Before

Width:  |  Height:  |  Size: 801 KiB

After

Width:  |  Height:  |  Size: 801 KiB

View File

@ -74,7 +74,7 @@ greenhouse gas emitters except waste management, agriculture, forestry and land
use. The diagram below gives an overview of the sectors and the links between
them:
.. image:: ../graphics/multisector_figure.png
.. image:: img/multisector_figure.png
:width: 70%
:align: center

View File

@ -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

View File

@ -26,7 +26,6 @@ With these and the externally extracted ENTSO-E online map topology
Then the process continues by calculating conventional power plant capacities, potentials, and per-unit availability time series for variable renewable energy carriers and hydro power plants with the following rules:
- :mod:`build_powerplants` for today's thermal power plant capacities using `powerplantmatching <https://github.com/FRESNA/powerplantmatching>`__ allocating these to the closest substation for each powerplant,
- :mod:`build_natura_raster` for rasterising NATURA2000 natural protection areas,
- :mod:`build_ship_raster` for building shipping traffic density,
- :mod:`build_renewable_profiles` for the hourly capacity factors and installation potentials constrained by land-use in each substation's Voronoi cell for PV, onshore and offshore wind, and
- :mod:`build_hydro_profile` for the hourly per-unit hydro power availability time series.
@ -47,14 +46,6 @@ Rule ``prepare_links_p_nom``
.. automodule:: prepare_links_p_nom
.. _natura:
Rule ``build_natura_raster``
===============================
.. automodule:: build_natura_raster
.. _base:
Rule ``base_network``

View File

@ -13,6 +13,28 @@ Upcoming Release
* Group existing capacities to the earlier grouping_year for consistency with optimized capacities.
* Update data bundle:
- Merge electricity-only and sector-coupled data bundles into `one bundle
<https://zenodo.org/records/10973944>`_. This means that the rule
``retrieve_sector_databundle`` was removed.
- Include rasterised ``natura.tiff`` in data bundle and remove rule
``retrieve_natura_raster``.
- Remove rule ``build_natura_raster`` as this rule is rarely run and increases
the data bundle size considerably.
- Remove outdated files from data bundle (e.g., Eurostat energy balances)
- Reduce spatial scope of GEBCO bathymetry data to Europe to save space.
- Remove the use of a separate data bundle for tutorials.
- Directly download `Hotmaps Industrial Database
<https://gitlab.com/hotmaps/industrial_sites/industrial_sites_Industrial_Database/-/blob/master/data/Industrial_Database.csv>`__
from source and remove ``Industrial_Database.csv`` from data bundle.
* bugfix: installed heating capacities were 5% lower than existing heating capacities
* Include gas and oil fields and saline aquifers in estimation of CO2 sequestration potential.
@ -1520,7 +1542,7 @@ This release is known to work with `PyPSA-Eur
**Gas Transmission Network**
* New rule ``retrieve_gas_infrastructure_data`` that downloads and extracts the
SciGRID_gas `IGGIELGN <https://zenodo.org/record/4767098>`__ dataset from
SciGRID_gas `IGGIELGN <https://zenodo.org/records/4767098>`__ dataset from
zenodo. It includes data on the transmission routes, pipe diameters,
capacities, pressure, and whether the pipeline is bidirectional and carries
H-Gas or L-Gas.
@ -1680,7 +1702,7 @@ This release is known to work with `PyPSA-Eur
PyPSA network.
* Updated `data bundle
<https://zenodo.org/record/5824485/files/pypsa-eur-sec-data-bundle.tar.gz>`__
<https://zenodo.org/records/5824485/files/pypsa-eur-sec-data-bundle.tar.gz>`__
that includes the hydrogan salt cavern storage potentials.
* Updated and extended documentation in
@ -2040,7 +2062,7 @@ PyPSA-Eur-Sec codebase in Version 0.2.0 above.
This model has `its own github repository
<https://github.com/martavp/pypsa-eur-sec-30-path>`__ and is `archived
on Zenodo <https://zenodo.org/record/4014807>`__.
on Zenodo <https://zenodo.org/records/4014807>`__.
@ -2056,7 +2078,7 @@ European countries with one node per country. It includes demand and
supply for electricity, space and water heating in buildings, and land
transport.
It is `archived on Zenodo <https://zenodo.org/record/1146666>`__.
It is `archived on Zenodo <https://zenodo.org/records/1146666>`__.
Release Process

View File

@ -53,32 +53,6 @@ The :ref:`tutorial` uses a smaller cutout than required for the full model (30 M
For details see :mod:`build_cutout` and read the `atlite documentation <https://atlite.readthedocs.io>`__.
Rule ``retrieve_natura_raster``
================================
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.4706686.svg
:target: https://doi.org/10.5281/zenodo.4706686
This rule, as a substitute for :mod:`build_natura_raster`, downloads an already rasterized version (`natura.tiff <https://zenodo.org/record/4706686/files/natura.tiff>`__) of `Natura 2000 <https://en.wikipedia.org/wiki/Natura_2000>`__ natural protection areas to reduce computation times. The file is placed into the ``resources`` sub-directory.
**Relevant Settings**
.. code:: yaml
enable:
build_natura_raster:
.. seealso::
Documentation of the configuration file ``config/config.yaml`` at
:ref:`toplevel_cf`
**Outputs**
- ``resources/natura.tiff``: Rasterized version of `Natura 2000 <https://en.wikipedia.org/wiki/Natura_2000>`__ natural protection areas to reduce computation times.
.. seealso::
For details see :mod:`build_natura_raster`.
Rule ``retrieve_electricity_demand``
====================================
@ -130,14 +104,3 @@ None.
**Outputs**
- ``data/shipdensity_global.zip``
Rule ``retrieve_sector_databundle``
====================================
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.5546516.svg
:target: https://doi.org/10.5281/zenodo.5546516
In addition to the databundle required for electricity-only studies,
another databundle is required for modelling sector-coupled systems.
The size of this data bundle is around 640 MB.

View File

@ -15,11 +15,11 @@ The total number of nodes for Europe is set in the ``config/config.yaml`` file u
Exemplary unsolved network clustered to 512 nodes:
.. image:: ../graphics/elec_s_512.png
.. image:: img/elec_s_512.png
Exemplary unsolved network clustered to 37 nodes:
.. image:: ../graphics/elec_s_37.png
.. image:: img/elec_s_37.png
The total number of nodes for Europe is set in the ``config/config.yaml`` file under `clusters <https://github.com/PyPSA/pypsa-eur-sec/blob/3daff49c9999ba7ca7534df4e587e1d516044fc3/config.default.yaml#L20>`__. The number of nodes can vary between 37, the number of independent countries/synchronous areas, and several hundred. With 200-300 nodes, the model needs 100-150 GB RAM to solve with a commercial solver like Gurobi.
Not all of the sectors are at the full nodal resolution, and some demand for some sectors is distributed to nodes using heuristics that need to be corrected. Some networks are copper-plated to reduce computational times.

View File

@ -18,7 +18,7 @@ management, carbon capture and usage/sequestration, and gas networks.
The basic supply (left column) and demand (right column) options in the model are described in this figure:
.. image:: ../graphics/multisector_figure.png
.. image:: img/multisector_figure.png
.. _Electricity supply and demand:
@ -72,11 +72,11 @@ For every country, heat demand is split between low and high population density
Cooling is electrified and is included in the electricity demand. Cooling demand is assumed to remain at current levels. An example of regional distribution of the total heat demand for network 181 regions is depicted below.
.. image:: ../graphics/demand-map-heat.png
.. image:: img/demand-map-heat.png
As below figure shows, the current total heat demand in Europe is similar to the total electricity demand but features much more pronounced seasonal variations. The current total building heating demand in Europe adds up to 3084 TWh/a of which 78% occurs in urban areas.
.. image:: ../graphics/Heat_and_el_demand_timeseries.png
.. image:: img/Heat_and_el_demand_timeseries.png
In practice, in PyPSA-Eur-Sec, there are heat demand buses to which the corresponding heat demands are added.
@ -269,7 +269,7 @@ The existing European gas transmission network is represented based on the SciGR
The following figure shows the unclustered European gas transmission network based on the SciGRID Gas IGGIELGN dataset. Pipelines are color-coded by estimated capacities. Markers indicate entry-points, sites of fossil resource extraction, and LNG terminals.
.. image:: ../graphics/gas_pipeline_figure.png
.. image:: img/gas_pipeline_figure.png
.. _Biomass supply:
@ -374,7 +374,7 @@ Where process heat is required, our approach depends on the necessary temperatur
The following figure shows the final consumption of energy and non-energy feedstocks in industry today in comparison to the scenario in 2050 assumed in `Neumann et al <https://arxiv.org/abs/2207.05816>`__.
.. image:: ../graphics/fec_industry_today_tomorrow.png
.. image:: img/fec_industry_today_tomorrow.png
The following figure shows the process emissions in industry today (top bar) and in 2050 without
@ -383,12 +383,12 @@ carbon capture (bottom bar) assumed in `Neumann et al <https://arxiv.org/abs/220
.. image:: ../graphics/process-emissions.png
.. image:: img/process-emissions.png
Inside each country the industrial demand is then distributed using the `Hotmaps Industrial Database <https://zenodo.org/record/4687147#.YvOaxhxBy5c>`__, which is illustrated in the figure below. This open database includes georeferenced industrial sites of energy-intensive industry sectors in EU28, including cement, basic chemicals, glass, iron and steel, non-ferrous metals, non-metallic minerals, paper, and refineries subsectors. The use of this spatial dataset enables the calculation of regional and process-specific energy demands. This approach assumes that there will be no significant migration of energy-intensive industries.
Inside each country the industrial demand is then distributed using the `Hotmaps Industrial Database <https://zenodo.org/records/4687147#.YvOaxhxBy5c>`__, which is illustrated in the figure below. This open database includes georeferenced industrial sites of energy-intensive industry sectors in EU28, including cement, basic chemicals, glass, iron and steel, non-ferrous metals, non-metallic minerals, paper, and refineries subsectors. The use of this spatial dataset enables the calculation of regional and process-specific energy demands. This approach assumes that there will be no significant migration of energy-intensive industries.
.. image:: ../graphics/hotmaps.png
.. image:: img/hotmaps.png
.. _Iron and Steel:

View File

@ -34,8 +34,7 @@ configuration, execute
snakemake -call results/test-elec/networks/elec_s_6_ec_lcopt_Co2L-24H.nc --configfile config/test/config.electricity.yaml
This configuration is set to download a reduced data set via the rules :mod:`retrieve_databundle`,
:mod:`retrieve_natura_raster`, :mod:`retrieve_cutout`.
This configuration is set to download a reduced cutout via the rule :mod:`retrieve_cutout`.
For more information on the data dependencies of PyPSA-Eur, continue reading :ref:`data`.
How to configure runs?
@ -133,82 +132,75 @@ This triggers a workflow of multiple preceding jobs that depend on each rule's i
graph[bgcolor=white, margin=0];
node[shape=box, style=rounded, fontname=sans, fontsize=10, penwidth=2];
edge[penwidth=2, color=grey];
0[label = "solve_network", color = "0.24 0.6 0.85", style="rounded"];
1[label = "prepare_network\nll: vopt\nopts: Co2L-3H", color = "0.10 0.6 0.85", style="rounded"];
2[label = "add_extra_components", color = "0.33 0.6 0.85", style="rounded"];
3[label = "cluster_network\nclusters: 128", color = "0.59 0.6 0.85", style="rounded"];
4[label = "simplify_network\nsimpl: ", color = "0.18 0.6 0.85", style="rounded"];
5[label = "add_electricity", color = "0.48 0.6 0.85", style="rounded"];
6[label = "build_renewable_profiles\ntechnology: solar", color = "0.29 0.6 0.85", style="rounded"];
7[label = "base_network", color = "0.30 0.6 0.85", style="rounded"];
8[label = "build_shapes", color = "0.61 0.6 0.85", style="rounded"];
9[label = "retrieve_databundle", color = "0.06 0.6 0.85", style="rounded"];
10[label = "retrieve_natura_raster", color = "0.03 0.6 0.85", style="rounded"];
11[label = "retrieve_cutout\ncutout: europe-2013-sarah", color = "0.50 0.6 0.85", style="rounded"];
12[label = "build_renewable_profiles\ntechnology: onwind", color = "0.29 0.6 0.85", style="rounded"];
13[label = "retrieve_cutout\ncutout: europe-2013-era5", color = "0.50 0.6 0.85", style="rounded"];
14[label = "build_renewable_profiles\ntechnology: offwind-ac", color = "0.29 0.6 0.85", style="rounded"];
15[label = "build_ship_raster", color = "0.16 0.6 0.85", style="rounded"];
16[label = "retrieve_ship_raster", color = "0.53 0.6 0.85", style="rounded"];
17[label = "build_renewable_profiles\ntechnology: offwind-dc", color = "0.29 0.6 0.85", style="rounded"];
18[label = "build_hydro_profile", color = "0.47 0.6 0.85", style="rounded"];
19[label = "retrieve_cost_data\nyear: 2030", color = "0.21 0.6 0.85", style="rounded"];
20[label = "build_powerplants", color = "0.56 0.6 0.85", style="rounded"];
21[label = "build_electricity_demand", color = "0.54 0.6 0.85", style="rounded"];
22[label = "retrieve_electricity_demand", color = "0.34 0.6 0.85", style="rounded"];
23[label = "retrieve_synthetic_electricity_demand", color = "0.65 0.6 0.85", style="rounded"];
0[label = "solve_network", color = "0.38 0.6 0.85", style="rounded"];
1[label = "prepare_network\nll: copt\nopts: Co2L-24H", color = "0.53 0.6 0.85", style="rounded"];
2[label = "add_extra_components", color = "0.01 0.6 0.85", style="rounded"];
3[label = "cluster_network\nclusters: 6", color = "0.03 0.6 0.85", style="rounded"];
4[label = "simplify_network\nsimpl: ", color = "0.42 0.6 0.85", style="rounded"];
5[label = "add_electricity", color = "0.10 0.6 0.85", style="rounded"];
6[label = "build_renewable_profiles\ntechnology: solar", color = "0.50 0.6 0.85", style="rounded"];
7[label = "base_network", color = "0.22 0.6 0.85", style="rounded"];
8[label = "build_shapes", color = "0.44 0.6 0.85", style="rounded"];
9[label = "retrieve_databundle", color = "0.29 0.6 0.85", style="rounded"];
10[label = "retrieve_cutout\ncutout: be-03-2013-era5", color = "0.49 0.6 0.85", style="rounded"];
11[label = "build_renewable_profiles\ntechnology: onwind", color = "0.50 0.6 0.85", style="rounded"];
12[label = "build_renewable_profiles\ntechnology: offwind-ac", color = "0.50 0.6 0.85", style="rounded"];
13[label = "build_ship_raster", color = "0.19 0.6 0.85", style="rounded"];
14[label = "retrieve_ship_raster", color = "0.35 0.6 0.85", style="rounded"];
15[label = "build_renewable_profiles\ntechnology: offwind-dc", color = "0.50 0.6 0.85", style="rounded"];
16[label = "build_line_rating", color = "0.60 0.6 0.85", style="rounded"];
17[label = "retrieve_cost_data\nyear: 2030", color = "0.59 0.6 0.85", style="rounded"];
18[label = "build_powerplants", color = "0.06 0.6 0.85", style="rounded"];
19[label = "build_electricity_demand", color = "0.13 0.6 0.85", style="rounded"];
20[label = "retrieve_electricity_demand", color = "0.49 0.6 0.85", style="rounded"];
21[label = "retrieve_synthetic_electricity_demand", color = "0.41 0.6 0.85", style="rounded"];
1 -> 0
2 -> 1
19 -> 1
17 -> 1
3 -> 2
19 -> 2
17 -> 2
4 -> 3
19 -> 3
17 -> 3
5 -> 4
19 -> 4
17 -> 4
7 -> 4
6 -> 5
11 -> 5
12 -> 5
14 -> 5
15 -> 5
7 -> 5
16 -> 5
17 -> 5
18 -> 5
7 -> 5
19 -> 5
20 -> 5
9 -> 5
21 -> 5
8 -> 5
7 -> 6
9 -> 6
10 -> 6
8 -> 6
11 -> 6
10 -> 6
8 -> 7
9 -> 8
7 -> 11
9 -> 11
8 -> 11
10 -> 11
7 -> 12
9 -> 12
10 -> 12
8 -> 12
13 -> 12
7 -> 14
9 -> 14
10 -> 14
15 -> 14
8 -> 14
13 -> 14
16 -> 15
8 -> 12
10 -> 12
14 -> 13
10 -> 13
7 -> 15
9 -> 15
13 -> 15
7 -> 17
9 -> 17
10 -> 17
15 -> 17
8 -> 17
13 -> 17
8 -> 18
13 -> 18
7 -> 20
22 -> 21
23 -> 21
8 -> 15
10 -> 15
7 -> 16
10 -> 16
7 -> 18
20 -> 19
21 -> 19
}
|
@ -223,8 +215,12 @@ In the terminal, this will show up as a list of jobs to be run:
------------------------------------- -------
add_electricity 1
add_extra_components 1
base_network 1
build_electricity_demand 1
build_line_rating 1
build_powerplants 1
build_renewable_profiles 4
build_shapes 1
build_ship_raster 1
cluster_network 1
prepare_network 1
@ -232,12 +228,11 @@ In the terminal, this will show up as a list of jobs to be run:
retrieve_cutout 1
retrieve_databundle 1
retrieve_electricity_demand 1
retrieve_natura_raster 1
retrieve_ship_raster 1
retrieve_synthetic_electricity_demand 1
simplify_network 1
solve_network 1
total 19
total 22
``snakemake`` then runs these jobs in the correct order.

File diff suppressed because it is too large Load Diff

View File

@ -29,11 +29,11 @@ Results
By the time of writing the comparison with the historical data shows partially accurate, partially improvable results. The following figures show the comparison of the dispatch of the different carriers.
.. image:: ../graphics/validation_seasonal_operation_area_elec_s_37_ec_lv1.0_Ept.png
.. image:: img/validation_seasonal_operation_area_elec_s_37_ec_lv1.0_Ept.png
:width: 100%
:align: center
.. image:: ../graphics/validation_production_bar_elec_s_37_ec_lv1.0_Ept.png
.. image:: img/validation_production_bar_elec_s_37_ec_lv1.0_Ept.png
:width: 100%
:align: center

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 975 KiB

View File

@ -111,7 +111,7 @@ rule build_shapes:
nuts3=ancient("data/bundle/NUTS_2013_60M_SH/data/NUTS_RG_60M_2013.shp"),
nuts3pop=ancient("data/bundle/nama_10r_3popgdp.tsv.gz"),
nuts3gdp=ancient("data/bundle/nama_10r_3gdp.tsv.gz"),
ch_cantons=ancient("data/bundle/ch_cantons.csv"),
ch_cantons=ancient("data/ch_cantons.csv"),
ch_popgdp=ancient("data/bundle/je-e-21.03.02.xls"),
output:
country_shapes=resources("country_shapes.geojson"),
@ -153,27 +153,6 @@ if config["enable"].get("build_cutout", False):
"../scripts/build_cutout.py"
if config["enable"].get("build_natura_raster", False):
rule build_natura_raster:
input:
natura=ancient("data/bundle/natura/Natura2000_end2015.shp"),
cutout=lambda w: "cutouts/"
+ CDIR
+ config_provider("atlite", "default_cutout")(w)
+ ".nc",
output:
resources("natura.tiff"),
resources:
mem_mb=5000,
log:
logs("build_natura_raster.log"),
conda:
"../envs/environment.yaml"
script:
"../scripts/build_natura_raster.py"
rule build_ship_raster:
input:
ship_density="data/shipdensity_global.zip",
@ -201,7 +180,7 @@ rule determine_availability_matrix_MD_UA:
wdpa="data/WDPA.gpkg",
wdpa_marine="data/WDPA_WDOECM_marine.gpkg",
gebco=lambda w: (
"data/bundle/GEBCO_2014_2D.nc"
"data/bundle/gebco/GEBCO_2014_2D.nc"
if config_provider("renewable", w.technology)(w).get("max_depth")
else []
),
@ -257,7 +236,7 @@ rule build_renewable_profiles:
base_network=resources("networks/base.nc"),
corine=ancient("data/bundle/corine/g250_clc06_V18_5.tif"),
natura=lambda w: (
resources("natura.tiff")
"data/bundle/natura/natura.tiff"
if config_provider("renewable", w.technology, "natura")(w)
else []
),
@ -268,7 +247,7 @@ rule build_renewable_profiles:
),
gebco=ancient(
lambda w: (
"data/bundle/GEBCO_2014_2D.nc"
"data/bundle/gebco/GEBCO_2014_2D.nc"
if (
config_provider("renewable", w.technology)(w).get("max_depth")
or config_provider("renewable", w.technology)(w).get("min_depth")
@ -421,7 +400,7 @@ rule add_electricity:
),
regions=resources("regions_onshore.geojson"),
powerplants=resources("powerplants.csv"),
hydro_capacities=ancient("data/bundle/hydro_capacities.csv"),
hydro_capacities=ancient("data/hydro_capacities.csv"),
geth_hydro_capacities="data/geth2015_hydro_capacities.csv",
unit_commitment="data/unit_commitment.csv",
fuel_price=lambda w: (

View File

@ -287,10 +287,10 @@ rule build_energy_totals:
energy=config_provider("energy"),
input:
nuts3_shapes=resources("nuts3_shapes.geojson"),
co2="data/bundle-sector/eea/UNFCCC_v23.csv",
co2="data/bundle/eea/UNFCCC_v23.csv",
swiss="data/switzerland-new_format-all_years.csv",
swiss_transport="data/gr-e-11.03.02.01.01-cc.csv",
idees="data/bundle-sector/jrc-idees-2015",
idees="data/bundle/jrc-idees-2015",
district_heat_share="data/district_heat_share.csv",
eurostat="data/eurostat/eurostat-energy_balances-april_2023_edition",
output:
@ -338,10 +338,10 @@ rule build_biomass_potentials:
"https://zenodo.org/records/10356004/files/ENSPRESO_BIOMASS.xlsx",
keep_local=True,
),
nuts2="data/bundle-sector/nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson", # https://gisco-services.ec.europa.eu/distribution/v2/nuts/download/#nuts21
nuts2="data/bundle/nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson", # https://gisco-services.ec.europa.eu/distribution/v2/nuts/download/#nuts21
regions_onshore=resources("regions_onshore_elec_s{simpl}_{clusters}.geojson"),
nuts3_population=ancient("data/bundle/nama_10r_3popgdp.tsv.gz"),
swiss_cantons=ancient("data/bundle/ch_cantons.csv"),
swiss_cantons=ancient("data/ch_cantons.csv"),
swiss_population=ancient("data/bundle/je-e-21.03.02.xls"),
country_shapes=resources("country_shapes.geojson"),
output:
@ -416,7 +416,7 @@ rule build_sequestration_potentials:
rule build_salt_cavern_potentials:
input:
salt_caverns="data/bundle-sector/h2_salt_caverns_GWh_per_sqkm.geojson",
salt_caverns="data/bundle/h2_salt_caverns_GWh_per_sqkm.geojson",
regions_onshore=resources("regions_onshore_elec_s{simpl}_{clusters}.geojson"),
regions_offshore=resources("regions_offshore_elec_s{simpl}_{clusters}.geojson"),
output:
@ -436,7 +436,7 @@ rule build_salt_cavern_potentials:
rule build_ammonia_production:
input:
usgs="data/bundle-sector/myb1-2017-nitro.xls",
usgs="data/bundle/myb1-2017-nitro.xls",
output:
ammonia_production=resources("ammonia_production.csv"),
threads: 1
@ -458,7 +458,7 @@ rule build_industry_sector_ratios:
ammonia=config_provider("sector", "ammonia", default=False),
input:
ammonia_production=resources("ammonia_production.csv"),
idees="data/bundle-sector/jrc-idees-2015",
idees="data/bundle/jrc-idees-2015",
output:
industry_sector_ratios=resources("industry_sector_ratios.csv"),
threads: 1
@ -508,7 +508,7 @@ rule build_industrial_production_per_country:
countries=config_provider("countries"),
input:
ammonia_production=resources("ammonia_production.csv"),
jrc="data/bundle-sector/jrc-idees-2015",
jrc="data/bundle/jrc-idees-2015",
eurostat="data/eurostat/eurostat-energy_balances-april_2023_edition",
output:
industrial_production_per_country=resources(
@ -564,7 +564,10 @@ rule build_industrial_distribution_key:
input:
regions_onshore=resources("regions_onshore_elec_s{simpl}_{clusters}.geojson"),
clustered_pop_layout=resources("pop_layout_elec_s{simpl}_{clusters}.csv"),
hotmaps_industrial_database="data/bundle-sector/Industrial_Database.csv",
hotmaps_industrial_database=storage(
"https://gitlab.com/hotmaps/industrial_sites/industrial_sites_Industrial_Database/-/raw/master/data/Industrial_Database.csv",
keep_local=True,
),
output:
industrial_distribution_key=resources(
"industrial_distribution_key_elec_s{simpl}_{clusters}.csv"
@ -652,7 +655,7 @@ rule build_industrial_energy_demand_per_country_today:
countries=config_provider("countries"),
industry=config_provider("industry"),
input:
jrc="data/bundle-sector/jrc-idees-2015",
jrc="data/bundle/jrc-idees-2015",
industrial_production_per_country=resources(
"industrial_production_per_country.csv"
),
@ -704,7 +707,7 @@ rule build_retro_cost:
countries=config_provider("countries"),
input:
building_stock="data/retro/data_building_stock.csv",
data_tabula="data/bundle-sector/retro/tabula-calculator-calcsetbuilding.csv",
data_tabula="data/bundle/retro/tabula-calculator-calcsetbuilding.csv",
air_temperature=resources("temp_air_total_elec_s{simpl}_{clusters}.nc"),
u_values_PL="data/retro/u_values_poland.csv",
tax_w="data/retro/electricity_taxes_eu.csv",
@ -780,8 +783,8 @@ rule build_transport_demand:
"pop_weighted_energy_totals_s{simpl}_{clusters}.csv"
),
transport_data=resources("transport_data.csv"),
traffic_data_KFZ="data/bundle-sector/emobility/KFZ__count",
traffic_data_Pkw="data/bundle-sector/emobility/Pkw__count",
traffic_data_KFZ="data/bundle/emobility/KFZ__count",
traffic_data_Pkw="data/bundle/emobility/Pkw__count",
temp_air_total=resources("temp_air_total_elec_s{simpl}_{clusters}.nc"),
output:
transport_demand=resources("transport_demand_s{simpl}_{clusters}.csv"),
@ -925,7 +928,7 @@ rule prepare_sector_network:
avail_profile=resources("avail_profile_s{simpl}_{clusters}.csv"),
dsm_profile=resources("dsm_profile_s{simpl}_{clusters}.csv"),
co2_totals_name=resources("co2_totals.csv"),
co2="data/bundle-sector/eea/UNFCCC_v23.csv",
co2="data/bundle/eea/UNFCCC_v23.csv",
biomass_potentials=lambda w: (
resources(
"biomass_potentials_s{simpl}_{clusters}_"

View File

@ -230,7 +230,7 @@ rule plot_summary:
energy=RESULTS + "csvs/energy.csv",
balances=RESULTS + "csvs/supply_energy.csv",
eurostat="data/eurostat/eurostat-energy_balances-april_2023_edition",
co2="data/bundle-sector/eea/UNFCCC_v23.csv",
co2="data/bundle/eea/UNFCCC_v23.csv",
output:
costs=RESULTS + "graphs/costs.pdf",
energy=RESULTS + "graphs/energy.pdf",

View File

@ -14,23 +14,27 @@ if config["enable"]["retrieve"] is False:
if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle", True):
datafiles = [
"ch_cantons.csv",
"je-e-21.03.02.xls",
"eez/World_EEZ_v8_2014.shp",
"hydro_capacities.csv",
"naturalearth/ne_10m_admin_0_countries.shp",
"NUTS_2013_60M_SH/data/NUTS_RG_60M_2013.shp",
"nama_10r_3popgdp.tsv.gz",
"nama_10r_3gdp.tsv.gz",
"corine/g250_clc06_V18_5.tif",
"eea/UNFCCC_v23.csv",
"nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson",
"myb1-2017-nitro.xls",
"emobility/KFZ__count",
"emobility/Pkw__count",
"h2_salt_caverns_GWh_per_sqkm.geojson",
"natura/natura.tiff",
"gebco/GEBCO_2014_2D.nc",
]
if not config.get("tutorial", False):
datafiles.extend(["natura/Natura2000_end2015.shp", "GEBCO_2014_2D.nc"])
rule retrieve_databundle:
output:
protected(expand("data/bundle/{file}", file=datafiles)),
protected(directory("data/bundle/jrc-idees-2015")),
log:
"logs/retrieve_databundle.log",
resources:
@ -41,13 +45,22 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle",
script:
"../scripts/retrieve_databundle.py"
rule retrieve_eurostat_data:
output:
directory("data/eurostat/eurostat-energy_balances-april_2023_edition"),
log:
"logs/retrieve_eurostat_data.log",
retries: 2
script:
"../scripts/retrieve_eurostat_data.py"
if config["enable"]["retrieve"] and config["enable"].get("retrieve_cutout", True):
rule retrieve_cutout:
input:
storage(
"https://zenodo.org/record/6382570/files/{cutout}.nc",
"https://zenodo.org/records/6382570/files/{cutout}.nc",
),
output:
protected("cutouts/" + CDIR + "{cutout}.nc"),
@ -79,64 +92,6 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_cost_data", T
"../scripts/retrieve_cost_data.py"
if config["enable"]["retrieve"] and config["enable"].get(
"retrieve_natura_raster", True
):
rule retrieve_natura_raster:
input:
storage(
"https://zenodo.org/record/4706686/files/natura.tiff",
keep_local=True,
),
output:
resources("natura.tiff"),
log:
logs("retrieve_natura_raster.log"),
resources:
mem_mb=5000,
retries: 2
run:
copyfile(input[0], output[0])
validate_checksum(output[0], input[0])
if config["enable"]["retrieve"] and config["enable"].get(
"retrieve_sector_databundle", True
):
datafiles = [
"eea/UNFCCC_v23.csv",
"switzerland-sfoe/switzerland-new_format.csv",
"nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson",
"myb1-2017-nitro.xls",
"Industrial_Database.csv",
"emobility/KFZ__count",
"emobility/Pkw__count",
"h2_salt_caverns_GWh_per_sqkm.geojson",
]
rule retrieve_sector_databundle:
output:
protected(expand("data/bundle-sector/{files}", files=datafiles)),
protected(directory("data/bundle-sector/jrc-idees-2015")),
log:
"logs/retrieve_sector_databundle.log",
retries: 2
conda:
"../envs/retrieve.yaml"
script:
"../scripts/retrieve_sector_databundle.py"
rule retrieve_eurostat_data:
output:
directory("data/eurostat/eurostat-energy_balances-april_2023_edition"),
log:
"logs/retrieve_eurostat_data.log",
retries: 2
script:
"../scripts/retrieve_eurostat_data.py"
if config["enable"]["retrieve"]:
datafiles = [
"IGGIELGN_LNGs.geojson",
@ -199,7 +154,7 @@ if config["enable"]["retrieve"]:
rule retrieve_ship_raster:
input:
storage(
"https://zenodo.org/record/6953563/files/shipdensity_global.zip",
"https://zenodo.org/records/10973944/files/shipdensity_global.zip",
keep_local=True,
),
output:
@ -221,7 +176,7 @@ if config["enable"]["retrieve"]:
rule download_copernicus_land_cover:
input:
storage(
"https://zenodo.org/record/3939050/files/PROBAV_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif",
"https://zenodo.org/records/3939050/files/PROBAV_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif",
),
output:
"data/Copernicus_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif",

View File

@ -707,7 +707,7 @@ def update_config_from_wildcards(config, w, inplace=True):
def get_checksum_from_zenodo(file_url):
parts = file_url.split("/")
record_id = parts[parts.index("record") + 1]
record_id = parts[parts.index("records") + 1]
filename = parts[-1]
response = requests.get(f"https://zenodo.org/api/records/{record_id}", timeout=30)
@ -746,7 +746,7 @@ def validate_checksum(file_path, zenodo_url=None, checksum=None):
>>> validate_checksum("/path/to/file", checksum="md5:abc123...")
>>> validate_checksum(
... "/path/to/file",
... zenodo_url="https://zenodo.org/record/12345/files/example.txt",
... zenodo_url="https://zenodo.org/records/12345/files/example.txt",
... )
If the checksum is invalid, an AssertionError will be raised.

View File

@ -46,7 +46,7 @@ Inputs
------
- ``resources/costs.csv``: The database of cost assumptions for all included technologies for specific years from various sources; e.g. discount rate, lifetime, investment (CAPEX), fixed operation and maintenance (FOM), variable operation and maintenance (VOM), fuel costs, efficiency, carbon-dioxide intensity.
- ``data/bundle/hydro_capacities.csv``: Hydropower plant store/discharge power capacities, energy storage capacity, and average hourly inflow by country.
- ``data/hydro_capacities.csv``: Hydropower plant store/discharge power capacities, energy storage capacity, and average hourly inflow by country.
.. image:: img/hydrocapacities.png
:scale: 34 %

View File

@ -1,118 +0,0 @@
# -*- coding: utf-8 -*-
# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
#
# SPDX-License-Identifier: MIT
"""
Rasters the vector data of the `Natura 2000.
<https://en.wikipedia.org/wiki/Natura_2000>`_ natural protection areas onto all
cutout regions.
Relevant Settings
-----------------
.. code:: yaml
renewable:
{technology}:
cutout:
.. seealso::
Documentation of the configuration file ``config/config.yaml`` at
:ref:`renewable_cf`
Inputs
------
- ``data/bundle/natura/Natura2000_end2015.shp``: `Natura 2000 <https://en.wikipedia.org/wiki/Natura_2000>`_ natural protection areas.
.. image:: img/natura.png
:scale: 33 %
Outputs
-------
- ``resources/natura.tiff``: Rasterized version of `Natura 2000 <https://en.wikipedia.org/wiki/Natura_2000>`_ natural protection areas to reduce computation times.
.. image:: img/natura.png
:scale: 33 %
Description
-----------
"""
import logging
import atlite
import geopandas as gpd
import rasterio as rio
from _helpers import configure_logging, set_scenario_config
from rasterio.features import geometry_mask
from rasterio.warp import transform_bounds
logger = logging.getLogger(__name__)
def determine_cutout_xXyY(cutout_name):
"""
Determine the full extent of a cutout.
Since the coordinates of the cutout data are given as the
center of the grid cells, the extent of the cutout is
calculated by adding/subtracting half of the grid cell size.
Parameters
----------
cutout_name : str
Path to the cutout.
Returns
-------
A list of extent coordinates in the order [x, X, y, Y].
"""
cutout = atlite.Cutout(cutout_name)
assert cutout.crs.to_epsg() == 4326
x, X, y, Y = cutout.extent
dx, dy = cutout.dx, cutout.dy
return [x - dx / 2.0, X + dx / 2.0, y - dy / 2.0, Y + dy / 2.0]
def get_transform_and_shape(bounds, res):
left, bottom = [(b // res) * res for b in bounds[:2]]
right, top = [(b // res + 1) * res for b in bounds[2:]]
shape = int((top - bottom) // res), int((right - left) / res)
transform = rio.Affine(res, 0, left, 0, -res, top)
return transform, shape
if __name__ == "__main__":
if "snakemake" not in globals():
from _helpers import mock_snakemake
snakemake = mock_snakemake("build_natura_raster")
configure_logging(snakemake)
set_scenario_config(snakemake)
x, X, y, Y = determine_cutout_xXyY(snakemake.input.cutout)
bounds = transform_bounds(4326, 3035, x, y, X, Y)
transform, out_shape = get_transform_and_shape(bounds, res=100)
# adjusted boundaries
shapes = gpd.read_file(snakemake.input.natura).to_crs(3035)
raster = ~geometry_mask(shapes.geometry, out_shape, transform)
raster = raster.astype(rio.uint8)
with rio.open(
snakemake.output[0],
"w",
driver="GTiff",
dtype=rio.uint8,
count=1,
transform=transform,
crs=3035,
compress="lzw",
width=raster.shape[1],
height=raster.shape[0],
) as dst:
dst.write(raster, indexes=1)

View File

@ -52,7 +52,7 @@ Inputs
CORINE land cover, see `Annex 1 of the technical documentation
<https://publications.jrc.ec.europa.eu/repository/bitstream/JRC124621/technical_report_luisa_basemap_2018_v7_final.pdf>`_.
- ``data/bundle/GEBCO_2014_2D.nc``: A `bathymetric
- ``data/bundle/gebco/GEBCO_2014_2D.nc``: A `bathymetric
<https://en.wikipedia.org/wiki/Bathymetry>`_ data set with a global terrain
model for ocean and land at 15 arc-second intervals by the `General
Bathymetric Chart of the Oceans (GEBCO)

View File

@ -38,7 +38,7 @@ Inputs
- ``data/bundle/nama_10r_3popgdp.tsv.gz``: Average annual population by NUTS3 region (`eurostat <http://appsso.eurostat.ec.europa.eu/nui/show.do?dataset=nama_10r_3popgdp&lang=en>`__)
- ``data/bundle/nama_10r_3gdp.tsv.gz``: Gross domestic product (GDP) by NUTS 3 regions (`eurostat <http://appsso.eurostat.ec.europa.eu/nui/show.do?dataset=nama_10r_3gdp&lang=en>`__)
- ``data/bundle/ch_cantons.csv``: Mapping between Swiss Cantons and NUTS3 regions
- ``data/ch_cantons.csv``: Mapping between Swiss Cantons and NUTS3 regions
- ``data/bundle/je-e-21.03.02.xls``: Population and GDP data per Canton (`BFS - Swiss Federal Statistical Office <https://www.bfs.admin.ch/bfs/en/home/news/whats-new.assetdetail.7786557.html>`_ )
Outputs

View File

@ -45,12 +45,38 @@ import logging
import zipfile
from pathlib import Path
import atlite
import rioxarray
from _helpers import configure_logging, set_scenario_config
from build_natura_raster import determine_cutout_xXyY
logger = logging.getLogger(__name__)
def determine_cutout_xXyY(cutout_name):
"""
Determine the full extent of a cutout.
Since the coordinates of the cutout data are given as the
center of the grid cells, the extent of the cutout is
calculated by adding/subtracting half of the grid cell size.
Parameters
----------
cutout_name : str
Path to the cutout.
Returns
-------
A list of extent coordinates in the order [x, X, y, Y].
"""
cutout = atlite.Cutout(cutout_name)
assert cutout.crs.to_epsg() == 4326
x, X, y, Y = cutout.extent
dx, dy = cutout.dx, cutout.dy
return [x - dx / 2.0, X + dx / 2.0, y - dy / 2.0, Y + dy / 2.0]
if __name__ == "__main__":
if "snakemake" not in globals():
from _helpers import mock_snakemake

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2019-2022 Fabian Hofmann (TUB, FIAS)
# Copyright 2019-2024 Fabian Hofmann (TUB, FIAS), Fabian Neumann (TUB)
# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
#
# SPDX-License-Identifier: MIT
@ -7,24 +7,15 @@
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3517935.svg
:target: https://doi.org/10.5281/zenodo.3517935
The data bundle (1.4 GB) contains common GIS datasets like NUTS3 shapes, EEZ shapes, CORINE Landcover, Natura 2000 and also electricity specific summary statistics like historic per country yearly totals of hydro generation, GDP and POP on NUTS3 levels and per-country load time-series.
The data bundle contains common GIS datasets like NUTS3 shapes, EEZ shapes,
CORINE Landcover, Natura 2000 and also electricity specific summary statistics
like historic per country yearly totals of hydro generation, GDP and population
data on NUTS3 levels and energy balances.
This rule downloads the data bundle from `zenodo <https://doi.org/10.5281/zenodo.3517935>`_ and extracts it in the ``data`` sub-directory, such that all files of the bundle are stored in the ``data/bundle`` subdirectory.
The :ref:`tutorial` uses a smaller `data bundle <https://zenodo.org/record/3517921/files/pypsa-eur-tutorial-data-bundle.tar.xz>`_ than required for the full model (188 MB)
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3517921.svg
:target: https://doi.org/10.5281/zenodo.3517921
**Relevant Settings**
.. code:: yaml
tutorial:
.. seealso::
Documentation of the configuration file ``config/config.yaml`` at
:ref:`toplevel_cf`
This rule downloads the data bundle from `zenodo
<https://doi.org/10.5281/zenodo.3517935>`_ and extracts it in the ``data``
sub-directory, such that all files of the bundle are stored in the
``data/bundle`` subdirectory.
**Outputs**
@ -57,10 +48,7 @@ if __name__ == "__main__":
configure_logging(snakemake)
set_scenario_config(snakemake)
if snakemake.config["tutorial"]:
url = "https://zenodo.org/record/3517921/files/pypsa-eur-tutorial-data-bundle.tar.xz"
else:
url = "https://zenodo.org/record/3517935/files/pypsa-eur-data-bundle.tar.xz"
url = "https://zenodo.org/records/10973944/files/bundle.tar.xz"
tarball_fn = Path(f"{rootpath}/bundle.tar.xz")
to_fn = Path(rootpath) / Path(snakemake.output[0]).parent.parent
@ -74,6 +62,7 @@ if __name__ == "__main__":
logger.info("Extracting databundle.")
tarfile.open(tarball_fn).extractall(to_fn)
logger.info("Unlinking tarball.")
tarball_fn.unlink()
logger.info(f"Databundle available in '{to_fn}'.")

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: MIT
"""
Retrieve gas infrastructure data from
https://zenodo.org/record/4767098/files/IGGIELGN.zip.
https://zenodo.org/records/4767098/files/IGGIELGN.zip.
"""
import logging
@ -32,7 +32,7 @@ if __name__ == "__main__":
configure_logging(snakemake)
set_scenario_config(snakemake)
url = "https://zenodo.org/record/4767098/files/IGGIELGN.zip"
url = "https://zenodo.org/records/4767098/files/IGGIELGN.zip"
# Save locations
zip_fn = Path(f"{rootpath}/IGGIELGN.zip")

View File

@ -1,49 +0,0 @@
# -*- coding: utf-8 -*-
# SPDX-FileCopyrightText: : 2021-2024 The PyPSA-Eur Authors
#
# SPDX-License-Identifier: MIT
"""
Retrieve and extract data bundle for sector-coupled studies.
"""
import logging
import tarfile
from pathlib import Path
from _helpers import (
configure_logging,
progress_retrieve,
set_scenario_config,
validate_checksum,
)
logger = logging.getLogger(__name__)
if __name__ == "__main__":
if "snakemake" not in globals():
from _helpers import mock_snakemake
snakemake = mock_snakemake("retrieve_databundle")
rootpath = ".."
else:
rootpath = "."
configure_logging(snakemake)
set_scenario_config(snakemake)
url = "https://zenodo.org/record/5824485/files/pypsa-eur-sec-data-bundle.tar.gz"
tarball_fn = Path(f"{rootpath}/sector-bundle.tar.gz")
to_fn = Path(rootpath) / Path(snakemake.output[0]).parent.parent
logger.info(f"Downloading databundle from '{url}'.")
disable_progress = snakemake.config["run"].get("disable_progressbar", False)
progress_retrieve(url, tarball_fn, disable=disable_progress)
validate_checksum(tarball_fn, url)
logger.info("Extracting databundle.")
tarfile.open(tarball_fn).extractall(to_fn)
tarball_fn.unlink()
logger.info(f"Databundle available in '{to_fn}'.")