From baa8a827f559b392b57adafbad59fe6cd2c7fb31 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 2 Aug 2024 11:42:30 +0200 Subject: [PATCH] change FRESNA references to PyPSA --- README.md | 4 ++-- doc/foresight.rst | 2 +- doc/preparation.rst | 2 +- scripts/build_powerplants.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d5a72b77..5c918c9a 100644 --- a/README.md +++ b/README.md @@ -65,10 +65,10 @@ The dataset consists of: (alternating current lines at and above 220kV voltage level and all high voltage direct current lines) and 3803 substations. - The open power plant database - [powerplantmatching](https://github.com/FRESNA/powerplantmatching). + [powerplantmatching](https://github.com/PyPSA/powerplantmatching). - Electrical demand time series from the [OPSD project](https://open-power-system-data.org/). -- Renewable time series based on ERA5 and SARAH, assembled using the [atlite tool](https://github.com/FRESNA/atlite). +- Renewable time series based on ERA5 and SARAH, assembled using the [atlite tool](https://github.com/PyPSA/atlite). - Geographical potentials for wind and solar generators based on land use (CORINE) and excluding nature reserves (Natura2000) are computed with the [atlite library](https://github.com/PyPSA/atlite). A sector-coupled extension adds demand diff --git a/doc/foresight.rst b/doc/foresight.rst index 400f67ce..43a93ead 100644 --- a/doc/foresight.rst +++ b/doc/foresight.rst @@ -242,7 +242,7 @@ Rule overview file `__ generated by pypsa-eur which, in turn, is based on the `powerplantmatching - `__ database. + `__ database. Existing wind and solar capacities are retrieved from `IRENA annual statistics `__ and distributed among the diff --git a/doc/preparation.rst b/doc/preparation.rst index 669f3392..4585f4db 100644 --- a/doc/preparation.rst +++ b/doc/preparation.rst @@ -25,7 +25,7 @@ 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 `__ allocating these to the closest substation for each powerplant, +- :mod:`build_powerplants` for today's thermal power plant capacities using `powerplantmatching `__ allocating these to the closest substation for each powerplant, - :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. diff --git a/scripts/build_powerplants.py b/scripts/build_powerplants.py index 4e2bb88f..bde2bd38 100755 --- a/scripts/build_powerplants.py +++ b/scripts/build_powerplants.py @@ -6,7 +6,7 @@ # coding: utf-8 """ Retrieves conventional powerplant capacities and locations from -`powerplantmatching `_, assigns +`powerplantmatching `_, assigns these to buses and creates a ``.csv`` file. It is possible to amend the powerplant database with custom entries provided in ``data/custom_powerplants.csv``. @@ -30,17 +30,17 @@ Inputs ------ - ``networks/base.nc``: confer :ref:`base`. -- ``data/custom_powerplants.csv``: custom powerplants in the same format as `powerplantmatching `_ provides +- ``data/custom_powerplants.csv``: custom powerplants in the same format as `powerplantmatching `_ provides Outputs ------- -- ``resource/powerplants.csv``: A list of conventional power plants (i.e. neither wind nor solar) with fields for name, fuel type, technology, country, capacity in MW, duration, commissioning year, retrofit year, latitude, longitude, and dam information as documented in the `powerplantmatching README `_; additionally it includes information on the closest substation/bus in ``networks/base.nc``. +- ``resource/powerplants.csv``: A list of conventional power plants (i.e. neither wind nor solar) with fields for name, fuel type, technology, country, capacity in MW, duration, commissioning year, retrofit year, latitude, longitude, and dam information as documented in the `powerplantmatching README `_; additionally it includes information on the closest substation/bus in ``networks/base.nc``. .. image:: img/powerplantmatching.png :scale: 30 % - **Source:** `powerplantmatching on GitHub `_ + **Source:** `powerplantmatching on GitHub `_ Description -----------