Skip to content

Accept esm-hist alongside historical in diagnostic data requirements #893

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

Draft
lewisjared wants to merge 2 commits into
base: pmp-fix
Choose a base branch
from
Draft

Accept esm-hist alongside historical in diagnostic data requirements #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
439c4cd
Accept esm-hist alongside historical in diagnostic data requirements
lewisjared Sep 2, 2026
09a188a
Add changelog fragment
lewisjared Sep 2, 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/893.feature.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Accepts esm-hist alongside historical in diagnostic data requirements.
10 changes: 5 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 @@ -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",
}
),
Expand Down Expand Up @@ -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",
}
Expand All @@ -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",
}
Expand Down
4 changes: 2 additions & 2 deletions .../climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_radiative_effects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class CloudRadiativeEffects(ESMValToolDiagnostic):
FacetFilter(
facets={
"variable_id": variables,
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"table_id": "Amon",
}
),
Expand Down Expand Up @@ -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",
}
Expand Down
4 changes: 2 additions & 2 deletions packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/cloud_scatterplots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand All @@ -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",
},
),
Expand Down
12 changes: 6 additions & 6 deletions packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/enso.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
),
Expand Down Expand Up @@ -75,15 +75,15 @@ 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",
},
),
FacetFilter(
facets={
"branded_variable": "tos_tavg-u-hxy-sea",
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"frequency": "mon",
"region": "glb",
},
Expand Down Expand Up @@ -310,7 +310,7 @@ class ENSOCharacteristics(ESMValToolDiagnostic):
FacetFilter(
facets={
"variable_id": "tos",
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"table_id": "Omon",
},
),
Expand All @@ -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",
},
Expand Down
6 changes: 3 additions & 3 deletions packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/ozone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
FacetFilter(
facets={
"variable_id": "toz",
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"table_id": "AERmon",
},
),
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -307,7 +307,7 @@ class O3ZonalMeanProfiles(ESMValToolDiagnostic):
FacetFilter(
facets={
"variable_id": "o3",
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"table_id": "Amon",
},
),
Expand Down
12 changes: 6 additions & 6 deletions ...mate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/regional_historical_changes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class RegionalHistoricalAnnualCycle(ESMValToolDiagnostic):
FacetFilter(
facets={
"variable_id": variables,
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"table_id": "Amon",
},
),
Expand Down Expand Up @@ -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",
},
),
Expand Down Expand Up @@ -415,7 +415,7 @@ class RegionalHistoricalTimeSeries(RegionalHistoricalAnnualCycle):
FacetFilter(
facets={
"variable_id": variables,
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"table_id": "Amon",
},
),
Expand Down Expand Up @@ -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",
},
Expand Down Expand Up @@ -671,7 +671,7 @@ class RegionalHistoricalTrend(ESMValToolDiagnostic):
FacetFilter(
facets={
"variable_id": variables,
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"table_id": "Amon",
},
),
Expand Down Expand Up @@ -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",
},
),
Expand Down
4 changes: 2 additions & 2 deletions packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_area_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class SeaIceAreaBasic(ESMValToolDiagnostic):
FacetFilter(
facets={
"variable_id": "siconc",
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"table_id": "SImon",
},
),
Expand All @@ -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",
},
Expand Down
8 changes: 4 additions & 4 deletions ...ages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/diagnostics/sea_ice_sensitivity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
),
Expand Down Expand Up @@ -83,15 +83,15 @@ class SeaIceSensitivity(ESMValToolDiagnostic):
FacetFilter(
facets={
"branded_variable": "siconc_tavg-u-hxy-u",
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"frequency": "mon",
"region": "glb",
},
),
FacetFilter(
facets={
"branded_variable": "tas_tavg-h2m-hxy-u",
"experiment_id": "historical",
"experiment_id": ("historical", "esm-hist"),
"frequency": "mon",
"region": "glb",
},
Expand Down
4 changes: 2 additions & 2 deletions packages/climate-ref-example/src/climate_ref_example/surface_temperature.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ class GlobalMeanSurfaceTemperatureBias(Diagnostic):
FacetFilter(
facets={
"variable_id": (_MODEL_VARIABLE,),
"experiment_id": ("historical",),
"experiment_id": ("historical", "esm-hist"),
}
),
),
Expand All @@ -358,7 +358,7 @@ class GlobalMeanSurfaceTemperatureBias(Diagnostic):
FacetFilter(
facets={
"variable_id": (_MODEL_VARIABLE,),
"experiment_id": ("historical",),
"experiment_id": ("historical", "esm-hist"),
}
),
),
Expand Down
4 changes: 2 additions & 2 deletions packages/climate-ref-ilamb/src/climate_ref_ilamb/standard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"),
Expand Down
4 changes: 2 additions & 2 deletions packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/annual_cycle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,),
}
),
Expand All @@ -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",
}
Expand Down
6 changes: 4 additions & 2 deletions packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/enso.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions packages/climate-ref-pmp/src/climate_ref_pmp/diagnostics/variability_modes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
)
Expand All @@ -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",
}
Expand Down
Loading