diff --git a/config/config.de.yaml b/config/config.de.yaml index 42e014928..3ccd389ed 100644 --- a/config/config.de.yaml +++ b/config/config.de.yaml @@ -725,3 +725,6 @@ data: egon: source: archive version: latest + costs: + source: primary + version: latest diff --git a/config/config.default.yaml b/config/config.default.yaml index 93b99e454..e0e084f69 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -1067,7 +1067,7 @@ industry: MWh_CH4_per_tMeOH: 10.25 MWh_MeOH_per_tMeOH: 5.528 hotmaps_locate_missing: false - reference_year: 2019 + reference_year: 2023 oil_refining_emissions: 0.013 gas_compression_losses: 0.04 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#costs diff --git a/config/schema.default.json b/config/schema.default.json index 59fa6d544..220d3874e 100644 --- a/config/schema.default.json +++ b/config/schema.default.json @@ -2615,7 +2615,7 @@ "type": "boolean" }, "reference_year": { - "default": 2019, + "default": 2023, "description": "The year used as the baseline for industrial energy demand and production. Data extracted from `JRC-IDEES 2015 `_.", "markdownDescription": "The year used as the baseline for industrial energy demand and production. Data extracted from [JRC-IDEES 2015 ](https://data.jrc.ec.europa.eu/dataset/jrc-10110-10001).", "type": "integer" @@ -11589,7 +11589,7 @@ "type": "boolean" }, "reference_year": { - "default": 2019, + "default": 2023, "description": "The year used as the baseline for industrial energy demand and production. Data extracted from `JRC-IDEES 2015 `_.", "markdownDescription": "The year used as the baseline for industrial energy demand and production. Data extracted from [JRC-IDEES 2015 ](https://data.jrc.ec.europa.eu/dataset/jrc-10110-10001).", "type": "integer" diff --git a/data/versions.csv b/data/versions.csv index d285a25f0..22d42df90 100644 --- a/data/versions.csv +++ b/data/versions.csv @@ -22,8 +22,9 @@ copernicus_land_cover,v3.0.1,archive,latest supported,2026-01-20,"The primary is copernicus_land_cover,v2.0.2,archive,deprecated supported,2026-01-13,,https://data.pypsa.org/workflows/eur/copernicus_land_cover/v2.0.2/PROBAV_LC100_global_v3.0.1_2015-base_Discrete-Classification-map_EPSG-4326.tif corine,v18_5,archive,latest supported,2026-01-13,,https://data.pypsa.org/workflows/eur/corine/v18_5/corine.zip corine,unknown,primary,latest supported,2025-12-02,Need to register with CLMS API and create an access token. The download URL is dynamic, -costs,v0.14.0,primary,latest supported,2026-02-13,Part of the `technologydata` repository and versioned on GitHub.,https://raw.githubusercontent.com/PyPSA/technology-data/refs/tags/v0.14.0/outputs -costs,v0.14.0,archive,latest supported,2026-02-13,Part of the `technologydata` repository and versioned on GitHub.,https://data.pypsa.org/workflows/eur/costs/v0.14.0 +costs,v0.14.0-2020,primary,latest supported,2026-02-25,Part of the `technologydata` repository and versioned on GitHub.,https://raw.githubusercontent.com/PyPSA/technology-data/refs/tags/v0.14.0-2020/outputs +costs,v0.14.0,primary,not-supported,2026-02-13,Part of the `technologydata` repository and versioned on GitHub.,https://raw.githubusercontent.com/PyPSA/technology-data/refs/tags/v0.14.0/outputs +costs,v0.14.0,archive,not-supported,2026-02-13,Part of the `technologydata` repository and versioned on GitHub.,https://data.pypsa.org/workflows/eur/costs/v0.14.0 costs,v0.13.4,primary,supported,2025-12-02,Part of the `technologydata` repository and versioned on GitHub.,https://raw.githubusercontent.com/PyPSA/technology-data/refs/tags/v0.13.4/outputs costs,v0.13.4,archive,supported,2026-01-21,Part of the `technologydata` repository and versioned on GitHub.,https://data.pypsa.org/workflows/eur/costs/v0.13.4 costs,v0.13.3,primary,supported,2025-12-02,Part of the `technologydata` repository and versioned on GitHub.,https://raw.githubusercontent.com/PyPSA/technology-data/refs/tags/v0.13.3/outputs @@ -107,9 +108,10 @@ natura,2025-08-15,primary,latest supported,2025-12-02,,https://zenodo.org/record natura,2025-08-15,archive,latest supported,2026-01-13,,https://data.pypsa.org/workflows/eur/natura/2025-08-15/natura.tiff neso_electricity_demand,unknown,build,latest supported,2026-02-02,,https://www.neso.energy/data-portal/historic-demand-data neso_electricity_demand,2026-02-02,archive,latest supported,2026-02-03,,https://data.pypsa.org/workflows/eur/neso_electricity_demand/2026-02-02/electricity_demand_neso_raw.csv -nitrogen_statistics,2023,primary,not-tested,2025-12-02,,https://d9-wret.s3.us-west-2.amazonaws.com/assets/palladium/production/s3fs-public/media/files/myb1-2023-nitro-ERT.xlsx -nitrogen_statistics,2022,primary,latest supported,2025-12-02,,https://d9-wret.s3.us-west-2.amazonaws.com/assets/palladium/production/s3fs-public/media/files/myb1-2022-nitro-ert.xlsx -nitrogen_statistics,2022,archive,latest supported,2026-01-13,,https://data.pypsa.org/workflows/eur/nitrogen_statistics/2022/nitro-ert.xlsx +nitrogen_statistics,2023,primary,latest supported,2025-12-02,,https://d9-wret.s3.us-west-2.amazonaws.com/assets/palladium/production/s3fs-public/media/files/myb1-2023-nitro-ERT.xlsx +nitrogen_statistics,2023,archive,latest supported,2026-02-26,,https://data.pypsa.org/workflows/eur/nitrogen_statistics/2023/myb1-2023-nitro-ERT.xlsx +nitrogen_statistics,2022,primary,supported,2025-12-02,,https://d9-wret.s3.us-west-2.amazonaws.com/assets/palladium/production/s3fs-public/media/files/myb1-2022-nitro-ert.xlsx +nitrogen_statistics,2022,archive,supported,2026-01-13,,https://data.pypsa.org/workflows/eur/nitrogen_statistics/2022/nitro-ert.xlsx nuts3_population,13-03-2025,primary,latest supported,2025-12-02,,https://ec.europa.eu/eurostat/api/dissemination/sdmx/2.1/data/nama_10r_3popgdp?format=TSV&compressed=true nuts3_population,13-03-2025,archive,latest supported,2026-01-13,earlier part of zenodo bundle,https://data.pypsa.org/workflows/eur/nuts3_population/13-03-2025/nama_10r_3popgdp.tsv.gz ons_lad,may-2024,primary,latest supported,2026-02-02,API request used,https://services1.arcgis.com/ESMARspQHYMw9BZ9/arcgis/rest/services/Local_Authority_Districts_May_2024_Boundaries__UK_BSC/FeatureServer/0/query diff --git a/scripts/build_ammonia_production.py b/scripts/build_ammonia_production.py index 384a399e4..2bdfd4812 100644 --- a/scripts/build_ammonia_production.py +++ b/scripts/build_ammonia_production.py @@ -45,7 +45,7 @@ ammonia.index = cc.convert(ammonia.index, to="iso2") - years = [str(i) for i in range(2018, 2023)] + years = [str(i) for i in range(2019, 2024)] ammonia = ammonia.rename(columns=lambda x: str(x))[years] ammonia.replace("--", np.nan, inplace=True) diff --git a/scripts/lib/validation/config/industry.py b/scripts/lib/validation/config/industry.py index 89d337513..a5960302b 100644 --- a/scripts/lib/validation/config/industry.py +++ b/scripts/lib/validation/config/industry.py @@ -201,7 +201,7 @@ class IndustryConfig(ConfigModel): description="Locate industrial sites without valid locations based on city and countries.", ) reference_year: int = Field( - 2019, + 2023, description="The year used as the baseline for industrial energy demand and production. Data extracted from `JRC-IDEES 2015 `_.", ) oil_refining_emissions: float = Field(