From 71abe7639d113bcf2d39e7a9a64ddda6b1e25235 Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Wed, 2 Sep 2026 12:28:54 +1000 Subject: [PATCH 1/3] Accept esm-hist alongside historical in diagnostic data requirements --- .../diagnostics/climate_drivers_for_fire.py | 10 +++++----- .../diagnostics/cloud_radiative_effects.py | 4 ++-- .../diagnostics/cloud_scatterplots.py | 4 ++-- .../src/climate_ref_esmvaltool/diagnostics/enso.py | 12 ++++++------ .../src/climate_ref_esmvaltool/diagnostics/ozone.py | 6 +++--- .../diagnostics/regional_historical_changes.py | 12 ++++++------ .../diagnostics/sea_ice_area_basic.py | 4 ++-- .../diagnostics/sea_ice_sensitivity.py | 8 ++++---- .../src/climate_ref_example/surface_temperature.py | 4 ++-- .../src/climate_ref_ilamb/standard.py | 4 ++-- .../src/climate_ref_pmp/diagnostics/annual_cycle.py | 4 ++-- .../src/climate_ref_pmp/diagnostics/enso.py | 6 ++++-- .../climate_ref_pmp/diagnostics/variability_modes.py | 4 ++-- 13 files changed, 42 insertions(+), 40 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 5950944b0..79519adae 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 @@ -34,21 +34,21 @@ class ClimateDriversForFire(ESMValToolDiagnostic): FacetFilter( { "variable_id": ("hurs", "pr", "tas", "tasmax"), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", } ), FacetFilter( { "variable_id": ("cVeg", "treeFrac"), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Lmon", } ), FacetFilter( { "variable_id": "vegFrac", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Emon", } ), @@ -89,7 +89,7 @@ class ClimateDriversForFire(ESMValToolDiagnostic): "tas_tavg-h2m-hxy-u", "tas_tmaxavg-h2m-hxy-u", ), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", } @@ -101,7 +101,7 @@ class ClimateDriversForFire(ESMValToolDiagnostic): "treeFrac_tavg-u-hxy-u", "vegFrac_tavg-u-hxy-u", ), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", } diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_radiative_effects.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_radiative_effects.py index 19fffb53f..24baeb97a 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_radiative_effects.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_radiative_effects.py @@ -77,7 +77,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic): FacetFilter( facets={ "variable_id": variables, - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", } ), @@ -108,7 +108,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic): "rsut_tavg-u-hxy-u", "rsutcs_tavg-u-hxy-u", ), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", } diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_scatterplots.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_scatterplots.py index 9ab494013..8bf767a8c 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_scatterplots.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_scatterplots.py @@ -25,7 +25,7 @@ def get_cmip_data_requirements( ) -> tuple[tuple[DataRequirement, ...], ...]: """Create data requirements for CMIP6 and CMIP7 data.""" cmip7_facets: dict[str, str | Collection[str]] = { - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", } @@ -39,7 +39,7 @@ def get_cmip_data_requirements( FacetFilter( facets={ "variable_id": variables, - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", }, ), diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/enso.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/enso.py index ce4e04d88..59eba38a9 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/enso.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/enso.py @@ -38,14 +38,14 @@ class ENSOBasicClimatology(ESMValToolDiagnostic): FacetFilter( facets={ "variable_id": ("pr", "tauu"), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", }, ), FacetFilter( facets={ "variable_id": "tos", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Omon", }, ), @@ -75,7 +75,7 @@ class ENSOBasicClimatology(ESMValToolDiagnostic): "pr_tavg-u-hxy-u", "tauu_tavg-u-hxy-u", ), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", }, @@ -83,7 +83,7 @@ class ENSOBasicClimatology(ESMValToolDiagnostic): FacetFilter( facets={ "branded_variable": "tos_tavg-u-hxy-sea", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", }, @@ -310,7 +310,7 @@ class ENSOCharacteristics(ESMValToolDiagnostic): FacetFilter( facets={ "variable_id": "tos", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Omon", }, ), @@ -331,7 +331,7 @@ class ENSOCharacteristics(ESMValToolDiagnostic): FacetFilter( facets={ "branded_variable": "tos_tavg-u-hxy-sea", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", }, diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/ozone.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/ozone.py index 0af1850f3..7ea4268f4 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/ozone.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/ozone.py @@ -33,7 +33,7 @@ FacetFilter( facets={ "variable_id": "toz", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "AERmon", }, ), @@ -69,7 +69,7 @@ FacetFilter( facets={ "variable_id": "toz", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "branded_variable": "toz_tavg-u-hxy-u", "frequency": "mon", "region": "glb", @@ -307,7 +307,7 @@ class O3ZonalMeanProfiles(ESMValToolDiagnostic): FacetFilter( facets={ "variable_id": "o3", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", }, ), diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/regional_historical_changes.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/regional_historical_changes.py index 2b8cb678d..09fe9b43d 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/regional_historical_changes.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/regional_historical_changes.py @@ -130,7 +130,7 @@ class RegionalHistoricalAnnualCycle(ESMValToolDiagnostic): FacetFilter( facets={ "variable_id": variables, - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", }, ), @@ -159,7 +159,7 @@ class RegionalHistoricalAnnualCycle(ESMValToolDiagnostic): "tas_tavg-h2m-hxy-u", "ua_tavg-p19-hxy-air", ), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", }, ), @@ -415,7 +415,7 @@ class RegionalHistoricalTimeSeries(RegionalHistoricalAnnualCycle): FacetFilter( facets={ "variable_id": variables, - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", }, ), @@ -444,7 +444,7 @@ class RegionalHistoricalTimeSeries(RegionalHistoricalAnnualCycle): "tas_tavg-h2m-hxy-u", "ua_tavg-p19-hxy-air", ), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", }, @@ -671,7 +671,7 @@ class RegionalHistoricalTrend(ESMValToolDiagnostic): FacetFilter( facets={ "variable_id": variables, - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", }, ), @@ -700,7 +700,7 @@ class RegionalHistoricalTrend(ESMValToolDiagnostic): "tas_tavg-h2m-hxy-u", "ua_tavg-p19-hxy-air", ), - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", }, ), diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_basic.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_basic.py index c6d35500f..4fec70d97 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_basic.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_basic.py @@ -98,7 +98,7 @@ class SeaIceAreaBasic(ESMValToolDiagnostic): FacetFilter( facets={ "variable_id": "siconc", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "SImon", }, ), @@ -123,7 +123,7 @@ class SeaIceAreaBasic(ESMValToolDiagnostic): FacetFilter( facets={ "branded_variable": "siconc_tavg-u-hxy-u", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", }, diff --git a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_sensitivity.py b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_sensitivity.py index fd2c0f1de..80b6c614d 100644 --- a/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_sensitivity.py +++ b/packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_sensitivity.py @@ -39,14 +39,14 @@ class SeaIceSensitivity(ESMValToolDiagnostic): FacetFilter( facets={ "variable_id": "siconc", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "SImon", }, ), FacetFilter( facets={ "variable_id": "tas", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "table_id": "Amon", }, ), @@ -83,7 +83,7 @@ class SeaIceSensitivity(ESMValToolDiagnostic): FacetFilter( facets={ "branded_variable": "siconc_tavg-u-hxy-u", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", }, @@ -91,7 +91,7 @@ class SeaIceSensitivity(ESMValToolDiagnostic): FacetFilter( facets={ "branded_variable": "tas_tavg-h2m-hxy-u", - "experiment_id": "historical", + "experiment_id": ("historical", "esm-hist"), "frequency": "mon", "region": "glb", }, diff --git a/packages/climate-ref-example/src/climate_ref_example/surface_temperature.py b/packages/climate-ref-example/src/climate_ref_example/surface_temperature.py index d3e202608..08394c4f6 100644 --- a/packages/climate-ref-example/src/climate_ref_example/surface_temperature.py +++ b/packages/climate-ref-example/src/climate_ref_example/surface_temperature.py @@ -338,7 +338,7 @@ class GlobalMeanSurfaceTemperatureBias(Diagnostic): FacetFilter( facets={ "variable_id": (_MODEL_VARIABLE,), - "experiment_id": ("historical",), + "experiment_id": ("historical", "esm-hist"), } ), ), @@ -358,7 +358,7 @@ class GlobalMeanSurfaceTemperatureBias(Diagnostic): FacetFilter( facets={ "variable_id": (_MODEL_VARIABLE,), - "experiment_id": ("historical",), + "experiment_id": ("historical", "esm-hist"), } ), ), diff --git a/packages/climate-ref-ilamb/src/climate_ref_ilamb/standard.py b/packages/climate-ref-ilamb/src/climate_ref_ilamb/standard.py index d6c16b8e4..f20234401 100644 --- a/packages/climate-ref-ilamb/src/climate_ref_ilamb/standard.py +++ b/packages/climate-ref-ilamb/src/climate_ref_ilamb/standard.py @@ -914,7 +914,7 @@ def __init__( # noqa: PLR0915, PLR0912 filters={ "variable_id": all_variable_ids, "frequency": "mon", - "experiment_id": ("historical", "land-hist"), + "experiment_id": ("historical", "esm-hist", "land-hist"), "table_id": ( "AERmonZ", "Amon", @@ -938,7 +938,7 @@ def __init__( # noqa: PLR0915, PLR0912 filters={ "branded_variable": branded_variables, "frequency": "mon", - "experiment_id": ("historical", "land-hist"), + "experiment_id": ("historical", "esm-hist", "land-hist"), "region": "glb", }, group_by=("experiment_id", "source_id", "variant_label", "grid_label"), diff --git a/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py b/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py index 2ca9c0815..11b97ea93 100644 --- a/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py +++ b/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py @@ -82,7 +82,7 @@ def make_data_requirement( FacetFilter( facets={ "frequency": "mon", - "experiment_id": ("amip", "historical", "hist-GHG"), + "experiment_id": ("amip", "historical", "esm-hist", "hist-GHG"), "variable_id": (variable_id,), } ), @@ -92,7 +92,7 @@ def make_data_requirement( FacetFilter( facets={ "branded_variable": (_BRANDED_VARIABLE_NAMES[variable_id],), - "experiment_id": ("amip", "historical", "hist-GHG"), + "experiment_id": ("amip", "historical", "esm-hist", "hist-GHG"), "frequency": "mon", "region": "glb", } diff --git a/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/enso.py b/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/enso.py index 9980e8b80..f46f5f0d9 100644 --- a/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/enso.py +++ b/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/enso.py @@ -56,7 +56,9 @@ class ENSO(CommandLineDiagnostic): "reference_source_id", ) - def __init__(self, metrics_collection: str, experiments: Collection[str] = ("historical",)) -> None: + def __init__( + self, metrics_collection: str, experiments: Collection[str] = ("historical", "esm-hist") + ) -> None: self.name = metrics_collection self.slug = metrics_collection.lower() self.metrics_collection = metrics_collection @@ -193,7 +195,7 @@ def __init__(self, metrics_collection: str, experiments: Collection[str] = ("his def _get_data_requirements( self, - experiments: Collection[str] = ("historical",), + experiments: Collection[str] = ("historical", "esm-hist"), ) -> tuple[tuple[DataRequirement, DataRequirement], ...]: cmip6_filters = [ FacetFilter( diff --git a/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/variability_modes.py b/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/variability_modes.py index 37dbb6d66..48278baba 100644 --- a/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/variability_modes.py +++ b/packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/variability_modes.py @@ -71,7 +71,7 @@ def _get_data_requirements( FacetFilter( facets={ "frequency": "mon", - "experiment_id": ("historical", "hist-GHG", *extra_experiments), + "experiment_id": ("historical", "esm-hist", "hist-GHG", *extra_experiments), "variable_id": model_variable, } ) @@ -81,7 +81,7 @@ def _get_data_requirements( FacetFilter( facets={ "branded_variable": (_BRANDED_VARIABLE_NAMES[model_variable],), - "experiment_id": ("historical", "hist-GHG", *extra_experiments), + "experiment_id": ("historical", "esm-hist", "hist-GHG", *extra_experiments), "frequency": "mon", "region": "glb", } From 3d953713ece85feb6db7bb03613b960e1bf0aec0 Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Wed, 2 Sep 2026 12:29:15 +1000 Subject: [PATCH 2/3] Add changelog fragment --- changelog/893.feature.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/893.feature.md diff --git a/changelog/893.feature.md b/changelog/893.feature.md new file mode 100644 index 000000000..a42578118 --- /dev/null +++ b/changelog/893.feature.md @@ -0,0 +1 @@ +Accepts esm-hist alongside historical in diagnostic data requirements. From 74352d47f4e616a34a6e848445faf86ee7c05426 Mon Sep 17 00:00:00 2001 From: Jared Lewis Date: Fri, 4 Sep 2026 15:35:42 +1000 Subject: [PATCH 3/3] Regenerate solver and doctor snapshots for esm-hist Adding esm-hist to the experiment filters changes the execution keys and the unsolvable-diagnostics warning text. This updates the two climate-ref snapshots that were missed. --- .../test_diagnose_snapshot_seeded.yml | 12 +++---- .../test_solve_snapshot_all_providers.yml | 32 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/climate-ref/tests/unit/test_doctor/test_diagnose_snapshot_seeded.yml b/packages/climate-ref/tests/unit/test_doctor/test_diagnose_snapshot_seeded.yml index 224b82152..43b394a70 100644 --- a/packages/climate-ref/tests/unit/test_doctor/test_diagnose_snapshot_seeded.yml +++ b/packages/climate-ref/tests/unit/test_doctor/test_diagnose_snapshot_seeded.yml @@ -107,17 +107,17 @@ summary: HadISST-1-1 is carried by 2 registries - check: unsolvable-diagnostics command: '' - detail: 'Unmet: no cmip6 datasets match experiment_id=historical, table_id=Amon, - variable_id=hurs|pr|tas|tasmax and experiment_id=historical, table_id=Lmon, variable_id=cVeg|treeFrac - and experiment_id=historical, table_id=Emon, variable_id=vegFrac. nothing is ingested - as cmip7.' + detail: 'Unmet: no cmip6 datasets match experiment_id=historical|esm-hist, table_id=Amon, + variable_id=hurs|pr|tas|tasmax and experiment_id=historical|esm-hist, table_id=Lmon, + variable_id=cVeg|treeFrac and experiment_id=historical|esm-hist, table_id=Emon, + variable_id=vegFrac. nothing is ingested as cmip7.' remedy: Ingest the data the unmet requirement names, then run the solver again. severity: warning summary: esmvaltool/climate-drivers-for-fire has no executions - check: unsolvable-diagnostics command: '' - detail: 'Unmet: no cmip6 datasets match experiment_id=historical|land-hist, frequency=mon, - table_id=AERmonZ|Amon|CFmon|Emon|EmonZ|LImon|Lmon|Omon|SImon, variable_id=emp|evspsbl. + detail: 'Unmet: no cmip6 datasets match experiment_id=historical|esm-hist|land-hist, + frequency=mon, table_id=AERmonZ|Amon|CFmon|Emon|EmonZ|LImon|Lmon|Omon|SImon, variable_id=emp|evspsbl. nothing is ingested as cmip7.' remedy: Ingest the data the unmet requirement names, then run the solver again. severity: warning diff --git a/packages/climate-ref/tests/unit/test_solver/test_solve_snapshot_all_providers.yml b/packages/climate-ref/tests/unit/test_solver/test_solve_snapshot_all_providers.yml index 2f7dac014..095808ec7 100644 --- a/packages/climate-ref/tests/unit/test_solver/test_solve_snapshot_all_providers.yml +++ b/packages/climate-ref/tests/unit/test_solver/test_solve_snapshot_all_providers.yml @@ -39,12 +39,12 @@ esmvaltool/cloud-scatterplots-reference/obs4mips_obs4MIPs.obs4MIPs.ECMWF.ERA-5.m - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ta.25km.gn.v20250220 - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ta.25km.gn.v20250220 - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ta.25km.gn.v20250220 -esmvaltool/enso-basic-climatology/cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: +esmvaltool/enso-basic-climatology/cmip6_historical_gn_r1i1p1f1_ACCESS-ESM1-5: SourceDatasetType.CMIP6: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.pr.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tauu.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Omon.tos.gn.v20191115 -esmvaltool/enso-characteristics/cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: +esmvaltool/enso-characteristics/cmip6_historical_gn_r1i1p1f1_ACCESS-ESM1-5: SourceDatasetType.CMIP6: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Ofx.areacello.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Omon.tos.gn.v20191115 @@ -106,30 +106,30 @@ esmvaltool/global-mean-timeseries/cmip6_ssp126_gn_r1i1p1f1_ACCESS-ESM1-5_Amon_ta SourceDatasetType.CMIP6: - CMIP6.ScenarioMIP.CSIRO.ACCESS-ESM1-5.ssp126.r1i1p1f1.Amon.tas.gn.v20210318 - CMIP6.ScenarioMIP.CSIRO.ACCESS-ESM1-5.ssp126.r1i1p1f1.fx.areacella.gn.v20210318 -esmvaltool/ozone-annual-cycle/cmip6_gr_r1i1p1f2_CNRM-ESM2-1__obs4mips_C3S-GTO-ECV-9-0: +esmvaltool/ozone-annual-cycle/cmip6_historical_gr_r1i1p1f2_CNRM-ESM2-1__obs4mips_C3S-GTO-ECV-9-0: SourceDatasetType.CMIP6: - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.AERmon.toz.gr.v20181206 SourceDatasetType.obs4MIPs: - obs4MIPs.obs4MIPs.DLR-BIRA.C3S-GTO-ECV-9-0.mon.toz.1x1degree.gn.v20231115 -esmvaltool/ozone-lat-time/cmip6_gr_r1i1p1f2_CNRM-ESM2-1__obs4mips_C3S-GTO-ECV-9-0: +esmvaltool/ozone-lat-time/cmip6_historical_gr_r1i1p1f2_CNRM-ESM2-1__obs4mips_C3S-GTO-ECV-9-0: SourceDatasetType.CMIP6: - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.AERmon.toz.gr.v20181206 SourceDatasetType.obs4MIPs: - obs4MIPs.obs4MIPs.DLR-BIRA.C3S-GTO-ECV-9-0.mon.toz.1x1degree.gn.v20231115 -esmvaltool/ozone-nh-mar/cmip6_gr_r1i1p1f2_CNRM-ESM2-1__obs4mips_C3S-GTO-ECV-9-0: +esmvaltool/ozone-nh-mar/cmip6_historical_gr_r1i1p1f2_CNRM-ESM2-1__obs4mips_C3S-GTO-ECV-9-0: SourceDatasetType.CMIP6: - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.AERmon.toz.gr.v20181206 SourceDatasetType.obs4MIPs: - obs4MIPs.obs4MIPs.DLR-BIRA.C3S-GTO-ECV-9-0.mon.toz.1x1degree.gn.v20231115 -esmvaltool/ozone-sh-oct/cmip6_gr_r1i1p1f2_CNRM-ESM2-1__obs4mips_C3S-GTO-ECV-9-0: +esmvaltool/ozone-sh-oct/cmip6_historical_gr_r1i1p1f2_CNRM-ESM2-1__obs4mips_C3S-GTO-ECV-9-0: SourceDatasetType.CMIP6: - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.AERmon.toz.gr.v20181206 SourceDatasetType.obs4MIPs: - obs4MIPs.obs4MIPs.DLR-BIRA.C3S-GTO-ECV-9-0.mon.toz.1x1degree.gn.v20231115 -esmvaltool/ozone-zonal/cmip6_gr_r1i1p1f2_CNRM-ESM2-1: +esmvaltool/ozone-zonal/cmip6_historical_gr_r1i1p1f2_CNRM-ESM2-1: SourceDatasetType.CMIP6: - CMIP6.CMIP.CNRM-CERFACS.CNRM-ESM2-1.historical.r1i1p1f2.Amon.o3.gr.v20181206 -esmvaltool/regional-historical-annual-cycle/cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: +esmvaltool/regional-historical-annual-cycle/cmip6_historical_gn_r1i1p1f1_ACCESS-ESM1-5: SourceDatasetType.CMIP6: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.hus.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.pr.gn.v20191115 @@ -137,11 +137,11 @@ esmvaltool/regional-historical-annual-cycle/cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tas.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.ua.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.fx.areacella.gn.v20191115 -esmvaltool/regional-historical-annual-cycle/cmip6_gn_r1i1p1f1_CanESM5: +esmvaltool/regional-historical-annual-cycle/cmip6_historical_gn_r1i1p1f1_CanESM5: SourceDatasetType.CMIP6: - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.fx.areacella.gn.v20190429 -esmvaltool/regional-historical-annual-cycle/cmip6_gn_r1i1p1f3_HadGEM3-GC31-LL: +esmvaltool/regional-historical-annual-cycle/cmip6_historical_gn_r1i1p1f3_HadGEM3-GC31-LL: SourceDatasetType.CMIP6: - CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.historical.r1i1p1f3.Amon.tas.gn.v20190624 - CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.piControl.r1i1p1f1.fx.areacella.gn.v20190709 @@ -217,7 +217,7 @@ esmvaltool/regional-historical-annual-cycle/obs4mips_ERA-5: - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ua.25km.gn.v20250220 - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ua.25km.gn.v20250220 - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ua.25km.gn.v20250220 -esmvaltool/regional-historical-timeseries/cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: +esmvaltool/regional-historical-timeseries/cmip6_historical_gn_r1i1p1f1_ACCESS-ESM1-5: SourceDatasetType.CMIP6: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.hus.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.pr.gn.v20191115 @@ -225,11 +225,11 @@ esmvaltool/regional-historical-timeseries/cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tas.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.ua.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.fx.areacella.gn.v20191115 -esmvaltool/regional-historical-timeseries/cmip6_gn_r1i1p1f1_CanESM5: +esmvaltool/regional-historical-timeseries/cmip6_historical_gn_r1i1p1f1_CanESM5: SourceDatasetType.CMIP6: - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.fx.areacella.gn.v20190429 -esmvaltool/regional-historical-timeseries/cmip6_gn_r1i1p1f3_HadGEM3-GC31-LL: +esmvaltool/regional-historical-timeseries/cmip6_historical_gn_r1i1p1f3_HadGEM3-GC31-LL: SourceDatasetType.CMIP6: - CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.historical.r1i1p1f3.Amon.tas.gn.v20190624 - CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.piControl.r1i1p1f1.fx.areacella.gn.v20190709 @@ -305,7 +305,7 @@ esmvaltool/regional-historical-timeseries/obs4mips_ERA-5: - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ua.25km.gn.v20250220 - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ua.25km.gn.v20250220 - obs4MIPs.obs4MIPs.ECMWF.ERA-5.mon.ua.25km.gn.v20250220 -esmvaltool/regional-historical-trend/cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: +esmvaltool/regional-historical-trend/cmip6_historical_gn_r1i1p1f1_ACCESS-ESM1-5: SourceDatasetType.CMIP6: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.hus.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.pr.gn.v20191115 @@ -313,11 +313,11 @@ esmvaltool/regional-historical-trend/cmip6_gn_r1i1p1f1_ACCESS-ESM1-5: - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.tas.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.Amon.ua.gn.v20191115 - CMIP6.CMIP.CSIRO.ACCESS-ESM1-5.historical.r1i1p1f1.fx.areacella.gn.v20191115 -esmvaltool/regional-historical-trend/cmip6_gn_r1i1p1f1_CanESM5: +esmvaltool/regional-historical-trend/cmip6_historical_gn_r1i1p1f1_CanESM5: SourceDatasetType.CMIP6: - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.Amon.tas.gn.v20190429 - CMIP6.CMIP.CCCma.CanESM5.historical.r1i1p1f1.fx.areacella.gn.v20190429 -esmvaltool/regional-historical-trend/cmip6_gn_r1i1p1f3_HadGEM3-GC31-LL: +esmvaltool/regional-historical-trend/cmip6_historical_gn_r1i1p1f3_HadGEM3-GC31-LL: SourceDatasetType.CMIP6: - CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.historical.r1i1p1f3.Amon.tas.gn.v20190624 - CMIP6.CMIP.MOHC.HadGEM3-GC31-LL.piControl.r1i1p1f1.fx.areacella.gn.v20190709