From b200a395ff3562379e5fa7996070fd01b4c3c23d Mon Sep 17 00:00:00 2001 From: jlenh Date: Wed, 13 May 2026 14:58:18 +0200 Subject: [PATCH 1/6] Update climate drivers for fire recipe timerange for CMIP6 and CMIP7 datasets --- .../diagnostics/climate_drivers_for_fire.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py index c8f295ad4..bd2f46a58 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py @@ -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), @@ -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( @@ -171,7 +171,7 @@ class ClimateDriversForFire(ESMValToolDiagnostic): "frequency": ["fx", "mon"], }, remove_ensembles=True, - time_span=("2013", "2014"), + time_span=("1994", "2014"), ), ), ), @@ -209,7 +209,7 @@ class ClimateDriversForFire(ESMValToolDiagnostic): "region": "glb", }, remove_ensembles=True, - time_span=("2013", "2014"), + time_span=("2001", "2021"), ), ), ), @@ -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 datasets = recipe_variables[short_name]["additional_datasets"] for dataset in datasets: dataset.pop("timerange", None) From ae5e14e0ca4a0fef53e8039f20f3db9f62be4f6a Mon Sep 17 00:00:00 2001 From: jlenh Date: Wed, 13 May 2026 15:18:08 +0200 Subject: [PATCH 2/6] Add changelog markdown file --- changelog/670.trivial.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/670.trivial.md diff --git a/changelog/670.trivial.md b/changelog/670.trivial.md new file mode 100644 index 000000000..621e8b570 --- /dev/null +++ b/changelog/670.trivial.md @@ -0,0 +1 @@ +Updated the timerange on which the climate drivers for fire ESMValTool recipe is run. From 03626bdcafde39b347d78f5e921c3a882d592508 Mon Sep 17 00:00:00 2001 From: jlenh Date: Fri, 15 May 2026 11:52:11 +0200 Subject: [PATCH 3/6] Revert back test timerange specifications --- .../diagnostics/climate_drivers_for_fire.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py index bd2f46a58..380cbae00 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/climate_drivers_for_fire.py @@ -171,7 +171,7 @@ class ClimateDriversForFire(ESMValToolDiagnostic): "frequency": ["fx", "mon"], }, remove_ensembles=True, - time_span=("1994", "2014"), + time_span=("2013", "2014"), ), ), ), @@ -209,7 +209,7 @@ class ClimateDriversForFire(ESMValToolDiagnostic): "region": "glb", }, remove_ensembles=True, - time_span=("2001", "2021"), + time_span=("2013", "2014"), ), ), ), From cbcbe1624e9e57fd80d60302aeb94dadf228068d Mon Sep 17 00:00:00 2001 From: jlenh Date: Mon, 18 May 2026 10:02:31 +0200 Subject: [PATCH 4/6] Update accordingly timeranges in fire recipe for test tests/unit/test_solve_regression.py --- .../recipe_climate_drivers_for_fire_cmip6.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml b/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml index 49b7e0636..8cb294d59 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From 9345f71363c8659c898ca53da2d76e6dc06d85ab Mon Sep 17 00:00:00 2001 From: jlenh Date: Tue, 19 May 2026 09:54:41 +0200 Subject: [PATCH 5/6] Updating time range for treeFrac variable in CMIP6 unit test fire recipe --- .../recipes/recipe_climate_drivers_for_fire_cmip6.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml b/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml index 8cb294d59..9f21e2884 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip6.yml @@ -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 From 8140b30fb73773f57a384101742afc7dbc15dd68 Mon Sep 17 00:00:00 2001 From: jlenh Date: Tue, 19 May 2026 10:40:34 +0200 Subject: [PATCH 6/6] Update timerange in ESMValTool unit test fire recipe for CMIP7 --- .../recipe_climate_drivers_for_fire_cmip7.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip7.yml b/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip7.yml index f3b3dcb3f..9807a070c 100644 --- a/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip7.yml +++ b/packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_climate_drivers_for_fire_cmip7.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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