diff --git a/doc/configtables/load.csv b/doc/configtables/load.csv index 34d73dc5..9ebfea32 100644 --- a/doc/configtables/load.csv +++ b/doc/configtables/load.csv @@ -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`." 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" -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." diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 157919ab..907379da 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -1529,7 +1529,7 @@ This release is known to work with `PyPSA-Eur **Gas Transmission Network** * New rule ``retrieve_gas_infrastructure_data`` that downloads and extracts the - SciGRID_gas `IGGIELGN `__ dataset from + SciGRID_gas `IGGIELGN `__ dataset from zenodo. It includes data on the transmission routes, pipe diameters, capacities, pressure, and whether the pipeline is bidirectional and carries H-Gas or L-Gas. @@ -1689,7 +1689,7 @@ This release is known to work with `PyPSA-Eur PyPSA network. * Updated `data bundle - `__ + `__ that includes the hydrogan salt cavern storage potentials. * 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 `__ and is `archived -on Zenodo `__. +on Zenodo `__. @@ -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 transport. -It is `archived on Zenodo `__. +It is `archived on Zenodo `__. Release Process diff --git a/doc/supply_demand.rst b/doc/supply_demand.rst index cc598aaf..db7bfb70 100644 --- a/doc/supply_demand.rst +++ b/doc/supply_demand.rst @@ -386,7 +386,7 @@ carbon capture (bottom bar) assumed in `Neumann et al `__, 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 `__, 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 diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 74d218bf..5147e564 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -78,7 +78,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_cutout", True rule retrieve_cutout: input: storage( - "https://zenodo.org/record/6382570/files/{cutout}.nc", + "https://zenodo.org/records/6382570/files/{cutout}.nc", ), output: protected("cutouts/" + CDIR + "{cutout}.nc"), @@ -194,7 +194,7 @@ if config["enable"]["retrieve"]: rule download_copernicus_land_cover: input: 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: "data/Copernicus_LC100_global_v3.0.1_2019-nrt_Discrete-Classification-map_EPSG-4326.tif", diff --git a/scripts/_helpers.py b/scripts/_helpers.py index dfedcaea..683828b2 100644 --- a/scripts/_helpers.py +++ b/scripts/_helpers.py @@ -707,7 +707,7 @@ def update_config_from_wildcards(config, w, inplace=True): def get_checksum_from_zenodo(file_url): parts = file_url.split("/") - record_id = parts[parts.index("record") + 1] + record_id = parts[parts.index("records") + 1] filename = parts[-1] 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", - ... 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. diff --git a/scripts/retrieve_gas_infrastructure_data.py b/scripts/retrieve_gas_infrastructure_data.py index 8d7d0e08..972e08c5 100644 --- a/scripts/retrieve_gas_infrastructure_data.py +++ b/scripts/retrieve_gas_infrastructure_data.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT """ Retrieve gas infrastructure data from -https://zenodo.org/record/4767098/files/IGGIELGN.zip. +https://zenodo.org/records/4767098/files/IGGIELGN.zip. """ import logging @@ -32,7 +32,7 @@ if __name__ == "__main__": configure_logging(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 zip_fn = Path(f"{rootpath}/IGGIELGN.zip")