Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/473.feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added ESMValTool ozone diagnostics.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,36 @@
"description": "CMIP6-to-CMIP7 variable mappings extracted from the CMIP7 Data Request. Filtered to mon/fx tables and variables used by REF providers. Keyed by CMIP6 compound name (table_id.variable_id). Regenerate with: uv run python scripts/extract-data-request-mappings.py "
},
"variables": {
"AERmon.o3": {
"table_id": "AERmon",
"variable_id": "o3",
"cmip6_compound_name": "AERmon.o3",
"cmip7_compound_name": "atmosChem.o3.tavg-al-hxy-u.mon.glb",
"branded_variable": "o3_tavg-al-hxy-u",
"branding_suffix": "tavg-al-hxy-u",
"temporal_label": "tavg",
"vertical_label": "al",
"horizontal_label": "hxy",
"area_label": "u",
"realm": "atmosChem",
"region": "glb",
"frequency": "mon"
},
"AERmon.o3inst": {
"table_id": "AERmon",
"variable_id": "o3",
"cmip6_compound_name": "AERmon.o3inst",
"cmip7_compound_name": "atmosChem.o3.tpt-al-hxy-u.mon.glb",
"branded_variable": "o3_tpt-al-hxy-u",
"branding_suffix": "tpt-al-hxy-u",
"temporal_label": "tpt",
"vertical_label": "al",
"horizontal_label": "hxy",
"area_label": "u",
"realm": "atmosChem aerosol",
"region": "glb",
"frequency": "mon"
},
"AERmon.toz": {
"table_id": "AERmon",
"variable_id": "toz",
Expand Down Expand Up @@ -65,6 +95,21 @@
"region": "glb",
"frequency": "mon"
},
"AERmonZ.o3": {
"table_id": "AERmonZ",
"variable_id": "o3",
"cmip6_compound_name": "AERmonZ.o3",
"cmip7_compound_name": "atmosChem.o3.tavg-p39-hy-air.mon.glb",
"branded_variable": "o3_tavg-p39-hy-air",
"branding_suffix": "tavg-p39-hy-air",
"temporal_label": "tavg",
"vertical_label": "p39",
"horizontal_label": "hy",
"area_label": "air",
"realm": "atmosChem",
"region": "glb",
"frequency": "mon"
},
"AERmonZ.ta": {
"table_id": "AERmonZ",
"variable_id": "ta",
Expand Down Expand Up @@ -395,6 +440,36 @@
"region": "30S-90S",
"frequency": "mon"
},
"Amon.o3": {
"table_id": "Amon",
"variable_id": "o3",
"cmip6_compound_name": "Amon.o3",
"cmip7_compound_name": "atmosChem.o3.tavg-p19-hxy-air.mon.glb",
"branded_variable": "o3_tavg-p19-hxy-air",
"branding_suffix": "tavg-p19-hxy-air",
"temporal_label": "tavg",
"vertical_label": "p19",
"horizontal_label": "hxy",
"area_label": "air",
"realm": "atmosChem",
"region": "glb",
"frequency": "mon"
},
"Amon.o3Clim": {
"table_id": "Amon",
"variable_id": "o3",
"cmip6_compound_name": "Amon.o3Clim",
"cmip7_compound_name": "atmosChem.o3.tclm-p19-hxy-air.mon.glb",
"branded_variable": "o3_tclm-p19-hxy-air",
"branding_suffix": "tclm-p19-hxy-air",
"temporal_label": "tclm",
"vertical_label": "p19",
"horizontal_label": "hxy",
"area_label": "air",
"realm": "atmosChem",
"region": "glb",
"frequency": "mon"
},
"Amon.pr": {
"table_id": "Amon",
"variable_id": "pr",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def __init__(
Optional time range filter (start, end) in YYYY-MM format
"""
self.slug = slug
self.facets = facets
self.facets = {"project": "obs4MIPs", **facets}
self.remove_ensembles = remove_ensembles
self.time_span = time_span

Expand Down
6 changes: 5 additions & 1 deletion packages/climate-ref-core/tests/unit/esgf/test_obs4mips.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ def test_init_basic(self):
facets={"source_id": "GPCP-SG", "variable_id": "pr"},
)
assert request.slug == "test-obs"
assert request.facets == {"source_id": "GPCP-SG", "variable_id": "pr"}
assert request.facets == {
"project": "obs4MIPs",
"source_id": "GPCP-SG",
"variable_id": "pr",
}
assert request.remove_ensembles is False
assert request.time_span is None
assert request.source_type == "obs4MIPs"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ ESMValTool/OBS/Tier2/ESACCI-CLOUD/OBS_ESACCI-CLOUD_sat_AVHRR-AMPM-fv3.0_Amon_rlu
ESMValTool/OBS/Tier2/ESACCI-CLOUD/OBS_ESACCI-CLOUD_sat_AVHRR-AMPM-fv3.0_Amon_rlutcs_198201-201612.nc 21f096ecafff659e5c7e3338060425f7194e5d1b39c9510865496e04ecac3d75
ESMValTool/OBS/Tier2/ESACCI-CLOUD/OBS_ESACCI-CLOUD_sat_AVHRR-AMPM-fv3.0_Amon_rsut_198201-201612.nc f2c3f3afcdc2e730df7985c210a3de89b0d4f83b150e0c3846f7ac3c5fa9c54a
ESMValTool/OBS/Tier2/ESACCI-CLOUD/OBS_ESACCI-CLOUD_sat_AVHRR-AMPM-fv3.0_Amon_rsutcs_198201-201612.nc d180d3140d4c1f6b9bb1960e07b45f192643f047e7c272c8c8c7070296ca3ab7
ESMValTool/OBS/Tier2/ESACCI-OZONE/OBS6_ESACCI-OZONE_sat_L3_AERmon_o3_198410-202212.nc 7ed9446b66e3b8382df4b6ce3074499a9ad00b7173a784c95df289fc9971ce69
ESMValTool/OBS/Tier2/HadCRUT5/OBS_HadCRUT5_ground_5.0.1.0-analysis_Amon_tas_185001-202112.nc edc3ee50b942dfbeccfd58b574df3393555379c2de3418c9717ac11dbafc12fc
ESMValTool/OBS/Tier2/ISCCP-FH/OBS_ISCCP-FH_sat_v0_Amon_rlut_198401-201612.nc 650b347df432f6e5f3f693310aad695a7502f2905ac545753c7d4ccb0592adbe
ESMValTool/OBS/Tier2/ISCCP-FH/OBS_ISCCP-FH_sat_v0_Amon_rlutcs_198401-201612.nc a90d9e035447f8778a2f64362411c079536d9dea559f6d53d032710b2c9b00e3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
from climate_ref_esmvaltool.diagnostics.ecs import EquilibriumClimateSensitivity
from climate_ref_esmvaltool.diagnostics.enso import ENSOBasicClimatology, ENSOCharacteristics
from climate_ref_esmvaltool.diagnostics.example import GlobalMeanTimeseries
from climate_ref_esmvaltool.diagnostics.ozone import (
O3LatMonthMapplot,
O3LatTimeMapplot,
O3PolarCapTimeseriesNH,
O3PolarCapTimeseriesSH,
O3ZonalMeanProfiles,
)
from climate_ref_esmvaltool.diagnostics.regional_historical_changes import (
RegionalHistoricalAnnualCycle,
RegionalHistoricalTimeSeries,
Expand All @@ -37,6 +44,11 @@
"ENSOCharacteristics",
"EquilibriumClimateSensitivity",
"GlobalMeanTimeseries",
"O3LatMonthMapplot",
"O3LatTimeMapplot",
"O3PolarCapTimeseriesNH",
"O3PolarCapTimeseriesSH",
"O3ZonalMeanProfiles",
"RegionalHistoricalAnnualCycle",
"RegionalHistoricalTimeSeries",
"RegionalHistoricalTrend",
Expand Down
Loading
Loading