bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change in zenodo urls from record to records

Browse Source
This commit is contained in:
Fabian Neumann 2024-04-15 15:14:02 +02:00
parent fe1199e981
commit a1e42db58b
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/configtables/load.csv
View File

@ -4,4 +4,4 @@ time_shift_for_large_gaps,string,string,"Periods which are used for copying time
manual_adjustments,bool,"{true, false}","Whether to adjust the load data manually according to the function in :func:`manual_adjustment`." manual_adjustments,bool,"{true, false}","Whether to adjust the load data manually according to the function in :func:`manual_adjustment`."
scaling_factor,--,float,"Global correction factor for the load time series." scaling_factor,--,float,"Global correction factor for the load time series."
fixed_year,--,Year or False,"To specify a fixed year for the load time series that deviates from the snapshots' year" fixed_year,--,Year or False,"To specify a fixed year for the load time series that deviates from the snapshots' year"
supplement_synthetic,bool,"{true, false}","Whether to supplement missing data for selected time period should be supplemented by synthetic data from https://zenodo.org/record/10820928." supplement_synthetic,bool,"{true, false}","Whether to supplement missing data for selected time period should be supplemented by synthetic data from https://zenodo.org/records/10820928."

1 Unit Values Description
4 manual_adjustments bool {true, false} Whether to adjust the load data manually according to the function in :func:`manual_adjustment`.
5 scaling_factor -- float Global correction factor for the load time series.
6 fixed_year -- Year or False To specify a fixed year for the load time series that deviates from the snapshots' year
7 supplement_synthetic bool {true, false} Whether to supplement missing data for selected time period should be supplemented by synthetic data from https://zenodo.org/record/10820928. Whether to supplement missing data for selected time period should be supplemented by synthetic data from https://zenodo.org/records/10820928.

8
doc/release_notes.rst
View File

@ -1529,7 +1529,7 @@ This release is known to work with `PyPSA-Eur
**Gas Transmission Network** **Gas Transmission Network**
* New rule ``retrieve_gas_infrastructure_data`` that downloads and extracts the * New rule ``retrieve_gas_infrastructure_data`` that downloads and extracts the
SciGRID_gas `IGGIELGN <https://zenodo.org/record/4767098>`__ dataset from SciGRID_gas `IGGIELGN <https://zenodo.org/records/4767098>`__ dataset from
zenodo. It includes data on the transmission routes, pipe diameters, zenodo. It includes data on the transmission routes, pipe diameters,
capacities, pressure, and whether the pipeline is bidirectional and carries capacities, pressure, and whether the pipeline is bidirectional and carries
H-Gas or L-Gas. H-Gas or L-Gas.
@ -1689,7 +1689,7 @@ This release is known to work with `PyPSA-Eur
PyPSA network. PyPSA network.
* Updated `data bundle * Updated `data bundle
<https://zenodo.org/record/5824485/files/pypsa-eur-sec-data-bundle.tar.gz>`__ <https://zenodo.org/records/5824485/files/pypsa-eur-sec-data-bundle.tar.gz>`__
that includes the hydrogan salt cavern storage potentials. that includes the hydrogan salt cavern storage potentials.
* Updated and extended documentation in * Updated and extended documentation in
@ -2049,7 +2049,7 @@ PyPSA-Eur-Sec codebase in Version 0.2.0 above.
This model has `its own github repository This model has `its own github repository
<https://github.com/martavp/pypsa-eur-sec-30-path>`__ and is `archived <https://github.com/martavp/pypsa-eur-sec-30-path>`__ and is `archived
on Zenodo <https://zenodo.org/record/4014807>`__. on Zenodo <https://zenodo.org/records/4014807>`__.
@ -2065,7 +2065,7 @@ European countries with one node per country. It includes demand and
supply for electricity, space and water heating in buildings, and land supply for electricity, space and water heating in buildings, and land
transport. transport.
It is `archived on Zenodo <https://zenodo.org/record/1146666>`__. It is `archived on Zenodo <https://zenodo.org/records/1146666>`__.
Release Process Release Process

2
doc/supply_demand.rst
View File

@ -386,7 +386,7 @@ carbon capture (bottom bar) assumed in `Neumann et al <https://arxiv.org/abs/220
.. image:: ../graphics/process-emissions.png .. image:: ../graphics/process-emissions.png
Inside each country the industrial demand is then distributed using the `Hotmaps Industrial Database <https://zenodo.org/record/4687147#.YvOaxhxBy5c>`__, which is illustrated in the figure below. This open database includes georeferenced industrial sites of energy-intensive industry sectors in EU28, including cement, basic chemicals, glass, iron and steel, non-ferrous metals, non-metallic minerals, paper, and refineries subsectors. The use of this spatial dataset enables the calculation of regional and process-specific energy demands. This approach assumes that there will be no significant migration of energy-intensive industries. Inside each country the industrial demand is then distributed using the `Hotmaps Industrial Database <https://zenodo.org/records/4687147#.YvOaxhxBy5c>`__, which is illustrated in the figure below. This open database includes georeferenced industrial sites of energy-intensive industry sectors in EU28, including cement, basic chemicals, glass, iron and steel, non-ferrous metals, non-metallic minerals, paper, and refineries subsectors. The use of this spatial dataset enables the calculation of regional and process-specific energy demands. This approach assumes that there will be no significant migration of energy-intensive industries.
.. image:: ../graphics/hotmaps.png .. image:: ../graphics/hotmaps.png

4
rules/retrieve.smk
View File

@ -78,7 +78,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_cutout", True
rule retrieve_cutout: rule retrieve_cutout:
input: input:
storage( storage(
"https://zenodo.org/record/6382570/files/{cutout}.nc", "https://zenodo.org/records/6382570/files/{cutout}.nc",
), ),
output: output:
protected("cutouts/" + CDIR + "{cutout}.nc"), protected("cutouts/" + CDIR + "{cutout}.nc"),
@ -194,7 +194,7 @@ if config["enable"]["retrieve"]:
rule download_copernicus_land_cover: rule download_copernicus_land_cover:
input: input:
storage( storage(
"https://zenodo.org/record/3939050/files/PROBAV_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif", "https://zenodo.org/records/3939050/files/PROBAV_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif",
), ),
output: output:
"data/Copernicus_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif", "data/Copernicus_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif",

4
scripts/_helpers.py
View File

@ -707,7 +707,7 @@ def update_config_from_wildcards(config, w, inplace=True):
def get_checksum_from_zenodo(file_url): def get_checksum_from_zenodo(file_url):
parts = file_url.split("/") parts = file_url.split("/")
record_id = parts[parts.index("record") + 1] record_id = parts[parts.index("records") + 1]
filename = parts[-1] filename = parts[-1]
response = requests.get(f"https://zenodo.org/api/records/{record_id}", timeout=30) response = requests.get(f"https://zenodo.org/api/records/{record_id}", timeout=30)
@ -746,7 +746,7 @@ def validate_checksum(file_path, zenodo_url=None, checksum=None):
>>> validate_checksum("/path/to/file", checksum="md5:abc123...") >>> validate_checksum("/path/to/file", checksum="md5:abc123...")
>>> validate_checksum( >>> validate_checksum(
... "/path/to/file", ... "/path/to/file",
... zenodo_url="https://zenodo.org/record/12345/files/example.txt", ... zenodo_url="https://zenodo.org/records/12345/files/example.txt",
... ) ... )
If the checksum is invalid, an AssertionError will be raised. If the checksum is invalid, an AssertionError will be raised.

4
scripts/retrieve_gas_infrastructure_data.py
View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
""" """
Retrieve gas infrastructure data from Retrieve gas infrastructure data from
https://zenodo.org/record/4767098/files/IGGIELGN.zip. https://zenodo.org/records/4767098/files/IGGIELGN.zip.
""" """
import logging import logging
@ -32,7 +32,7 @@ if __name__ == "__main__":
configure_logging(snakemake) configure_logging(snakemake)
set_scenario_config(snakemake) set_scenario_config(snakemake)
url = "https://zenodo.org/record/4767098/files/IGGIELGN.zip" url = "https://zenodo.org/records/4767098/files/IGGIELGN.zip"
# Save locations # Save locations
zip_fn = Path(f"{rootpath}/IGGIELGN.zip") zip_fn = Path(f"{rootpath}/IGGIELGN.zip")