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

Fixes/#159 mastr on zenodo #171

Merged
merged 4 commits into from
Jan 22, 2024
Merged

Fixes/#159 mastr on zenodo #171

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1f28b2
Update zenodo URLs of MaStR data
nesnoj Jan 11, 2024
8f68720
Bump mastr dataset version to 0.0.2
nesnoj Jan 11, 2024
6385ca3
Update changelog
nesnoj Jan 11, 2024
1b90894
Merge branch 'dev' into fixes/#159-mastr-on-zenodo
nesnoj Jan 22, 2024
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 CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,7 @@ Bug Fixes
`#1098 <https://github.com/openego/eGon-data/issues/1098>`_
* Fix conversion factor for CH4 loads abroad in eGon2035
`#1104 <https://github.com/openego/eGon-data/issues/1104>`_
* Fix URLs of MaStR datasets

.. _PR #692: https://github.com/openego/eGon-data/pull/692
.. _#343: https://github.com/openego/eGon-data/issues/343
Expand Down
4 changes: 2 additions & 2 deletions src/egon/data/datasets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ mastr:
- "gsgk"
- "storage"
file_basename: "bnetza_mastr"
deposit_id: 808086
deposit_id: 10480930

mastr_new:
technologies:
Expand All @@ -306,7 +306,7 @@ mastr_new:
- "combustion"
- "nuclear"
file_basename: "bnetza_mastr"
deposit_id: 1132987
deposit_id: 10480958
egon2021_date_max: "2021-12-31 23:59:00"
status2019_date_max: "2019-12-31 23:59:00"

Expand Down
10 changes: 5 additions & 5 deletions src/egon/data/datasets/mastr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
Download Marktstammdatenregister (MaStR) datasets unit registry.
It incorporates two different datasets:

Dump 2021-05-03
* Source: https://sandbox.zenodo.org/record/808086
Dump 2021-04-30
* Source: https://zenodo.org/records/10480930
* Used technologies: PV plants, wind turbines, biomass, hydro plants,
combustion, nuclear, gsgk, storage
* Data is further processed in dataset
:py:class:`egon.data.datasets.power_plants.PowerPlants`

Dump 2022-11-17
* Source: https://sandbox.zenodo.org/record/1132839
* Source: https://zenodo.org/records/10480958
* Used technologies: PV plants, wind turbines, biomass, hydro plants
* Data is further processed in module
:py:mod:`egon.data.datasets.power_plants.mastr` `PowerPlants`
Expand Down Expand Up @@ -39,7 +39,7 @@ def download(dataset_name, download_dir):
# Get parameters from config and set download URL
data_config = egon.data.config.datasets()[dataset_name]
zenodo_files_url = (
f"https://sandbox.zenodo.org/record/"
f"https://zenodo.org/record/"
f"{data_config['deposit_id']}/files/"
)

Expand Down Expand Up @@ -69,7 +69,7 @@ def download(dataset_name, download_dir):
mastr_data_setup = partial(
Dataset,
name="MastrData",
version="0.0.1",
version="0.0.2",
dependencies=[],
tasks=(download_mastr_data,),
)
4 changes: 2 additions & 2 deletions src/egon/data/datasets_original.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ mastr:
- "gsgk"
- "storage"
file_basename: "bnetza_mastr"
deposit_id: 808086
deposit_id: 10480930

mastr_new:
technologies:
Expand All @@ -304,7 +304,7 @@ mastr_new:
- "solar"
- "biomass"
file_basename: "bnetza_mastr"
deposit_id: 1132987
deposit_id: 10480958

re_potential_areas:
target:
Expand Down
Loading