Skip to content

Make ozone diagnostic compatible with CMIP7 data #704

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
schlunma wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Make ozone diagnostic compatible with CMIP7 data #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
83b11db
Update reference data for ozone zonal diagnostic
bouweandela May 29, 2026
bcf0bbc
Add changelog
bouweandela May 29, 2026
a634b1c
Remove old changelog entry
schlunma Jun 2, 2026
0d5f291
Use new version of ozone recipe
schlunma Jun 2, 2026
ccd21c7
Use latest ESMValTool commit
schlunma Jun 2, 2026
c78cc39
Fix recipe path
schlunma Jun 2, 2026
15df274
Update time ranges in expected recipes
schlunma Jun 2, 2026
cce8adb
Update time ranges in expected recipes again
schlunma Jun 2, 2026
2fbfc7f
Update to latest ESMValTool commit
schlunma Jun 3, 2026
322752c
Use latest ozone recipe version
schlunma Jun 3, 2026
24350ef
Merge branch 'main' into update_ozone_diagnostic
lewisjared Jun 30, 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 packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/dataset_registry/data.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,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_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/ESACCI-OZONE/OBS6_ESACCI-OZONE_sat_L3-SAGE-OMPS_AERmon_o3_198410-202212.nc 8adab06ed9e9026261a2acf6b0d316e64f7a5f0928c4151d6f97ad8d1def6332
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
14 changes: 5 additions & 9 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 @@ -165,7 +165,7 @@ class O3LatTimeMapplot(ESMValToolDiagnostic):

name = "Ozone Diagnostics"
slug = "ozone-lat-time"
base_recipe = "ref/recipe_ref_ozone.yml"
base_recipe = "ref/recipe_ref_ozone_cmip7.yml"

data_requirements = toz_data_requirement
facets = ()
Expand Down Expand Up @@ -200,7 +200,7 @@ class O3PolarCapTimeseriesSH(ESMValToolDiagnostic):

name = "Ozone Diagnostics"
slug = "ozone-sh-oct"
base_recipe = "ref/recipe_ref_ozone.yml"
base_recipe = "ref/recipe_ref_ozone_cmip7.yml"

data_requirements = toz_data_requirement
facets = ()
Expand Down Expand Up @@ -245,7 +245,7 @@ class O3PolarCapTimeseriesNH(ESMValToolDiagnostic):

name = "Ozone Diagnostics"
slug = "ozone-nh-mar"
base_recipe = "ref/recipe_ref_ozone.yml"
base_recipe = "ref/recipe_ref_ozone_cmip7.yml"

data_requirements = toz_data_requirement
facets = ()
Expand Down Expand Up @@ -274,10 +274,6 @@ def update_recipe(
input_files: dict[SourceDatasetType, pandas.DataFrame],
) -> None:
"""Update the recipe."""
# Make sure only grid cells south of 80N are considered as there are no
# measurements north of 80N in March. Specifying 85N as northern boundary
# in the orignal 'recipe_ref_ozone.yml' is a bug!
recipe["preprocessors"]["create_time_series_NH"]["extract_region"]["end_latitude"] = 80
recipe_variables = dataframe_to_recipe(input_files[get_cmip_source_type(input_files)])
dataset = recipe_variables["toz"]["additional_datasets"][0]
# set model (CMIP6) time range to 1950...2014
Expand All @@ -298,7 +294,7 @@ class O3ZonalMeanProfiles(ESMValToolDiagnostic):

name = "Ozone Diagnostics"
slug = "ozone-zonal"
base_recipe = "ref/recipe_ref_ozone.yml"
base_recipe = "ref/recipe_ref_ozone_cmip7.yml"

data_requirements = (
DataRequirement(
Expand Down Expand Up @@ -396,7 +392,7 @@ class O3LatMonthMapplot(ESMValToolDiagnostic):

name = "Ozone Diagnostics"
slug = "ozone-annual-cycle"
base_recipe = "ref/recipe_ref_ozone.yml"
base_recipe = "ref/recipe_ref_ozone_cmip7.yml"

data_requirements = toz_data_requirement
facets = ()
Expand Down
4 changes: 2 additions & 2 deletions packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,11 @@ def get_child_and_parent_dataset(
return [child_dataset, parent_dataset]


_ESMVALTOOL_COMMIT = "dead90ca848d3892ed90785b3940909d58d27780"
_ESMVALTOOL_COMMIT = "b827ce01b109f75af6117be120f89a6214c7db1f"
_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 = (
Expand Down
2 changes: 1 addition & 1 deletion packages/climate-ref-esmvaltool/src/climate_ref_esmvaltool/recipes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ 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_cmip7.yml 16b127ef957a1b029835b0cdd940530f439576f0d22c589cd472598d03568702
ref/recipe_ref_sea_ice_area_basic.yml 7d01a8527880663ca28284772f83a8356d9972fb4f022a4000e50a56ce044b09
ref/recipe_ref_scatterplot.yml b99d1736e16256d161847b025811d7088ad9f892d4887fb009fa99c4079135a0
ref/recipe_ref_timeseries_region.yml deee4403ea25867401e163f6c9d7fcc4fee09d3088009007fcad6a29d01247a8
Expand Down
8 changes: 4 additions & 4 deletions ...ef-esmvaltool/tests/unit/diagnostics/recipes/recipe_ozone_annual_cycle_cmip6_obs4mips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ preprocessors:
operator: mean
extract_region:
start_latitude: 60
end_latitude: 85
end_latitude: 80
start_longitude: 0
end_longitude: 360
extract_month:
Expand Down Expand Up @@ -96,11 +96,11 @@ datasets:
mip: AERmon
timerange: 2005/2014
timerange_for_toz_monthly_data:
timerange: 1950/2014
timerange: 1950/2021
timerange_for_toz_zonal_mean:
timerange: 1997/2014
timerange: 1997/2021
timerange_for_ozone_profile:
timerange: 1990/2000
timerange: 1990/2021
diagnostics:
lat_month_mapplot:
variables:
Expand Down
8 changes: 4 additions & 4 deletions ...ef-esmvaltool/tests/unit/diagnostics/recipes/recipe_ozone_annual_cycle_cmip7_obs4mips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ preprocessors:
operator: mean
extract_region:
start_latitude: 60
end_latitude: 85
end_latitude: 80
start_longitude: 0
end_longitude: 360
extract_month:
Expand Down Expand Up @@ -99,11 +99,11 @@ datasets:
region: glb
timerange: 2005/2014
timerange_for_toz_monthly_data:
timerange: 1950/2014
timerange: 1950/2021
timerange_for_toz_zonal_mean:
timerange: 1997/2014
timerange: 1997/2021
timerange_for_ozone_profile:
timerange: 1990/2000
timerange: 1990/2021
diagnostics:
lat_month_mapplot:
variables:
Expand Down
8 changes: 4 additions & 4 deletions ...te-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_ozone_lat_time_cmip6_obs4mips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ preprocessors:
operator: mean
extract_region:
start_latitude: 60
end_latitude: 85
end_latitude: 80
start_longitude: 0
end_longitude: 360
extract_month:
Expand Down Expand Up @@ -96,11 +96,11 @@ datasets:
mip: AERmon
timerange: 1996/2014
timerange_for_toz_monthly_data:
timerange: 1950/2014
timerange: 1950/2021
timerange_for_toz_zonal_mean:
timerange: 1997/2014
timerange: 1997/2021
timerange_for_ozone_profile:
timerange: 1990/2000
timerange: 1990/2021
diagnostics:
lat_time_mapplot:
variables:
Expand Down
8 changes: 4 additions & 4 deletions ...te-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_ozone_lat_time_cmip7_obs4mips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ preprocessors:
operator: mean
extract_region:
start_latitude: 60
end_latitude: 85
end_latitude: 80
start_longitude: 0
end_longitude: 360
extract_month:
Expand Down Expand Up @@ -99,11 +99,11 @@ datasets:
region: glb
timerange: 1996/2014
timerange_for_toz_monthly_data:
timerange: 1950/2014
timerange: 1950/2021
timerange_for_toz_zonal_mean:
timerange: 1997/2014
timerange: 1997/2021
timerange_for_ozone_profile:
timerange: 1990/2000
timerange: 1990/2021
diagnostics:
lat_time_mapplot:
variables:
Expand Down
8 changes: 4 additions & 4 deletions ...mate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_ozone_nh_mar_cmip6_obs4mips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@ datasets:
mip: AERmon
timerange: 1950/2014
timerange_for_toz_monthly_data:
timerange: 1950/2014
timerange: 1950/2021
timerange_for_toz_zonal_mean:
timerange: 1997/2014
timerange: 1997/2021
timerange_for_ozone_profile:
timerange: 1990/2000
timerange: 1990/2021
diagnostics:
polar_cap_time_series_NH:
variables:
toz:
timerange: 1950/2014
timerange: 1950/2021
mip: AERmon
exp: historical
preprocessor: create_time_series_NH
Expand Down
8 changes: 4 additions & 4 deletions ...mate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_ozone_nh_mar_cmip7_obs4mips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,16 @@ datasets:
region: glb
timerange: 1950/2014
timerange_for_toz_monthly_data:
timerange: 1950/2014
timerange: 1950/2021
timerange_for_toz_zonal_mean:
timerange: 1997/2014
timerange: 1997/2021
timerange_for_ozone_profile:
timerange: 1990/2000
timerange: 1990/2021
diagnostics:
polar_cap_time_series_NH:
variables:
toz:
timerange: 1950/2014
timerange: 1950/2021
mip: aerosol
exp: historical
preprocessor: create_time_series_NH
Expand Down
10 changes: 5 additions & 5 deletions ...mate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_ozone_sh_oct_cmip6_obs4mips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ preprocessors:
operator: mean
extract_region:
start_latitude: 60
end_latitude: 85
end_latitude: 80
start_longitude: 0
end_longitude: 360
extract_month:
Expand Down Expand Up @@ -96,16 +96,16 @@ datasets:
mip: AERmon
timerange: 1950/2014
timerange_for_toz_monthly_data:
timerange: 1950/2014
timerange: 1950/2021
timerange_for_toz_zonal_mean:
timerange: 1997/2014
timerange: 1997/2021
timerange_for_ozone_profile:
timerange: 1990/2000
timerange: 1990/2021
diagnostics:
polar_cap_time_series_SH:
variables:
toz:
timerange: 1950/2014
timerange: 1950/2021
mip: AERmon
exp: historical
preprocessor: create_time_series_SH
Expand Down
10 changes: 5 additions & 5 deletions ...mate-ref-esmvaltool/tests/unit/diagnostics/recipes/recipe_ozone_sh_oct_cmip7_obs4mips.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ preprocessors:
operator: mean
extract_region:
start_latitude: 60
end_latitude: 85
end_latitude: 80
start_longitude: 0
end_longitude: 360
extract_month:
Expand Down Expand Up @@ -99,16 +99,16 @@ datasets:
region: glb
timerange: 1950/2014
timerange_for_toz_monthly_data:
timerange: 1950/2014
timerange: 1950/2021
timerange_for_toz_zonal_mean:
timerange: 1997/2014
timerange: 1997/2021
timerange_for_ozone_profile:
timerange: 1990/2000
timerange: 1990/2021
diagnostics:
polar_cap_time_series_SH:
variables:
toz:
timerange: 1950/2014
timerange: 1950/2021
mip: aerosol
exp: historical
preprocessor: create_time_series_SH
Expand Down
Loading