Skip to content

Chore/update dataset version #21

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

Merged
irm-codebase merged 4 commits into from
Jun 25, 2026
Merged

Chore/update dataset version #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d9a281
update fuel settings
irm-codebase Jun 25, 2026
4e378f6
Update parsing for nuclear and solar
irm-codebase Jun 25, 2026
d81ec5c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 25, 2026
bdfb1c2
update figures to 2024
irm-codebase Jun 25, 2026
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
7 changes: 4 additions & 3 deletions INTERFACE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ wildcards:
adjustment: >
Whether or not total capacity per country has been re-scaled to fit national statistics.
Options: "adjusted" or "unadjusted".
category: >
Powerplant category. A total of seven are available:
bioenergy, fossil, geothermal, hydropower, nuclear, solar and wind.
category: |
Powerplant category. A total of eight are available:
bioenergy, fossil, geothermal, hydropower, nuclear, large_solar, solar, and wind.
Note that "solar" is only available for aggregated cases.
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ snakemake --use-conda --cores 2 # run the workflow!
<!-- Please provide thorough referencing below -->

This module is based on the following research and datasets.
For specific versions please consult our [stable dataset repository](https://doi.org/10.5281/zenodo.16779120).
For specific versions please consult our [stable dataset repository](https://doi.org/10.5281/zenodo.16037139).

* **Global Energy Monitor datasets.** <https://globalenergymonitor.org/>. License: CC BY 4.0.
- Global Bioenergy Power Tracker
Expand Down
8 changes: 6 additions & 2 deletions config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,21 @@ category:

nuclear:
technology_mapping:
advanced boiling water reactor: "nuclear reactor"
boiling water reactor: "nuclear reactor"
fast breeder reactor: "nuclear reactor"
fast neutron reactor: "nuclear reactor"
gas-cooled reactor: "nuclear reactor"
heavy water gas-cooled reactor: "nuclear reactor"
heavy water light water reactor: "nuclear reactor"
high temperature gas reactor: "nuclear reactor"
liquid-metal-cooled fast reactor: "nuclear reactor"
light water graphite reactor: "nuclear reactor"
liquid-metal-cooled fast reactor: "nuclear reactor"
microreactor: "nuclear reactor"
molten salt reactor: "nuclear reactor"
pressurized heavy water reactor: "nuclear reactor"
pressurized water reactor: "nuclear reactor"
small modular reactor: "nuclear reactor"
small modular reactor: "smr reactor"
steam-generating heavy water reactor: "nuclear reactor"
unknown: "nuclear reactor"

Expand Down Expand Up @@ -134,6 +136,7 @@ imputation:
reservoir: 80
rooftop pv: 25
run of river: 80
smr reactor: 50
steam turbine: 30
utility pv: 25
retirement_delay_years:
Expand All @@ -155,5 +158,6 @@ imputation:
reservoir: 10
rooftop pv: 5
run of river: 10
smr reactor: 50
steam turbine: 5
utility pv: 2
Binary file modified figures/fossil_adjustment_MEX.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified figures/fossil_aggregation_MEX.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified figures/fossil_histogram_MEX.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified figures/solar_aggregation_europe.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28,102 changes: 14,051 additions & 14,051 deletions pixi.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import pytest

TEST_FILES = "https://zenodo.org/records/16779120/files/test_suite.zip?download=1"
TEST_FILES = "https://zenodo.org/records/20843067/files/test_suite.zip?download=1"


@pytest.fixture(scope="session")
Expand Down
2 changes: 1 addition & 1 deletion workflow/envs/powerplants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ dependencies:
- xlrd = 2.0.1
- pip = 25.1.1
- pip:
- "gregor @ git+https://github.com/jnnr/gregor.git@fix-memory-explosion"
- "gregor @ git+https://github.com/jnnr/gregor.git@main"
75 changes: 39 additions & 36 deletions workflow/internal/config.schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $defs:
year_map:
type: object
propertyNames:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"
additionalProperties:
type: integer
minimum: 1
Expand All @@ -46,30 +46,29 @@ properties:
pattern: '^(epsg|EPSG):\d{4,5}$'
required:
- projected
additionalProperties: false # Ensures no extra properties in "crs"
additionalProperties: false # Ensures no extra properties in "crs"

category:
title: Category
description: Powerplant category settings, subdivided into bins based on EIA statistics.
type: object
additionalProperties: false
properties:

bioenergy:
title: Bioenergy and Waste powerplant settings.
type: object
additionalProperties: false
properties:
excluded_ids:
$ref: '#/$defs/excluded_ids'
$ref: "#/$defs/excluded_ids"
technology_mapping:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
propertyNames:
enum: [unknown]
additionalProperties:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"
minProperties: 1
maxProperties: 1
required:
Expand All @@ -81,16 +80,16 @@ properties:
additionalProperties: false
properties:
excluded_ids:
$ref: '#/$defs/excluded_ids'
$ref: "#/$defs/excluded_ids"
technology_mapping:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
additionalProperties: false
properties:
coal:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
propertyNames:
enum:
Expand All @@ -101,12 +100,12 @@ properties:
- ultra-supercritical
- unknown
additionalProperties:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"
minProperties: 6
maxProperties: 6
oil_gas:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
propertyNames:
enum:
Expand All @@ -120,7 +119,7 @@ properties:
- "steam turbine"
- unknown
additionalProperties:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"
minProperties: 9
maxProperties: 9
required:
Expand All @@ -135,10 +134,10 @@ properties:
additionalProperties: false
properties:
excluded_ids:
$ref: '#/$defs/excluded_ids'
$ref: "#/$defs/excluded_ids"
technology_mapping:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
propertyNames:
enum:
Expand All @@ -153,7 +152,7 @@ properties:
- "geopressured geothermal system (GGS)"
- unknown
additionalProperties:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"
minProperties: 10
maxProperties: 10
required:
Expand All @@ -165,10 +164,10 @@ properties:
additionalProperties: false
properties:
excluded_ids:
$ref: '#/$defs/excluded_ids'
$ref: "#/$defs/excluded_ids"
technology_mapping:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
propertyNames:
enum:
Expand All @@ -178,7 +177,7 @@ properties:
- STO
- unknown
additionalProperties:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"
minProperties: 5
maxProperties: 5
required:
Expand All @@ -190,32 +189,34 @@ properties:
additionalProperties: false
properties:
excluded_ids:
$ref: '#/$defs/excluded_ids'
$ref: "#/$defs/excluded_ids"
technology_mapping:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
propertyNames:
enum:
- "advanced boiling water reactor"
- "boiling water reactor"
- "fast breeder reactor"
- "fast neutron reactor"
- "gas-cooled reactor"
- "heavy water gas-cooled reactor"
- "heavy water light water reactor"
- "high temperature gas reactor"
- "liquid-metal-cooled fast reactor"
- "light water graphite reactor"
- "liquid-metal-cooled fast reactor"
- "microreactor"
- "molten salt reactor"
- "pressurized heavy water reactor"
- "pressurized water reactor"
- "small modular reactor"
- "steam-generating heavy water reactor"
- unknown
- "unknown"
additionalProperties:
$ref: '#/$defs/non_empty_string'
minProperties: 15
maxProperties: 15
$ref: "#/$defs/non_empty_string"
minProperties: 17
maxProperties: 17
required:
- technology_mapping

Expand All @@ -225,15 +226,15 @@ properties:
additionalProperties: false
properties:
excluded_ids:
$ref: '#/$defs/excluded_ids'
$ref: "#/$defs/excluded_ids"
technology_mapping:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
propertyNames:
enum: [csp, rooftop_pv, utility_pv]
additionalProperties:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"
minProperties: 3
maxProperties: 3
dc_ac_ratio:
Expand All @@ -245,7 +246,7 @@ properties:
additionalProperties: false
properties:
utility_pv:
$ref: '#/$defs/positive_number'
$ref: "#/$defs/positive_number"
required:
- utility_pv
required:
Expand All @@ -258,7 +259,7 @@ properties:
additionalProperties: false
properties:
excluded_ids:
$ref: '#/$defs/excluded_ids'
$ref: "#/$defs/excluded_ids"
source:
title: Data source
description: |
Expand All @@ -272,12 +273,12 @@ properties:
- gem
technology_mapping:
allOf:
- $ref: '#/$defs/technology_mapping_base'
- $ref: "#/$defs/technology_mapping_base"
- type: object
propertyNames:
enum: [offshore, onshore]
additionalProperties:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"
minProperties: 2
maxProperties: 2
required:
Expand All @@ -298,6 +299,7 @@ properties:
- "bioenergy: agricultural waste (syngas)"
- "bioenergy: agricultural waste (unknown)"
- "bioenergy: biodiesel"
- "bioenergy: bio-heavy oil"
- "bioenergy: ethanol"
- "bioenergy: paper mill wastes"
- "bioenergy: refuse (landfill gas)"
Expand Down Expand Up @@ -339,10 +341,11 @@ properties:
- "industrial by-product: unknown"
- "other: hydrogen (blue)"
- "other: hydrogen (green)"
- "other: hydrogen (gray)"
- "other: hydrogen (unknown)"
- "other: tires"
additionalProperties:
$ref: '#/$defs/non_empty_string'
$ref: "#/$defs/non_empty_string"

imputation:
title: Imputation
Expand Down Expand Up @@ -379,7 +382,7 @@ properties:
Applies both to overlap-split plants and to plants forced into a target shape class.
The point is placed approximately this far inside the selected polygon from the nearest boundary/contact point.
If the available interior segment is shorter, the midpoint of that segment is used.
$ref: '#/$defs/positive_number'
$ref: "#/$defs/positive_number"
on_overlap:
title: Overlap adjustment method
description: |
Expand Down Expand Up @@ -438,6 +441,6 @@ properties:
- pre_construction
- announced
lifetime_years:
$ref: '#/$defs/year_map'
$ref: "#/$defs/year_map"
retirement_delay_years:
$ref: '#/$defs/year_map'
$ref: "#/$defs/year_map"
Loading
Loading