Update timerange and reference dataset for CMIP7 cloud radiative effects diagnostic

changelog/683.improvement.md

@@ -0,0 +1 @@
+Updated time range and reference dataset for CMIP7 cloud radiative effects diagnostic.

packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_radiative_effects.py

@@ -9,7 +9,7 @@
 )
 from climate_ref_core.datasets import FacetFilter, SourceDatasetType
 from climate_ref_core.diagnostics import DataRequirement
-from climate_ref_core.esgf import CMIP6Request, CMIP7Request
+from climate_ref_core.esgf import CMIP6Request, CMIP7Request, Obs4MIPsRequest
 from climate_ref_core.metric_values.typing import FileDefinition, SeriesDefinition
 from climate_ref_core.testing import TestCase, TestDataSpecification
 from climate_ref_esmvaltool.diagnostics.base import ESMValToolDiagnostic, get_cmip_source_type
@@ -24,7 +24,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
 
     name = "Climatologies and zonal mean profiles of cloud radiative effects"
     slug = "cloud-radiative-effects"
-    base_recipe = "ref/recipe_ref_cre.yml"
+    base_recipe = "ref/recipe_ref_cre_cmip7.yml"
 
     variables = (
         "rlut",
@@ -80,16 +80,40 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
                 constraints=(
                     RequireTimerange(
                         group_by=("instance_id",),
-                        start=PartialDateTime(1996, 1),
-                        end=PartialDateTime(2014, 12),
+                        start=PartialDateTime(2002, 1),
+                        end=PartialDateTime(2021, 12),
                     ),
                     RequireOverlappingTimerange(group_by=("instance_id",)),
                     RequireFacets("variable_id", variables),
                     AddSupplementaryDataset.from_defaults("areacella", SourceDatasetType.CMIP7),
                 ),
             ),
+            DataRequirement(
+                source_type=SourceDatasetType.obs4MIPs,
+                filters=(
+                    FacetFilter(
+                        facets={
+                            "frequency": "mon",
+                            "source_id": "CERES-EBAF-4-2-1",
+                            "variable_id": (
+                                "rlut",
+                                "rlutcs",
+                                "rsut",
+                                "rsutcs",
+                            ),
+                        }
+                    ),
+                ),
+                group_by=("source_id",),
+                constraints=(
+                    RequireTimerange(
+                        group_by=("instance_id",),
+                        start=PartialDateTime(2002, 1),
+                        end=PartialDateTime(2021, 12),
+                    ),
+                ),
+            ),
         ),
-        # TODO: Use CERES-EBAF, ESACCI-CLOUD, and ISCCP-FH from obs4MIPs once available.
     )
 
     facets = ()
@@ -136,9 +160,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
             attributes=[],
         )
         for var_name in ["lwcre", "swcre"]
-        for i, source_id in enumerate(
-            ["CERES-EBAF-Ed4.2", "ESACCI-CLOUD-AVHRR-AMPM-fv3.0", "ISCCP-FH"], start=1
-        )
+        for i, source_id in enumerate(["CERES-EBAF-4-2-1"], start=1)
     )
 
     test_data_spec = TestDataSpecification(
@@ -184,6 +206,21 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
                         remove_ensembles=True,
                         time_span=("1996", "2014"),
                     ),
+                    Obs4MIPsRequest(
+                        slug="obs4mips",
+                        facets={
+                            "frequency": "mon",
+                            "source_id": "CERES-EBAF-4-2-1",
+                            "variable_id": (
+                                "rlut",
+                                "rlutcs",
+                                "rsut",
+                                "rsutcs",
+                            ),
+                        },
+                        remove_ensembles=False,
+                        time_span=("2001", "2021"),
+                    ),
                 ),
             ),
         )

packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/recipe.py

@@ -296,11 +296,11 @@ def get_child_and_parent_dataset(
     return [child_dataset, parent_dataset]
 
 
-_ESMVALTOOL_COMMIT = "dead90ca848d3892ed90785b3940909d58d27780"
+_ESMVALTOOL_COMMIT = "a384c68070efabbe90094a711b4350a33e87fc55"
 _ESMVALTOOL_VERSION = f"2.14.0.dev65+g{_ESMVALTOOL_COMMIT[:9]}"
 _ESMVALTOOL_URL = f"git+https://github.com/ESMValGroup/ESMValTool.git@{_ESMVALTOOL_COMMIT}"
 
-_ESMVALCORE_COMMIT = "2cff15ca8a7c4835465a40b2cbac75b179450d4f"
+_ESMVALCORE_COMMIT = "d7569120c19a394b2c519e81c7117d0652942349"
 _ESMVALCORE_URL = f"git+https://github.com/ESMValGroup/ESMValCore.git@{_ESMVALCORE_COMMIT}"
 
 _RECIPES_URL = (

packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/recipes.txt

@@ -10,8 +10,9 @@ ref/recipe_enso_characteristics.yml         34c2518b138068ac96d212910b979d54a8fc
 ref/recipe_ref_annual_cycle_region.yml      88e0c2f07a76c4de4276547badcc74091516e03840eddb1f0e62469c67a0a86d
 ref/recipe_ref_cre.yml                      4375f262479c3b3e1b348b71080a6d758e195bda76516a591182045a3a29aa32
 ref/recipe_ref_fire.yml                     2ad82effaca4e742d8abe6a0aa07bb46e1e92ef0d2d240760f7623b0ba045926
-ref/recipe_ref_ozone.yml                    388aaf01721c0856ab7143b47b9d2f1efeaaae4ef57e11572c1e133b49aad0a6
+ref/recipe_ref_ozone.yml                    09ded4946ecd762ba000916c9f8618120a2e6269930427ae5129da466165f3e5
 ref/recipe_ref_sea_ice_area_basic.yml       7d01a8527880663ca28284772f83a8356d9972fb4f022a4000e50a56ce044b09
 ref/recipe_ref_scatterplot.yml              b99d1736e16256d161847b025811d7088ad9f892d4887fb009fa99c4079135a0
 ref/recipe_ref_timeseries_region.yml        deee4403ea25867401e163f6c9d7fcc4fee09d3088009007fcad6a29d01247a8
 ref/recipe_ref_trend_regions.yml            18fe246a51474bd12172ab1ba141efac999a247de7774822f77ae6ef144645fe
+ref/recipe_ref_cre_cmip7.yml                b15687ac9e3ace4fe45e81d099e5828888101a205a0e2ed07d8a57a90cbe3f55

packages/climate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_cloud_radiative_effects_cmip6.yml

@@ -19,21 +19,19 @@ datasets:
   grid: gn
   mip: Amon
 timerange_for_models:
-  timerange: 1996/2014
+  timerange: 2002/2021
 preprocessors:
   full_climatology:
     climate_statistics:
       period: full
     regrid:
       target_grid: 1x1
-      scheme:
-        reference: esmf_regrid.schemes:ESMFAreaWeighted
+      scheme: area_weighted
   zonal_mean:
     climate_statistics:
       period: full
     regrid:
-      scheme:
-        reference: esmf_regrid.schemes:ESMFAreaWeighted
+      scheme: area_weighted
       target_grid: 1x1
     zonal_statistics:
       operator: mean
@@ -42,23 +40,21 @@ diagnostics:
     description: Plot lwcre climatology maps including reference datasets.
     variables:
       lwcre:
-        timerange: 1996/2014
+        timerange: 2002/2021
         mip: Amon
         preprocessor: full_climatology
         derive: true
       swcre:
-        timerange: 1996/2014
+        timerange: 2002/2021
         mip: Amon
         preprocessor: full_climatology
         derive: true
     additional_datasets:
-    - dataset: CERES-EBAF
-      project: OBS
-      type: sat
-      version: Ed4.2
-      tier: 2
-      start_year: 2000
-      end_year: 2023
+    - dataset: CERES-EBAF-4-2-1
+      project: obs4MIPs
+      tier: 1
+      start_year: 2002
+      end_year: 2021
       reference_for_monitor_diags: true
     scripts:
       plot:
@@ -74,38 +70,22 @@ diagnostics:
     description: Plot lwcre zonal mean including reference datasets.
     variables:
       lwcre:
-        timerange: 1996/2014
+        timerange: 2002/2021
         mip: Amon
         preprocessor: zonal_mean
         derive: true
       swcre:
-        timerange: 1996/2014
+        timerange: 2002/2021
         mip: Amon
         preprocessor: zonal_mean
         derive: true
     additional_datasets:
-    - dataset: CERES-EBAF
-      project: OBS
-      type: sat
-      version: Ed4.2
-      tier: 2
-      start_year: 2000
-      end_year: 2023
+    - dataset: CERES-EBAF-4-2-1
+      project: obs4MIPs
+      tier: 1
+      start_year: 2002
+      end_year: 2021
       reference_for_monitor_diags: true
-    - dataset: ESACCI-CLOUD
-      project: OBS
-      type: sat
-      version: AVHRR-AMPM-fv3.0
-      tier: 2
-      start_year: 1996
-      end_year: 2016
-    - dataset: ISCCP-FH
-      project: OBS
-      type: sat
-      version: v0
-      tier: 2
-      start_year: 1996
-      end_year: 2016
     scripts:
       plot:
         script: monitor/multi_datasets.py
@@ -116,11 +96,5 @@ diagnostics:
             legend_kwargs:
               loc: upper right
             plot_kwargs:
-              CERES-EBAF:
+              CERES-EBAF-4-2-1:
                 color: black
-              ESACCI-CLOUD:
-                color: black
-                linestyle: dashed
-              ISCCP-FH:
-                color: black
-                linestyle: dotted