Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fix and amendment in docs #27

Merged
merged 3 commits into from
Oct 16, 2021
Merged

Add fix and amendment in docs #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e90d0d2
Update data licensing info and docs
jokochems Oct 15, 2021
386a9c5
Update changelog.rst
jokochems Oct 15, 2021
482c13f
Merge remote-tracking branch 'origin/docs' into docs
jokochems Oct 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ be aware that some data might be subject to copyright.
| ÜNB | Anlagenstammdaten | data owned by the German TSO | yes | https://www.netztransparenz.de/EEG/Anlagenstammdaten
| ÜNB | EEG-Bewegungsdaten zur Jahresabrechnung 2017 | data owned by the German TSO | yes | https://www.netztransparenz.de/EEG/Jahresabrechnungen
| IRENA | installed RES capacities | All rights reserved, data used for pre-calculations | no | https://www.irena.org/Statistics/Download-Data
| ENTSO-E | Installed Capacity per Production Type | Use pursuant to § 12a EGovG for pre-calculations | no | https://transparency.entsoe.eu/generation/r2/installedGenerationCapacityAggregation/show
| ENTSO-E | Installed Capacity per Production Type | Use pursuant to Article 5 of the Terms & Conditions of ENTSO-E; data owned by the specific TSOs | no | https://transparency.entsoe.eu/generation/r2/installedGenerationCapacityAggregation/show
| Prognos et al. | study on RES capacities for DE | All rights reserved, data used for pre calculations | yes | https://www.agora-energiewende.de/veroeffentlichungen/klimaneutrales-deutschland/
| BNetzA | RES tender results solarPV | free to use, license-free according to §5 Abs. 1 UrhG | yes | https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html
| BNetzA | RES tender results wind onshore | free to use, license-free according to §5 Abs. 1 UrhG | yes | https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Ausschreibungen/Wind_Onshore/BeendeteAusschreibungen/BeendeteAusschreibungen_node.html
Expand Down
7 changes: 4 additions & 3 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

v0.0.1 (YYYY-MM-DD)
v0.1.0 (2021-10-21)
-------------------

Initial release of ``pommesdata``
Expand All @@ -11,6 +11,7 @@ This is ``pommesdata``, **A full-featured transparent data preparation routine f
Features:

* Transparent data preparation routine in a jupyter notebook.
* Provide input data for ``pommesdispatch`` for any year between 2017 and 2030.
* Licensing information and raw data input provided.
* All data sources are publicly available free from payment and the majority
is provided under open-source licenses.
* All data sources are publicly available free from payment and the aim is
to use especially ones that are provided under open licenses.
6 changes: 3 additions & 3 deletions docs/data.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ be aware that some data might be subject to copyright.
"tmrowco", "bidding zone geometries", "MIT License", "yes", "`https://github.com/tmrowco/electricitymap-contrib/pull/1383 <https://github.com/tmrowco/electricitymap-contrib/pull/1383>`_"
"UBA", "new-built power plants", "usage of data accordant to § 12a EGovG permitted", "yes", "`https://www.umweltbundesamt.de/sites/default/files/medien/384/bilder/dateien/4_tab_genehmigte-in_genehmigung-kraftwerksprojekte_2019-04-04.pdf <https://www.umweltbundesamt.de/sites/default/files/medien/384/bilder/dateien/4_tab_genehmigte-in_genehmigung-kraftwerksprojekte_2019-04-04.pdf>`_"
"BDEW", "new-built power plants", "All rights reserved", "yes", "`https://www.bdew.de/media/documents/PI_20190401_BDEW-Kraftwerksliste.pdf <https://www.bdew.de/media/documents/PI_20190401_BDEW-Kraftwerksliste.pdf>`_"
"BNetzA", "new-built & decommissioned power plants", "Freie Nutzung", "yes", "`https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html <https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html>`_"
"Energie SaarLorLux", "new-built power plant", "n.a.", "yes", "`https://www.energie-saarlorlux.com/unternehmen/mehr-gutes-klima/unsere-co2-projekte/ <https://www.energie-saarlorlux.com/unternehmen/mehr-gutes-klima/unsere-co2-projekte/>`_"
"BNetzA", "new-built & decommissioned power plants", "free to use, license-free according to §5 Abs. 1 UrhG", "yes", "`https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html <https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html>`_"
"Energie SaarLorLux", "new-built power plant", "All rights reserved", "yes", "`https://www.energie-saarlorlux.com/unternehmen/mehr-gutes-klima/unsere-co2-projekte/ <https://www.energie-saarlorlux.com/unternehmen/mehr-gutes-klima/unsere-co2-projekte/>`_"
"ENTSOE", "new-built power plants", "CC BY 4.0", "yes", "`https://tyndp.entsoe.eu/maps-data <https://tyndp.entsoe.eu/maps-data>`_"
"BNetzA", "threshold for new-built power plants", "free to use, license-free according to §5 Abs. 1 UrhG", "yes", "`https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Energie/Unternehmen_Institutionen/Versorgungssicherheit/Berichte_Fallanalysen/BNetzA_Netzstabilitaetsanlagen13k.pdf?__blob=publicationFile&v=3 <https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Energie/Unternehmen_Institutionen/Versorgungssicherheit/Berichte_Fallanalysen/BNetzA_Netzstabilitaetsanlagen13k.pdf?__blob=publicationFile&v=3>`_"
"DIW", "efficiency estimates for power plants", "All rights reserved", "yes", "`https://www.diw.de/documents/publikationen/73/diw_01.c.440963.de/diw_datadoc_2014-072.pdf <https://www.diw.de/documents/publikationen/73/diw_01.c.440963.de/diw_datadoc_2014-072.pdf>`_"
Expand All @@ -37,7 +37,7 @@ be aware that some data might be subject to copyright.
"ÜNB", "Anlagenstammdaten", "data owned by the German TSO", "yes", "`https://www.netztransparenz.de/EEG/Anlagenstammdaten <https://www.netztransparenz.de/EEG/Anlagenstammdaten>`_"
"ÜNB", "EEG-Bewegungsdaten zur Jahresabrechnung 2017", "data owned by the German TSO", "yes", "`https://www.netztransparenz.de/EEG/Jahresabrechnungen <https://www.netztransparenz.de/EEG/Jahresabrechnungen>`_"
"IRENA", "installed RES capacities", "All rights reserved, data used for pre-calculations", "yes", "`https://www.irena.org/Statistics/Download-Data <https://www.irena.org/Statistics/Download-Data>`_"
"ENTSO-E", "Installed Capacity per Production Type", "Use pursuant to § 12a EGovG for pre-calculations", "no", "`https://transparency.entsoe.eu/generation/r2/installedGenerationCapacityAggregation/show <https://transparency.entsoe.eu/generation/r2/installedGenerationCapacityAggregation/show>`_"
"ENTSO-E", "Installed Capacity per Production Type", "Use pursuant to Article 5 of the Terms & Conditions of ENTSO-E; data owned by the specific TSOs", "no", "`https://transparency.entsoe.eu/generation/r2/installedGenerationCapacityAggregation/show <https://transparency.entsoe.eu/generation/r2/installedGenerationCapacityAggregation/show>`_"
"Prognos et al.", "study on RES capacities for DE", "All rights reserved, data used for pre calculations", "yes", "`https://www.agora-energiewende.de/veroeffentlichungen/klimaneutrales-deutschland/ <https://www.agora-energiewende.de/veroeffentlichungen/klimaneutrales-deutschland/>`_"
"BNetzA", "RES tender results solarPV", "free to use, license-free according to §5 Abs. 1 UrhG", "yes", "`https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html <https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html>`_"
"BNetzA", "RES tender results wind onshore", "free to use, license-free according to §5 Abs. 1 UrhG", "yes", "`https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Ausschreibungen/Wind_Onshore/BeendeteAusschreibungen/BeendeteAusschreibungen_node.html <https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Ausschreibungen/Wind_Onshore/BeendeteAusschreibungen/BeendeteAusschreibungen_node.html>`_"
Expand Down