Skip to content

Commit

Permalink
finalize release
Browse files Browse the repository at this point in the history
  • Loading branch information
weibezahn committed Feb 28, 2018
1 parent ac8ed78 commit a139ba2
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
10 changes: 5 additions & 5 deletions checksums.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
conventional_power_plants_DE.csv,b55f0429795aacb74339cfdef59264a91678700c0c42830571c6892e2b27db74
conventional_power_plants_DE.xlsx,219acbcea1630782777c332fc06dea18d8d0dba8cd813483b16c91b7eafba447
conventional_power_plants_EU.csv,f3df065eaea5eb35b7d1e2c5717a143634c29ff672bab3874de07cfcf5fcbd44
conventional_power_plants_EU.xlsx,48c754f77c92af9c02776ffd10c4edcbdd11df74df35ceb6d1ba5f2a8aee7fc5
conventional_power_plants.sqlite,77e89734c7f8ee78e05cc574ad6cc7254bba90d7ffa600ee243349a89b866383
conventional_power_plants_DE.csv,755ab91a138d133e1c4312a38799eda50617103a39587a39ee56d2a4c66c5749
conventional_power_plants_DE.xlsx,eae9c3675d8bb0c8ec655f705fff5465bbdd9fa5bc20a8b933fae3e450666b42
conventional_power_plants_EU.csv,aad5f15cef3acd3b3e4783aa92645e3b50ab9fc0d7f1667e24ba5b6f0f12b975
conventional_power_plants_EU.xlsx,b2403a19cbe9af953a889ce4c311d9d63b7b64db691bfddbe78a0448950256cf
conventional_power_plants.sqlite,e3c301c3d5b65f427b57e81899f0bc876a04b13647d5fec5fe7917b880275b43
18 changes: 13 additions & 5 deletions download_and_process_EU.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"metadata": {},
"source": [
"<div style=\"width:100%; background-color: #D9EDF7; border: 1px solid #CFCFCF; text-align: left; padding: 10px;\">\n",
" <b>Conventional Power Plants: Power Plants in Germany</b>\n",
" <b>Conventional Power Plants: Power Plants in Europe</b>\n",
" <ul>\n",
" <li><a href=\"main.ipynb\">Main Notebook</a></li>\n",
" <li><a href=\"download_and_process_DE.ipynb\">Processing notebook for German power plant</a></li>\n",
Expand Down Expand Up @@ -252,7 +252,9 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"conf = \"\"\"\n",
Expand Down Expand Up @@ -1729,7 +1731,9 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"data_CZ = importdata('CZ', 'CEPS')"
Expand All @@ -1752,7 +1756,9 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"# Merge columns \"Power plant\" and \"Generating unit\" to one column called \"Name\"\n",
Expand Down Expand Up @@ -3304,7 +3310,9 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"metadata": {
"collapsed": true
},
"outputs": [],
"source": [
"dataframes = [#data_BE,\n",
Expand Down
5 changes: 1 addition & 4 deletions input/metadata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
hide: yes
name: opsd-conventional-power-plants
title: Conventional power plants
description: List of conventional power plants in Germany and European countries
Expand All @@ -10,7 +9,7 @@ keywords:
- Germany
- Europe
geographical-scope: Germany, Austria, Belgium, Switzerland, Czech Republic, Denmark, Spain, Finland, France, Italy, the Netherlands, Norway, Poland, Sweden, Slovakia, Slovenia, United Kingdom
last_changes: Updated data to new powerplant list
last_changes: Updated data to new powerplant lists
sources:
- name: BNetzA Kraftwerksliste (DE)
web: http://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html
Expand Down Expand Up @@ -169,7 +168,6 @@ resources:
- name: energy_source_level_3
description: Energy source level 3 according to the documentation
type: string
opsd-contentfilter: "true"
- name: eeg
description: Status of being entitled to a renumeration
type: boolean
Expand Down Expand Up @@ -291,7 +289,6 @@ resources:
- name: energy_source_level_3
description: Energy source level 3 according to the documentation
type: string
opsd-contentfilter: "true"
- name: eeg
description: Status of being entitled to a renumeration
type: boolean
Expand Down

0 comments on commit a139ba2

Please sign in to comment.