Skip to content

Update climate drivers for fire ESMValTool recipe timerange for CMIP6 and CMIP7 datasets #670

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

Open
jlenh wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Update climate drivers for fire ESMValTool recipe timerange for CMIP6 and CMIP7 datasets #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b200a39
Update climate drivers for fire recipe timerange for CMIP6 and CMIP7 …
jlenh May 13, 2026
ae5e14e
Add changelog markdown file
jlenh May 13, 2026
03626bd
Revert back test timerange specifications
jlenh May 15, 2026
6f9cd63
Merge branch 'main' into update_climate_drivers_fire_recipe_timerange
jlenh May 15, 2026
cbcbe16
Update accordingly timeranges in fire recipe for test tests/unit/test…
jlenh May 18, 2026
d9390d9
Merge branch 'main' into update_climate_drivers_fire_recipe_timerange
jlenh May 18, 2026
9345f71
Updating time range for treeFrac variable in CMIP6 unit test fire recipe
jlenh May 19, 2026
8140b30
Update timerange in ESMValTool unit test fire recipe for CMIP7
jlenh May 19, 2026
1b8445d
Merge branch 'main' into update_climate_drivers_fire_recipe_timerange
jlenh May 29, 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
1 change: 1 addition & 0 deletions changelog/670.trivial.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated the timerange on which the climate drivers for fire ESMValTool recipe is run.
14 changes: 9 additions & 5 deletions ...climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ClimateDriversForFire(ESMValToolDiagnostic):
constraints=(
RequireTimerange(
group_by=("instance_id",),
start=PartialDateTime(2013, 1),
start=PartialDateTime(1994, 1),
end=PartialDateTime(2014, 12),
),
AddSupplementaryDataset.from_defaults("sftlf", SourceDatasetType.CMIP6),
Expand Down Expand Up @@ -110,8 +110,8 @@ class ClimateDriversForFire(ESMValToolDiagnostic):
constraints=(
RequireTimerange(
group_by=("instance_id",),
start=PartialDateTime(2013, 1),
end=PartialDateTime(2014, 12),
start=PartialDateTime(2001, 1),
end=PartialDateTime(2021, 12),
),
AddSupplementaryDataset.from_defaults("sftlf", SourceDatasetType.CMIP7),
RequireFacets(
Expand Down Expand Up @@ -233,8 +233,12 @@ def update_recipe(
else:
short_name = cmip6_short_name
variable["short_name"] = short_name
variable["start_year"] = 2013
variable["end_year"] = 2014
if cmip_source == SourceDatasetType.CMIP7:
variable["start_year"] = 2001
variable["end_year"] = 2021
else:
variable["start_year"] = 1994
variable["end_year"] = 2014
Comment thread
bouweandela marked this conversation as resolved.
datasets = recipe_variables[short_name]["additional_datasets"]
for dataset in datasets:
dataset.pop("timerange", None)
Expand Down
14 changes: 7 additions & 7 deletions ...e-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ diagnostics:
mip: Amon
preprocessor: preproc
short_name: pr
start_year: 2013
start_year: 1994
end_year: 2014
additional_datasets:
- project: CMIP6
Expand All @@ -50,7 +50,7 @@ diagnostics:
mip: Amon
preprocessor: preproc
short_name: tasmax
start_year: 2013
start_year: 1994
end_year: 2014
additional_datasets:
- project: CMIP6
Expand All @@ -65,7 +65,7 @@ diagnostics:
mip: Lmon
preprocessor: preproc_fraction
short_name: treeFrac
start_year: 2013
start_year: 1994
end_year: 2014
additional_datasets:
- project: CMIP6
Expand All @@ -80,7 +80,7 @@ diagnostics:
mip: Emon
preprocessor: preproc_fraction
short_name: vegFrac
start_year: 2013
start_year: 1994
end_year: 2014
additional_datasets:
- project: CMIP6
Expand All @@ -95,7 +95,7 @@ diagnostics:
mip: Lmon
preprocessor: preproc
short_name: cVeg
start_year: 2013
start_year: 1994
end_year: 2014
additional_datasets:
- project: CMIP6
Expand All @@ -110,7 +110,7 @@ diagnostics:
mip: Amon
preprocessor: preproc
short_name: tas
start_year: 2013
start_year: 1994
end_year: 2014
additional_datasets:
- project: CMIP6
Expand All @@ -125,7 +125,7 @@ diagnostics:
mip: Amon
preprocessor: preproc
short_name: hurs
start_year: 2013
start_year: 1994
end_year: 2014
additional_datasets:
- project: CMIP6
Expand Down
28 changes: 14 additions & 14 deletions ...e-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ diagnostics:
mip: atmos
preprocessor: preproc
short_name: pr
start_year: 2013
end_year: 2014
start_year: 2001
end_year: 2021
additional_datasets:
- project: CMIP7
activity: CMIP
Expand All @@ -53,8 +53,8 @@ diagnostics:
mip: atmos
preprocessor: preproc
short_name: tas
start_year: 2013
end_year: 2014
start_year: 2001
end_year: 2021
additional_datasets:
- project: CMIP7
activity: CMIP
Expand All @@ -71,8 +71,8 @@ diagnostics:
mip: land
preprocessor: preproc_fraction
short_name: treeFrac
start_year: 2013
end_year: 2014
start_year: 2001
end_year: 2021
additional_datasets:
- project: CMIP7
activity: CMIP
Expand All @@ -89,8 +89,8 @@ diagnostics:
mip: land
preprocessor: preproc_fraction
short_name: vegFrac
start_year: 2013
end_year: 2014
start_year: 2001
end_year: 2021
additional_datasets:
- project: CMIP7
activity: CMIP
Expand All @@ -107,8 +107,8 @@ diagnostics:
mip: land
preprocessor: preproc
short_name: cVeg
start_year: 2013
end_year: 2014
start_year: 2001
end_year: 2021
additional_datasets:
- project: CMIP7
activity: CMIP
Expand All @@ -125,8 +125,8 @@ diagnostics:
mip: atmos
preprocessor: preproc
short_name: tas
start_year: 2013
end_year: 2014
start_year: 2001
end_year: 2021
additional_datasets:
- project: CMIP7
activity: CMIP
Expand All @@ -143,8 +143,8 @@ diagnostics:
mip: atmos
preprocessor: preproc
short_name: hurs
start_year: 2013
end_year: 2014
start_year: 2001
end_year: 2021
additional_datasets:
- project: CMIP7
activity: CMIP
Expand Down
Loading