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

Update JRC hydro database to latest and rerun powerplantmatching #123

Merged
merged 5 commits into from
May 12, 2024
Merged

Update JRC hydro database to latest and rerun powerplantmatching #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e567a03
Update JRC hydro database to latest
martinhjel Jun 16, 2023
9843972
Read JRC csv file instead of zip file
martinhjel Jun 16, 2023
2774915
Update powerplants.csv
martinhjel Jun 16, 2023
5fe849e
Typo
martinhjel Jun 16, 2023
7158606
Merge branch 'master' into dev
FabianHofmann Jun 29, 2023
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
1 change: 1 addition & 0 deletions doc/release-notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ History of Changes
.. ----------------
**New Features**

* Updated the JRC hydro power plant database to the latest version.
* Updates the following Global Energy Monitor data according to latest May 2023 release:
* `GSPT`, solar power plant
* `GWPT`, wind power plant
Expand Down
5 changes: 1 addition & 4 deletions powerplantmatching/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,7 @@ def JRC(raw=False, update=False, config=None):

fn = get_raw_file("JRC", update, config)

with ZipFile(fn, "r") as file:
directory = file.namelist()[0]
key = directory + "data/jrc-hydro-power-plant-database.csv"
df = pd.read_csv(file.open(key))
df = pd.read_csv(fn)

if raw:
return df
Expand Down
4 changes: 2 additions & 2 deletions powerplantmatching/package_data/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ ENTSOE-EIC:
fn: entsoe_eic_codes.csv
JRC:
reliability_score: 4
fn: jrc-hydro-power-database-10.zip
url: https://github.com/energy-modelling-toolkit/hydro-power-database/archive/refs/tags/v10.zip
fn: jrc-hydro-power-plant-database.csv
url: https://raw.githubusercontent.com/energy-modelling-toolkit/hydro-power-database/master/data/jrc-hydro-power-plant-database.csv
fneum marked this conversation as resolved.
Show resolved Hide resolved
GEO:
net_capacity: false
reliability_score: 3
Expand Down
Loading