climate-ref-esmvaltool 0.18.2__tar.gz → 0.19.0__tar.gz

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: climate-ref-esmvaltool
-Version: 0.18.2
+Version: 0.19.0
 Summary: ESMValTool diagnostic provider for the Rapid Evaluation Framework
 Author-email: ESMValTool development team <esmvaltool-dev@listserv.dfn.de>, Jared Lewis <jared.lewis@climate-resource.com>
 License-Expression: Apache-2.0

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "climate-ref-esmvaltool"
-version = "0.18.2"
+version = "0.19.0"
 description = "ESMValTool diagnostic provider for the Rapid Evaluation Framework"
 readme = "README.md"
 authors = [

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/src/climate_ref_esmvaltool/diagnostics/base.py

@@ -80,6 +80,28 @@ def fillvalues_to_nan(array: np.ndarray) -> np.ndarray:
     return mask_fillvalues(array).filled(np.nan)
 
 
+_DATASET_LABEL_COORD = "dataset"
+"""Auxiliary coordinate holding the dataset label in ESMValTool's multi-dataset netCDF files."""
+
+
+def index_dataset_labels(dataset: xr.Dataset) -> xr.Dataset:
+    """Make the ``dataset`` label coordinate of an ESMValTool output file selectable.
+
+    This decodes the labels and indexes them, so ``dataset.sel(dataset="<label>")`` works.
+    Files without such a coordinate are returned unchanged.
+    """
+    if _DATASET_LABEL_COORD not in dataset.coords or dataset[_DATASET_LABEL_COORD].ndim != 1:
+        return dataset
+    labels = dataset[_DATASET_LABEL_COORD]
+    decoded = [v.decode() if isinstance(v, bytes) else str(v) for v in labels.values.tolist()]
+    dataset = dataset.assign_coords(
+        {_DATASET_LABEL_COORD: (labels.dims, [v.strip() for v in decoded], labels.attrs)}
+    )
+    if _DATASET_LABEL_COORD not in dataset.dims:
+        dataset = dataset.set_xindex(_DATASET_LABEL_COORD)
+    return dataset
+
+
 class ESMValToolDiagnostic(CommandLineDiagnostic):
     """ESMValTool Diagnostic base class."""
 
@@ -512,6 +534,9 @@ class ESMValToolDiagnostic(CommandLineDiagnostic):
     ) -> list[SeriesMetricValue]:
         """
         Extract series data from a file if it matches any of the series definitions.
+
+        String values in :attr:`SeriesDefinition.sel` are formatted with ``input_selectors``,
+        so a definition can select the model by its label, e.g. ``{"dataset": "{source_id}"}``.
         """
         variable_attributes = (
             "long_name",
@@ -526,7 +551,21 @@ class ESMValToolDiagnostic(CommandLineDiagnostic):
                 f"executions/*/{series_def.file_pattern.format(**input_selectors)}",
             ):
                 dataset = xr.open_dataset(filename, decode_times=xr.coders.CFDatetimeCoder(use_cftime=True))
-                dataset = dataset.sel(series_def.sel)
+                dataset = index_dataset_labels(dataset)
+                sel = {
+                    key: value.format(**input_selectors) if isinstance(value, str) else value
+                    for key, value in (series_def.sel or {}).items()
+                }
+                try:
+                    dataset = dataset.sel(sel)
+                except KeyError as exc:
+                    labels = (
+                        dataset[_DATASET_LABEL_COORD].values.tolist()
+                        if _DATASET_LABEL_COORD in dataset.coords
+                        else None
+                    )
+                    msg = f"No data matching {sel} in {filename} (dataset labels: {labels})"
+                    raise KeyError(msg) from exc
                 attributes = {
                     attr: dataset.attrs[attr] for attr in series_def.attributes if attr in dataset.attrs
                 }

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/src/climate_ref_esmvaltool/diagnostics/cloud_radiative_effects.py

@@ -62,7 +62,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
     name = "Climatologies and zonal mean profiles of cloud radiative effects"
     slug = "cloud-radiative-effects"
     base_recipe = "ref/recipe_ref_cre_cmip7.yml"
-    version = 3
+    version = 4
 
     variables = (
         "rlut",
@@ -158,7 +158,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
     series = tuple(
         SeriesDefinition(
             file_pattern=f"plot_profiles/plot/variable_vs_lat_{var_name}_*.nc",
-            sel={"dim0": 0},  # Select the model.
+            sel={"dataset": "{source_id}"},  # Select the model by its label.
             dimensions={"variable_id": var_name, "statistic": "zonal mean"},
             values_name=var_name,
             index_name="lat",
@@ -168,7 +168,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
     ) + tuple(
         SeriesDefinition(
             file_pattern=f"plot_profiles/plot/variable_vs_lat_{var_name}_*.nc",
-            sel={"dim0": 1},  # Select the observation.
+            sel={"dataset": _REFERENCE_SOURCE_ID},  # Select the observation by its label.
             dimensions={
                 "variable_id": var_name,
                 "statistic": "zonal mean",

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/src/climate_ref_esmvaltool/diagnostics/ozone.py

@@ -215,7 +215,8 @@ class O3PolarCapTimeseriesSH(ESMValToolDiagnostic):
             dimensions={"variable_id": "toz", "statistic": "Southern Hemisphere October polar mean"},
         ),
     )
-    # dim0=0 is the model, dim0=1 contains the observational reference data.
+    # NOTE: ESMValTool sorts the datasets in the file by label, so the selector `dim0: 0` might be
+    #       incorrect if models or observations with different names are used. (~fh)
     series = (
         SeriesDefinition(
             file_pattern="work/polar_cap_time_series_SH/plot/timeseries_toz_SH_Oct.nc",
@@ -261,7 +262,8 @@ class O3PolarCapTimeseriesNH(ESMValToolDiagnostic):
             dimensions={"variable_id": "toz", "statistic": "Northern Hemisphere March polar mean"},
         ),
     )
-    # dim0=0 is the model, dim0=1 contains the observational reference data.
+    # NOTE: ESMValTool sorts the datasets in the file by label, so the selector `dim0: 0` might be
+    #       incorrect if models or observations with different names are used. (~fh)
     series = (
         SeriesDefinition(
             file_pattern="work/polar_cap_time_series_NH/plot/timeseries_toz_NH_MAR.nc",

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/src/climate_ref_esmvaltool/diagnostics/regional_historical_changes.py

@@ -296,7 +296,7 @@ class RegionalHistoricalAnnualCycle(ESMValToolDiagnostic):
     series = tuple(
         SeriesDefinition(
             file_pattern=f"work/{diag_name}/figures/annual_cycle_*_{_region_to_filename(region)}.nc",
-            sel={"dim0": 0},  # Select the model and not the observation.
+            sel={"dim0": 0},  # Each file holds a single dataset (its label is in the filename).
             dimensions={
                 "region": region,
                 "variable_id": var_name,

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_basic.py

@@ -88,7 +88,7 @@ class SeaIceAreaBasic(ESMValToolDiagnostic):
     name = "Sea ice area basic"
     slug = "sea-ice-area-basic"
     base_recipe = "ref/recipe_ref_sea_ice_area_basic.yml"
-    version = 3
+    version = 4
 
     data_requirements = (
         (
@@ -167,7 +167,7 @@ class SeaIceAreaBasic(ESMValToolDiagnostic):
     series = tuple(
         SeriesDefinition(
             file_pattern=f"siarea_min/allplots/timeseries_sea_ice_area_{region}_*.nc",
-            sel={"dim0": i},
+            sel={"dataset": "{source_id}" if i == 0 else f"OSI-450-{region}"},
             dimensions=(
                 {
                     "region": REGIONS[region],
@@ -184,7 +184,7 @@ class SeaIceAreaBasic(ESMValToolDiagnostic):
     ) + tuple(
         SeriesDefinition(
             file_pattern=f"siarea_seas/allplots/annual_cycle_sea_ice_area_{region}_*.nc",
-            sel={"dim0": i},
+            sel={"dataset": "{source_id}" if i == 0 else f"OSI-450-{region}"},
             dimensions=(
                 {
                     "region": REGIONS[region],

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/tests/test-data/climate-drivers-for-fire/cmip7/catalog.yaml

@@ -40,7 +40,7 @@ cmip7:
     start_time: null
     time_range: null
     time_units: null
-    tracking_id: hdl:21.14107/4e1fbecd-9e5a-4a08-8030-2df83bfdcbe5
+    tracking_id: hdl:21.14107/7e670807-0c52-5bbf-a4e6-864c9f5ed56a
     units: '%'
     variable_id: sftlf
     variant_label: r1i1p1f1
@@ -77,7 +77,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/205caa4d-8ee1-4b82-b561-1cf3606a0c42
+    tracking_id: hdl:21.14107/6fcb87b7-5ed1-5966-a3b7-3c708705a0c8
     units: kg m-2
     variable_id: cVeg
     variant_label: r1i1p1f1
@@ -114,7 +114,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/2aba34c8-068e-4f1c-a2dd-8af016590c95
+    tracking_id: hdl:21.14107/34623f39-f98c-5e47-b8e2-c97ab808c819
     units: '%'
     variable_id: hurs
     variant_label: r1i1p1f1
@@ -151,7 +151,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/e9170667-b4c8-4270-bc61-2f46e20dd066
+    tracking_id: hdl:21.14107/3c75e2d4-53b8-52a0-bb67-4516eb98abcd
     units: kg m-2 s-1
     variable_id: pr
     variant_label: r1i1p1f1
@@ -188,7 +188,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/f16678cf-7c71-44f5-a4a0-9dddcffbe6ae
+    tracking_id: hdl:21.14107/411a95cf-d2ab-54ba-ba4b-2a001255fe08
     units: K
     variable_id: tas
     variant_label: r1i1p1f1
@@ -225,7 +225,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/61d96892-9dbf-4578-8ede-79608d2c3549
+    tracking_id: hdl:21.14107/41556725-f176-55a5-9ef6-290ac555181c
     units: K
     variable_id: tas
     variant_label: r1i1p1f1
@@ -262,7 +262,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/d418d226-f1e1-46c9-b52a-0100e548f4cc
+    tracking_id: hdl:21.14107/ff82294a-763a-5c48-a133-643e3efa0352
     units: '%'
     variable_id: treeFrac
     variant_label: r1i1p1f1
@@ -299,7 +299,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/078af338-f371-4068-a33f-f87e07784d04
+    tracking_id: hdl:21.14107/d4001d69-5deb-5c76-b3c2-97c02df860fb
     units: '%'
     variable_id: vegFrac
     variant_label: r1i1p1f1

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/tests/test-data/cloud-radiative-effects/cmip6/catalog.yaml

@@ -1,5 +1,5 @@
 _metadata:
-  hash: ee38a53200d5918181c4d08ecd0e705d07eee395
+  hash: bd917c04caafa885084f45d63bbf993e8a91fbba
 cmip6:
   slug_column: instance_id
   selector:
@@ -220,7 +220,7 @@ obs4mips:
     frequency: mon
     grid: 1x1 degree latitude x longitude
     grid_label: gn
-    instance_id: obs4MIPs.obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rlut.100km.gn.v20260220
+    instance_id: obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rlut.gn.v20260220
     institution_id: NASA-LaRC
     long_name: TOA Outgoing Longwave Radiation
     nominal_resolution: 100 km
@@ -243,7 +243,7 @@ obs4mips:
     frequency: mon
     grid: 1x1 degree latitude x longitude
     grid_label: gn
-    instance_id: obs4MIPs.obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rlutcs.100km.gn.v20260220
+    instance_id: obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rlutcs.gn.v20260220
     institution_id: NASA-LaRC
     long_name: TOA Outgoing Clear-Sky Longwave Radiation
     nominal_resolution: 100 km
@@ -266,7 +266,7 @@ obs4mips:
     frequency: mon
     grid: 1x1 degree latitude x longitude
     grid_label: gn
-    instance_id: obs4MIPs.obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rsut.100km.gn.v20260220
+    instance_id: obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rsut.gn.v20260220
     institution_id: NASA-LaRC
     long_name: TOA Outgoing Shortwave Radiation
     nominal_resolution: 100 km
@@ -289,7 +289,7 @@ obs4mips:
     frequency: mon
     grid: 1x1 degree latitude x longitude
     grid_label: gn
-    instance_id: obs4MIPs.obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rsutcs.100km.gn.v20260220
+    instance_id: obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rsutcs.gn.v20260220
     institution_id: NASA-LaRC
     long_name: TOA Outgoing Clear-Sky Shortwave Radiation
     nominal_resolution: 100 km

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/tests/test-data/cloud-radiative-effects/cmip6/manifest.json

@@ -1,11 +1,11 @@
 {
-  "catalog_hash": "ee38a53200d5918181c4d08ecd0e705d07eee395",
+  "catalog_hash": "bd917c04caafa885084f45d63bbf993e8a91fbba",
   "committed": {
     "diagnostic.json": "183d82f3963ad19b5a556b8025e6990c444f292adda1d464e12136d05a5ef3b3",
     "output.json": "65ffee1ccf2e0f8f5650eb34ae6518882d70becef18e72dd1febb17abc1d5ab3",
     "series.json": "d43a041a4ad5416d93ea4dfb7db4f08367c2ed1fd982479af8da471c656fefb1"
   },
-  "diagnostic_version": 3,
+  "diagnostic_version": 4,
   "native": {
     "diagnostic.json": {
       "sha256": "e52b1e19e1ed5a2a046bb8aa01c004240305fabfe69c4ffb4e64898b1b6bbb84",

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/tests/test-data/cloud-radiative-effects/cmip7/catalog.yaml

@@ -1,5 +1,5 @@
 _metadata:
-  hash: 4c892beef7c743466cc65f8db266693e3cff6709
+  hash: 5d05f2a126e7bf78659b396273a1627075d7c4ab
 cmip7:
   slug_column: instance_id
   selector:
@@ -40,7 +40,7 @@ cmip7:
     start_time: null
     time_range: null
     time_units: null
-    tracking_id: hdl:21.14107/ebb116c7-0fab-433c-a2b3-e7d2da903dfc
+    tracking_id: hdl:21.14107/8b9da458-1850-57fc-8a5a-70a91d8f6504
     units: m2
     variable_id: areacella
     variant_label: r1i1p1f1
@@ -77,7 +77,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/de2f0e87-514f-45aa-afb0-d24bc0997814
+    tracking_id: hdl:21.14107/4260ea00-78d5-53ad-8f4a-6c6b53f3a934
     units: W m-2
     variable_id: rlut
     variant_label: r1i1p1f1
@@ -114,7 +114,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/ab10226c-19d6-4f61-8c48-de7e8f7f988d
+    tracking_id: hdl:21.14107/cadbc379-930c-59cf-a636-4fdddc2c5438
     units: W m-2
     variable_id: rlutcs
     variant_label: r1i1p1f1
@@ -151,7 +151,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/7123fd2a-cbc1-434a-9d39-b3c82a6a1dd2
+    tracking_id: hdl:21.14107/2e2cc5b2-8df6-571d-b0dd-32650ded8e6e
     units: W m-2
     variable_id: rsut
     variant_label: r1i1p1f1
@@ -188,7 +188,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2021-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/6fdbbb9b-0669-4044-852d-9270db623a95
+    tracking_id: hdl:21.14107/2c07ae08-835a-5fc8-acfe-1b34e87d7b2f
     units: W m-2
     variable_id: rsutcs
     variant_label: r1i1p1f1
@@ -205,7 +205,7 @@ obs4mips:
     frequency: mon
     grid: 1x1 degree latitude x longitude
     grid_label: gn
-    instance_id: obs4MIPs.obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rlut.100km.gn.v20260220
+    instance_id: obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rlut.gn.v20260220
     institution_id: NASA-LaRC
     long_name: TOA Outgoing Longwave Radiation
     nominal_resolution: 100 km
@@ -228,7 +228,7 @@ obs4mips:
     frequency: mon
     grid: 1x1 degree latitude x longitude
     grid_label: gn
-    instance_id: obs4MIPs.obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rlutcs.100km.gn.v20260220
+    instance_id: obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rlutcs.gn.v20260220
     institution_id: NASA-LaRC
     long_name: TOA Outgoing Clear-Sky Longwave Radiation
     nominal_resolution: 100 km
@@ -251,7 +251,7 @@ obs4mips:
     frequency: mon
     grid: 1x1 degree latitude x longitude
     grid_label: gn
-    instance_id: obs4MIPs.obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rsut.100km.gn.v20260220
+    instance_id: obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rsut.gn.v20260220
     institution_id: NASA-LaRC
     long_name: TOA Outgoing Shortwave Radiation
     nominal_resolution: 100 km
@@ -274,7 +274,7 @@ obs4mips:
     frequency: mon
     grid: 1x1 degree latitude x longitude
     grid_label: gn
-    instance_id: obs4MIPs.obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rsutcs.100km.gn.v20260220
+    instance_id: obs4MIPs.NASA-LaRC.CERES-EBAF-4-2-1.mon.rsutcs.gn.v20260220
     institution_id: NASA-LaRC
     long_name: TOA Outgoing Clear-Sky Shortwave Radiation
     nominal_resolution: 100 km

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/tests/test-data/cloud-radiative-effects/cmip7/manifest.json

@@ -1,11 +1,11 @@
 {
-  "catalog_hash": "4c892beef7c743466cc65f8db266693e3cff6709",
+  "catalog_hash": "5d05f2a126e7bf78659b396273a1627075d7c4ab",
   "committed": {
     "diagnostic.json": "183d82f3963ad19b5a556b8025e6990c444f292adda1d464e12136d05a5ef3b3",
     "output.json": "097d07332e39889ab51b9c55a9f03e4d3dc6a442a7f1693aa15d59bba50d7086",
     "series.json": "463e4c60dde5c2f73aabe0c1b3fc2876e44e9cdfa9990e6b3bc3ef06cca3d299"
   },
-  "diagnostic_version": 3,
+  "diagnostic_version": 4,
   "native": {
     "diagnostic.json": {
       "sha256": "e52b1e19e1ed5a2a046bb8aa01c004240305fabfe69c4ffb4e64898b1b6bbb84",

climate_ref_esmvaltool-0.19.0/tests/test-data/cloud-scatterplots-cli-ta/cmip7/catalog.yaml

@@ -0,0 +1,122 @@
+_metadata:
+  hash: 45de2b70ae7747123e6b18a71ed90507bb4b3d54
+cmip7:
+  slug_column: instance_id
+  selector:
+    experiment_id: historical
+    frequency: mon
+    grid_label: gn
+    source_id: CESM2
+    variant_label: r1i1p1f1
+  datasets:
+  - activity_id: CMIP
+    branch_time_in_child: 674885.0
+    branch_time_in_parent: 219000.0
+    branded_variable: areacella_ti-u-hxy-u
+    branding_suffix: ti-u-hxy-u
+    calendar: null
+    end_time: null
+    experiment_id: historical
+    external_variables: null
+    filename: areacella_ti-u-hxy-u_fx_glb_gn_CESM2_historical_r1i1p1f1.nc
+    finalised: true
+    frequency: fx
+    grid_label: gn
+    instance_id: CMIP7.CMIP.NCAR.CESM2.historical.r1i1p1f1.glb.fx.areacella.ti-u-hxy-u.gn.v0
+    institution_id: NCAR
+    license_id: CC-BY-4.0
+    long_name: Grid-Cell Area for Atmospheric Grid Variables
+    mip_era: CMIP7
+    nominal_resolution: 100 km
+    parent_activity_id: CMIP
+    parent_experiment_id: piControl
+    parent_mip_era: CMIP6
+    parent_source_id: CESM2
+    parent_time_units: days since 0001-01-01 00:00:00
+    parent_variant_label: r1i1p1f1
+    realm: atmos land
+    region: glb
+    source_id: CESM2
+    standard_name: cell_area
+    start_time: null
+    time_range: null
+    time_units: null
+    tracking_id: hdl:21.14107/2f03864c-763b-56fa-85d5-127d1a4c15c0
+    units: m2
+    variable_id: areacella
+    variant_label: r1i1p1f1
+    version: v0
+  - activity_id: CMIP
+    branch_time_in_child: 674885.0
+    branch_time_in_parent: 219000.0
+    branded_variable: cli_tavg-al-hxy-u
+    branding_suffix: tavg-al-hxy-u
+    calendar: noleap
+    end_time: '2014-12-15 12:00:00'
+    experiment_id: historical
+    external_variables: areacella
+    filename: cli_tavg-al-hxy-u_mon_glb_gn_CESM2_historical_r1i1p1f1_185001-201412.nc
+    finalised: true
+    frequency: mon
+    grid_label: gn
+    instance_id: CMIP7.CMIP.NCAR.CESM2.historical.r1i1p1f1.glb.mon.cli.tavg-al-hxy-u.gn.v0
+    institution_id: NCAR
+    license_id: CC-BY-4.0
+    long_name: Mass Fraction of Cloud Ice
+    mip_era: CMIP7
+    nominal_resolution: 100 km
+    parent_activity_id: CMIP
+    parent_experiment_id: piControl
+    parent_mip_era: CMIP6
+    parent_source_id: CESM2
+    parent_time_units: days since 0001-01-01 00:00:00
+    parent_variant_label: r1i1p1f1
+    realm: atmos
+    region: glb
+    source_id: CESM2
+    standard_name: mass_fraction_of_cloud_ice_in_air
+    start_time: '1850-01-15 12:00:00'
+    time_range: 1850-01-15 12:00:00-2014-12-15 12:00:00
+    time_units: days since 0001-01-01
+    tracking_id: hdl:21.14107/e684837f-eefe-5ee7-92ae-9b131097925b
+    units: kg kg-1
+    variable_id: cli
+    variant_label: r1i1p1f1
+    version: v0
+  - activity_id: CMIP
+    branch_time_in_child: 674885.0
+    branch_time_in_parent: 219000.0
+    branded_variable: ta_tavg-p19-hxy-air
+    branding_suffix: tavg-p19-hxy-air
+    calendar: noleap
+    end_time: '2014-12-15 12:00:00'
+    experiment_id: historical
+    external_variables: areacella
+    filename: ta_tavg-p19-hxy-air_mon_glb_gn_CESM2_historical_r1i1p1f1_185001-201412.nc
+    finalised: true
+    frequency: mon
+    grid_label: gn
+    instance_id: CMIP7.CMIP.NCAR.CESM2.historical.r1i1p1f1.glb.mon.ta.tavg-p19-hxy-air.gn.v0
+    institution_id: NCAR
+    license_id: CC-BY-4.0
+    long_name: Air Temperature
+    mip_era: CMIP7
+    nominal_resolution: 100 km
+    parent_activity_id: CMIP
+    parent_experiment_id: piControl
+    parent_mip_era: CMIP6
+    parent_source_id: CESM2
+    parent_time_units: days since 0001-01-01 00:00:00
+    parent_variant_label: r1i1p1f1
+    realm: atmos
+    region: glb
+    source_id: CESM2
+    standard_name: air_temperature
+    start_time: '1850-01-15 12:00:00'
+    time_range: 1850-01-15 12:00:00-2014-12-15 12:00:00
+    time_units: days since 0001-01-01
+    tracking_id: hdl:21.14107/c06e0b27-0e35-5304-99db-a8291111ee5e
+    units: K
+    variable_id: ta
+    variant_label: r1i1p1f1
+    version: v0

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/tests/test-data/cloud-scatterplots-clivi-lwcre/cmip7/catalog.yaml

@@ -41,7 +41,7 @@ cmip7:
     start_time: null
     time_range: null
     time_units: null
-    tracking_id: hdl:21.14107/3b2dd0bb-aef7-437c-8147-5b47446cf48c
+    tracking_id: hdl:21.14107/8b9da458-1850-57fc-8a5a-70a91d8f6504
     units: m2
     variable_id: areacella
     variant_label: r1i1p1f1
@@ -78,7 +78,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/d0357733-40bc-496c-82b3-1c6823b03fd6
+    tracking_id: hdl:21.14107/8c17f0a7-b613-5153-b849-838c101a3f58
     units: kg m-2
     variable_id: clivi
     variant_label: r1i1p1f1
@@ -115,7 +115,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/84b2dda9-32f0-409a-9f3e-34055bf6b66b
+    tracking_id: hdl:21.14107/f561024a-193a-5426-817d-5eeea8d364b2
     units: W m-2
     variable_id: rlut
     variant_label: r1i1p1f1
@@ -152,7 +152,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/8b1110d4-e986-412e-a07d-b5055c52215c
+    tracking_id: hdl:21.14107/ed8516c8-1e00-528c-86ea-a710ebcf1592
     units: W m-2
     variable_id: rlutcs
     variant_label: r1i1p1f1

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/tests/test-data/cloud-scatterplots-clt-swcre/cmip7/catalog.yaml

@@ -41,7 +41,7 @@ cmip7:
     start_time: null
     time_range: null
     time_units: null
-    tracking_id: hdl:21.14107/3b2dd0bb-aef7-437c-8147-5b47446cf48c
+    tracking_id: hdl:21.14107/8b9da458-1850-57fc-8a5a-70a91d8f6504
     units: m2
     variable_id: areacella
     variant_label: r1i1p1f1
@@ -78,7 +78,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/ef2aa820-81cf-4e65-b455-d4040a0999fd
+    tracking_id: hdl:21.14107/edab93ae-be1d-5b8e-bd02-f9733b47196a
     units: '%'
     variable_id: clt
     variant_label: r1i1p1f1
@@ -115,7 +115,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/17fe1229-0320-40eb-9c98-8d5770d42c59
+    tracking_id: hdl:21.14107/1a3abc41-a50e-570e-bf5f-e85334adcc38
     units: W m-2
     variable_id: rsut
     variant_label: r1i1p1f1
@@ -152,7 +152,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/c769ffec-3d7e-4160-9d84-f31d6d3354be
+    tracking_id: hdl:21.14107/3872833d-e877-514f-800d-acec87ea2f2c
     units: W m-2
     variable_id: rsutcs
     variant_label: r1i1p1f1

{climate_ref_esmvaltool-0.18.2 → climate_ref_esmvaltool-0.19.0}/tests/test-data/cloud-scatterplots-clwvi-pr/cmip7/catalog.yaml

@@ -41,7 +41,7 @@ cmip7:
     start_time: null
     time_range: null
     time_units: null
-    tracking_id: hdl:21.14107/3b2dd0bb-aef7-437c-8147-5b47446cf48c
+    tracking_id: hdl:21.14107/8b9da458-1850-57fc-8a5a-70a91d8f6504
     units: m2
     variable_id: areacella
     variant_label: r1i1p1f1
@@ -78,7 +78,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/4b9ee044-5b63-4a67-99cb-26d9690ee0e0
+    tracking_id: hdl:21.14107/9320548c-6703-5d66-bbba-dd447371869f
     units: kg m-2
     variable_id: clwvi
     variant_label: r1i1p1f1
@@ -115,7 +115,7 @@ cmip7:
     start_time: '1850-01-16 12:00:00'
     time_range: 1850-01-16 12:00:00-2014-12-16 12:00:00
     time_units: days since 1850-01-01
-    tracking_id: hdl:21.14107/f8ed8043-a5d4-4d41-a798-cc7d01ef73e7
+    tracking_id: hdl:21.14107/e6d7b3f2-6f81-51bd-9ce4-fe222794f5fe
     units: kg m-2 s-1
     variable_id: pr
     variant_label: r1i1p1f1