From 273eb850126fb076e936305d1c1fe025b2a9c89e Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Mon, 9 Dec 2024 14:46:12 +0100 Subject: [PATCH 1/2] Renamed obs versions in recipes --- .../clouds/recipe_lauer22jclim_fig1_clim.yml | 12 ++-- .../recipe_lauer22jclim_fig1_clim_amip.yml | 12 ++-- .../recipe_lauer22jclim_fig2_taylor.yml | 6 +- .../recipe_lauer22jclim_fig2_taylor_amip.yml | 6 +- .../recipe_lauer22jclim_fig6_interannual.yml | 12 ++-- .../clouds/recipe_lauer22jclim_fig7_seas.yml | 12 ++-- .../recipes/examples/recipe_check_obs.yml | 56 +++++++++---------- .../recipe_ipccwg1ar6ch3_fig_3_42_b.yml | 2 +- esmvaltool/recipes/recipe_anav13jclim.yml | 2 +- .../recipes/recipe_perfmetrics_land_CMIP5.yml | 2 +- .../recipe_schlund20jgr_gpp_abs_rcp85.yml | 2 +- .../recipe_schlund20jgr_gpp_change_rcp85.yml | 2 +- 12 files changed, 63 insertions(+), 63 deletions(-) diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim.yml index 0ecd79e458..b37adabccb 100644 --- a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim.yml +++ b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim.yml @@ -135,7 +135,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -160,7 +160,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -182,7 +182,7 @@ diagnostics: version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - {dataset: CLARA-AVHRR, project: OBS, type: sat, - version: V002_01, tier: 3, + version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, @@ -292,7 +292,7 @@ diagnostics: version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - {dataset: CLARA-AVHRR, project: OBS, type: sat, - version: V002_01, tier: 3, start_year: 1982, end_year: 2018} + version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, @@ -316,7 +316,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -338,7 +338,7 @@ diagnostics: version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - {dataset: CLARA-AVHRR, project: OBS, type: sat, - version: V002_01, tier: 3, start_year: 1982, end_year: 2018} + version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim_amip.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim_amip.yml index 8ae73c9da5..d0328cd392 100644 --- a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim_amip.yml +++ b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig1_clim_amip.yml @@ -151,7 +151,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -176,7 +176,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -197,7 +197,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, @@ -306,7 +306,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -331,7 +331,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -352,7 +352,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor.yml index c36e633164..c492fedaba 100644 --- a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor.yml +++ b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor.yml @@ -49,7 +49,7 @@ diagnostics: version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - {dataset: CLARA-AVHRR, project: OBS, type: sat, - version: V002_01, tier: 3, + version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -71,7 +71,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -89,7 +89,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor_amip.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor_amip.yml index 426746571b..6d3c6a6180 100644 --- a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor_amip.yml +++ b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig2_taylor_amip.yml @@ -48,7 +48,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -70,7 +70,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -88,7 +88,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig6_interannual.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig6_interannual.yml index cb8912eee9..c584c7a57f 100644 --- a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig6_interannual.yml +++ b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig6_interannual.yml @@ -136,7 +136,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -157,7 +157,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -174,7 +174,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, @@ -282,7 +282,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -303,7 +303,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -320,7 +320,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, diff --git a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig7_seas.yml b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig7_seas.yml index 998f38b4cb..e4350b79c9 100644 --- a/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig7_seas.yml +++ b/esmvaltool/recipes/clouds/recipe_lauer22jclim_fig7_seas.yml @@ -133,7 +133,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -158,7 +158,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -179,7 +179,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, @@ -286,7 +286,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: PATMOS-x, project: OBS, type: sat, version: NOAA, tier: 2, start_year: 1982, end_year: 2016} @@ -311,7 +311,7 @@ diagnostics: - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, start_year: 2006, end_year: 2017, tier: 3} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: MODIS, project: OBS, type: sat, version: MYD08-M3, tier: 3, start_year: 2003, end_year: 2018} @@ -332,7 +332,7 @@ diagnostics: - {dataset: ESACCI-CLOUD, project: OBS, type: sat, version: AVHRR-AMPM-fv3.0, tier: 2, start_year: 1992, end_year: 2016} - - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002_01, + - {dataset: CLARA-AVHRR, project: OBS, type: sat, version: V002-01, tier: 3, start_year: 1982, end_year: 2018} - {dataset: CLOUDSAT-L2, project: OBS, type: sat, version: P1-R05-gridbox-average-noprecip, diff --git a/esmvaltool/recipes/examples/recipe_check_obs.yml b/esmvaltool/recipes/examples/recipe_check_obs.yml index 880aef831a..2e7849d267 100644 --- a/esmvaltool/recipes/examples/recipe_check_obs.yml +++ b/esmvaltool/recipes/examples/recipe_check_obs.yml @@ -23,7 +23,7 @@ diagnostics: variables: pr: additional_datasets: - - {project: OBS6, dataset: AGCD, mip: Amon, tier: 2, + - {project: OBS6, dataset: AGCD, mip: Amon, tier: 2, type: ground, version: v2-0-1} scripts: null @@ -77,16 +77,16 @@ diagnostics: tas: # check older versions mip: Amon additional_datasets: - - {dataset: CRU, project: OBS, tier: 2, type: reanaly, + - {dataset: CRU, project: OBS, tier: 2, type: reanaly, version: TS4.02, start_year: 1901, end_year: 2017} - - {dataset: CRU, project: OBS6, tier: 2, type: reanaly, + - {dataset: CRU, project: OBS6, tier: 2, type: reanaly, version: TS4.07, start_year: 1901, end_year: 2021} pr: # check older versions mip: Amon additional_datasets: - - {dataset: CRU, project: OBS, tier: 2, type: reanaly, + - {dataset: CRU, project: OBS, tier: 2, type: reanaly, version: TS4.02, start_year: 1901, end_year: 2017} - - {dataset: CRU, project: OBS6, tier: 2, type: reanaly, + - {dataset: CRU, project: OBS6, tier: 2, type: reanaly, version: TS4.07, start_year: 1901, end_year: 2021} tasmin: mip: Amon @@ -99,7 +99,7 @@ diagnostics: additional_datasets: # newest version for all variables - {dataset: CRU, project: OBS6, tier: 2, type: reanaly, version: TS4.07, start_year: 1901, end_year: 2022} - + scripts: null @@ -110,27 +110,27 @@ diagnostics: tasa: additional_datasets: - {dataset: CowtanWay, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: had4_krig_v1, start_year: 1979, + type: reanaly, version: had4-krig-v1, start_year: 1979, end_year: 2013} - {dataset: CowtanWay, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: had4_uah_v1, start_year: 1979, end_year: 2013} + type: reanaly, version: had4-uah-v1, start_year: 1979, end_year: 2013} - {dataset: CowtanWay, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: had4_short_krig_v2, start_year: 1979, + type: reanaly, version: had4-short-krig-v2, start_year: 1979, end_year: 2019, end_month: 11} - {dataset: CowtanWay, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: had4_short_uah_v2, start_year: 1979, + type: reanaly, version: had4-short-uah-v2, start_year: 1979, end_year: 2017, end_month: 7} - {dataset: CowtanWay, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: ghcn_short_krig_v2, start_year: 1979, + type: reanaly, version: ghcn-short-krig-v2, start_year: 1979, end_year: 2019, end_month: 8} - {dataset: CowtanWay, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: ghcn_short_uah_v2, start_year: 1979, + type: reanaly, version: ghcn-short-uah-v2, start_year: 1979, end_year: 2017, end_month: 7} - {dataset: CowtanWay, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: had4sst4_krig_v2, start_year: 1850, + type: reanaly, version: had4sst4-krig-v2, start_year: 1850, end_year: 2018} - {dataset: CowtanWay, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: had4_krig_v2, start_year: 1850, + type: reanaly, version: had4-krig-v2, start_year: 1850, end_year: 2019, end_month: 11} scripts: null @@ -447,21 +447,21 @@ diagnostics: pr: additional_datasets: - {dataset: GPCC, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: v2018_025, start_year: 1891, end_year: 2016} + type: reanaly, version: v2018-025, start_year: 1891, end_year: 2016} - {dataset: GPCC, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: v2018_05, start_year: 1891, end_year: 2016} + type: reanaly, version: v2018-05, start_year: 1891, end_year: 2016} - {dataset: GPCC, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: v2018_10, start_year: 1891, end_year: 2016} + type: reanaly, version: v2018-10, start_year: 1891, end_year: 2016} - {dataset: GPCC, project: OBS, mip: Amon, tier: 2, - type: reanaly, version: v2018_25, start_year: 1891, end_year: 2016} + type: reanaly, version: v2018-25, start_year: 1891, end_year: 2016} - {dataset: GPCC, project: OBS, mip: Amon, tier: 2, type: reanaly, - version: v2018_025-numgauge1, start_year: 1891, end_year: 2016} + version: v2018-025-numgauge1, start_year: 1891, end_year: 2016} - {dataset: GPCC, project: OBS, mip: Amon, tier: 2, type: reanaly, - version: v2018_05-numgauge1, start_year: 1891, end_year: 2016} + version: v2018-05-numgauge1, start_year: 1891, end_year: 2016} - {dataset: GPCC, project: OBS, mip: Amon, tier: 2, type: reanaly, - version: v2018_10-numgauge1, start_year: 1891, end_year: 2016} + version: v2018-10-numgauge1, start_year: 1891, end_year: 2016} - {dataset: GPCC, project: OBS, mip: Amon, tier: 2, type: reanaly, - version: v2018_25-numgauge1, start_year: 1891, end_year: 2016} + version: v2018-25-numgauge1, start_year: 1891, end_year: 2016} scripts: null GPCP-SG: @@ -579,7 +579,7 @@ diagnostics: wap: additional_datasets: - {dataset: JRA-55, project: OBS6, mip: Amon, tier: 2, - type: reanaly, version: 1, start_year: 1958, end_year: 2022} + type: reanaly, version: 1, start_year: 1958, end_year: 2022} scripts: null Kadow2020: @@ -614,12 +614,12 @@ diagnostics: scripts: null - MOBO-DIC_MPIM: - description: MOBO-DIC_MPIM check + MOBO-DIC-MPIM: + description: MOBO-DIC-MPIM check variables: dissic: additional_datasets: - - {dataset: MOBO-DIC_MPIM, project: OBS6, mip: Omon, tier: 2, + - {dataset: MOBO-DIC-MPIM, project: OBS6, mip: Omon, tier: 2, type: clim, version: '1.1', start_year: 2011, end_year: 2011} scripts: null @@ -1206,7 +1206,7 @@ diagnostics: mip: Amon additional_datasets: - {dataset: CLARA-AVHRR, project: OBS, tier: 3, - type: sat, version: V002_01, start_year: 1982, end_year: 2018} + type: sat, version: V002-01, start_year: 1982, end_year: 2018} scripts: null @@ -1728,7 +1728,7 @@ diagnostics: lai: additional_datasets: - {dataset: LAI3g, project: OBS, mip: Lmon, tier: 3, - type: reanaly, version: 1_regridded, start_year: 1981, end_year: 2018} + type: reanaly, version: 1-regridded, start_year: 1981, end_year: 2018} scripts: null diff --git a/esmvaltool/recipes/ipccwg1ar6ch3/recipe_ipccwg1ar6ch3_fig_3_42_b.yml b/esmvaltool/recipes/ipccwg1ar6ch3/recipe_ipccwg1ar6ch3_fig_3_42_b.yml index 27cf66f255..09c1d0f463 100644 --- a/esmvaltool/recipes/ipccwg1ar6ch3/recipe_ipccwg1ar6ch3_fig_3_42_b.yml +++ b/esmvaltool/recipes/ipccwg1ar6ch3/recipe_ipccwg1ar6ch3_fig_3_42_b.yml @@ -464,7 +464,7 @@ diagnostics: - {dataset: UKESM1-0-LL, grid: gn, ensemble: r1i1p1f2, project: CMIP6} # OBS - {dataset: LAI3g, project: OBS, type: reanaly, - version: 1_regridded, tier: 3, start_year: 1981} + version: 1-regridded, tier: 3, start_year: 1981} scripts: grading: <<: *grading_settings diff --git a/esmvaltool/recipes/recipe_anav13jclim.yml b/esmvaltool/recipes/recipe_anav13jclim.yml index 08559c2691..279352f561 100644 --- a/esmvaltool/recipes/recipe_anav13jclim.yml +++ b/esmvaltool/recipes/recipe_anav13jclim.yml @@ -380,7 +380,7 @@ diagnostics: end_year: 2005 reference_dataset: LAI3g additional_datasets: &lai_datasets - - {dataset: LAI3g, project: OBS, type: reanaly, version: 1_regridded, tier: 3} + - {dataset: LAI3g, project: OBS, type: reanaly, version: 1-regridded, tier: 3} - {dataset: bcc-csm1-1} - {dataset: bcc-csm1-1-m} - {dataset: BNU-ESM} diff --git a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml index 11ed80bbaa..18d83386dd 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml @@ -283,7 +283,7 @@ diagnostics: - {dataset: NorESM1-ME} - {dataset: LAI3g, project: OBS, type: reanaly, - version: 1_regridded, tier: 3, start_year: 1981} + version: 1-regridded, tier: 3, start_year: 1981} scripts: grading: <<: *grading_settings diff --git a/esmvaltool/recipes/schlund20jgr/recipe_schlund20jgr_gpp_abs_rcp85.yml b/esmvaltool/recipes/schlund20jgr/recipe_schlund20jgr_gpp_abs_rcp85.yml index 69745951a5..51cf76ac0e 100644 --- a/esmvaltool/recipes/schlund20jgr/recipe_schlund20jgr_gpp_abs_rcp85.yml +++ b/esmvaltool/recipes/schlund20jgr/recipe_schlund20jgr_gpp_abs_rcp85.yml @@ -645,7 +645,7 @@ diagnostics: start_year: 1982 end_year: 2005 additional_datasets: - - {dataset: LAI3g, project: OBS, type: reanaly, version: 1_regridded, tier: 3} + - {dataset: LAI3g, project: OBS, type: reanaly, version: 1-regridded, tier: 3} scripts: preprocess_mean: <<: *preprocess_mean_script diff --git a/esmvaltool/recipes/schlund20jgr/recipe_schlund20jgr_gpp_change_rcp85.yml b/esmvaltool/recipes/schlund20jgr/recipe_schlund20jgr_gpp_change_rcp85.yml index f54b1ab8eb..8bdb006a02 100644 --- a/esmvaltool/recipes/schlund20jgr/recipe_schlund20jgr_gpp_change_rcp85.yml +++ b/esmvaltool/recipes/schlund20jgr/recipe_schlund20jgr_gpp_change_rcp85.yml @@ -586,7 +586,7 @@ diagnostics: start_year: 1982 end_year: 2005 additional_datasets: - - {dataset: LAI3g, project: OBS, type: reanaly, version: 1_regridded, tier: 3} + - {dataset: LAI3g, project: OBS, type: reanaly, version: 1-regridded, tier: 3} scripts: preprocess_mean: <<: *preprocess_mean_script From 38fba165612160740940b0d30df7cfcc16403601 Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Mon, 9 Dec 2024 15:20:19 +0100 Subject: [PATCH 2/2] Renamed obs versions in CMORizers --- doc/sphinx/source/input.rst | 2 +- .../cmorizers/data/cmor_config/CowtanWay.yml | 16 ++++++++-------- esmvaltool/cmorizers/data/cmor_config/GPCC.yml | 8 ++++---- esmvaltool/cmorizers/data/cmor_config/LAI3g.yml | 2 +- .../{MOBO-DIC_MPIM.yml => MOBO-DIC-MPIM.yml} | 2 +- esmvaltool/cmorizers/data/datasets.yml | 2 +- .../data/downloaders/datasets/mobo_dic_mpim.py | 2 +- .../data/formatters/datasets/clara_avhrr.ncl | 2 +- .../cmorizers/data/formatters/datasets/gpcc.py | 4 ++-- .../data/formatters/datasets/mobo_dic_mpim.py | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) rename esmvaltool/cmorizers/data/cmor_config/{MOBO-DIC_MPIM.yml => MOBO-DIC-MPIM.yml} (97%) diff --git a/doc/sphinx/source/input.rst b/doc/sphinx/source/input.rst index f9bcfafc3e..2cbc780128 100644 --- a/doc/sphinx/source/input.rst +++ b/doc/sphinx/source/input.rst @@ -407,7 +407,7 @@ A list of the datasets for which a CMORizers is available is provided in the fol +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+ | MLS-AURA* [#t3]_ | hur, hurStderr (day) | 3 | Python | +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+ -| MOBO-DIC_MPIM | dissic (Omon) | 2 | Python | +| MOBO-DIC-MPIM | dissic (Omon) | 2 | Python | +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+ | MOBO-DIC2004-2019 | dissic (Omon) | 2 | Python | +------------------------------+------------------------------------------------------------------------------------------------------+------+-----------------+ diff --git a/esmvaltool/cmorizers/data/cmor_config/CowtanWay.yml b/esmvaltool/cmorizers/data/cmor_config/CowtanWay.yml index 39c0c8f7c2..4462e11395 100644 --- a/esmvaltool/cmorizers/data/cmor_config/CowtanWay.yml +++ b/esmvaltool/cmorizers/data/cmor_config/CowtanWay.yml @@ -6,14 +6,14 @@ filename: '{version}_0_0.nc' attributes: dataset_id: CowtanWay version: - v1: 'had4_krig_v1' - v2: 'had4_uah_v1' - v3: 'had4_short_krig_v2' - v4: 'had4_short_uah_v2' - v5: 'ghcn_short_krig_v2' - v6: 'ghcn_short_uah_v2' - v7: 'had4sst4_krig_v2' - v8: 'had4_krig_v2' + v1: 'had4-krig-v1' + v2: 'had4-uah-v1' + v3: 'had4-short-krig-v2' + v4: 'had4-short-uah-v2' + v5: 'ghcn-short-krig-v2' + v6: 'ghcn-short-uah-v2' + v7: 'had4sst4-krig-v2' + v8: 'had4-krig-v2' baseline: v1: '1981-2010' v2: '1981-2010' diff --git a/esmvaltool/cmorizers/data/cmor_config/GPCC.yml b/esmvaltool/cmorizers/data/cmor_config/GPCC.yml index f080cd14bd..c514eca711 100644 --- a/esmvaltool/cmorizers/data/cmor_config/GPCC.yml +++ b/esmvaltool/cmorizers/data/cmor_config/GPCC.yml @@ -6,10 +6,10 @@ filename: 'full_data_monthly_{version}.nc' attributes: dataset_id: GPCC version: - v1: 'v2018_25' - v2: 'v2018_10' - v3: 'v2018_05' - v4: 'v2018_025' + v1: 'v2018-25' + v2: 'v2018-10' + v3: 'v2018-05' + v4: 'v2018-025' tier: 2 modeling_realm: reanaly project_id: OBS diff --git a/esmvaltool/cmorizers/data/cmor_config/LAI3g.yml b/esmvaltool/cmorizers/data/cmor_config/LAI3g.yml index bb099a911a..c6f9a59ec8 100644 --- a/esmvaltool/cmorizers/data/cmor_config/LAI3g.yml +++ b/esmvaltool/cmorizers/data/cmor_config/LAI3g.yml @@ -14,7 +14,7 @@ regrid: # Common global attributes for Cmorizer output attributes: dataset_id: LAI3g - version: '1_regridded' + version: '1-regridded' tier: 3 modeling_realm: reanaly project_id: OBS diff --git a/esmvaltool/cmorizers/data/cmor_config/MOBO-DIC_MPIM.yml b/esmvaltool/cmorizers/data/cmor_config/MOBO-DIC-MPIM.yml similarity index 97% rename from esmvaltool/cmorizers/data/cmor_config/MOBO-DIC_MPIM.yml rename to esmvaltool/cmorizers/data/cmor_config/MOBO-DIC-MPIM.yml index c25389fb12..751fbffff6 100644 --- a/esmvaltool/cmorizers/data/cmor_config/MOBO-DIC_MPIM.yml +++ b/esmvaltool/cmorizers/data/cmor_config/MOBO-DIC-MPIM.yml @@ -1,7 +1,7 @@ --- # Common global attributes for Cmorizer output attributes: - dataset_id: MOBO-DIC_MPIM + dataset_id: MOBO-DIC-MPIM version: '1.1' tier: 2 modeling_realm: clim diff --git a/esmvaltool/cmorizers/data/datasets.yml b/esmvaltool/cmorizers/data/datasets.yml index 4c7c168009..f05d7d49ff 100644 --- a/esmvaltool/cmorizers/data/datasets.yml +++ b/esmvaltool/cmorizers/data/datasets.yml @@ -918,7 +918,7 @@ datasets: information). A registration is required. - MOBO-DIC_MPIM: + MOBO-DIC-MPIM: tier: 2 source: https://www.ncei.noaa.gov/data/oceans/ncei/ocads/data/0221526/ last_access: 2022-11-03 diff --git a/esmvaltool/cmorizers/data/downloaders/datasets/mobo_dic_mpim.py b/esmvaltool/cmorizers/data/downloaders/datasets/mobo_dic_mpim.py index 58af5689d7..5d270d03b4 100644 --- a/esmvaltool/cmorizers/data/downloaders/datasets/mobo_dic_mpim.py +++ b/esmvaltool/cmorizers/data/downloaders/datasets/mobo_dic_mpim.py @@ -1,4 +1,4 @@ -"""Script to download MOBO-DIC_MPIM.""" +"""Script to download MOBO-DIC-MPIM.""" import logging from esmvaltool.cmorizers.data.downloaders.wget import WGetDownloader diff --git a/esmvaltool/cmorizers/data/formatters/datasets/clara_avhrr.ncl b/esmvaltool/cmorizers/data/formatters/datasets/clara_avhrr.ncl index b275332d48..020e2cf9e6 100644 --- a/esmvaltool/cmorizers/data/formatters/datasets/clara_avhrr.ncl +++ b/esmvaltool/cmorizers/data/formatters/datasets/clara_avhrr.ncl @@ -88,7 +88,7 @@ begin TYPE = "sat" ; Version - VERSION = "V002_01" + VERSION = "V002-01" ; Global attributes SOURCE = "https://wui.cmsaf.eu/" diff --git a/esmvaltool/cmorizers/data/formatters/datasets/gpcc.py b/esmvaltool/cmorizers/data/formatters/datasets/gpcc.py index 4ce9bbc71e..969bcb25c6 100644 --- a/esmvaltool/cmorizers/data/formatters/datasets/gpcc.py +++ b/esmvaltool/cmorizers/data/formatters/datasets/gpcc.py @@ -14,8 +14,8 @@ Download the following files: full_data_monthly_{version}.nc.gz -Two files are generated per version, one with version_grid (i.e. v2018_25), -one with version_grid-numgauge1 (i.e. v2018_25-numgauge1), which is constrained +Two files are generated per version, one with version_grid (i.e. v2018-25), +one with version-grid-numgauge1 (i.e. v2018-25-numgauge1), which is constrained on holding gridpoint values relying on data from at least one station (i.e. removing gridpoints solely relying on climatological infilling). """ diff --git a/esmvaltool/cmorizers/data/formatters/datasets/mobo_dic_mpim.py b/esmvaltool/cmorizers/data/formatters/datasets/mobo_dic_mpim.py index 7b10ef0b5e..e29b5f60bf 100644 --- a/esmvaltool/cmorizers/data/formatters/datasets/mobo_dic_mpim.py +++ b/esmvaltool/cmorizers/data/formatters/datasets/mobo_dic_mpim.py @@ -1,4 +1,4 @@ -"""ESMValTool CMORizer for MOBO-DIC_MPIM data. +"""ESMValTool CMORizer for MOBO-DIC-MPIM data. Tier Tier 2: other freely-available dataset. @@ -166,7 +166,7 @@ def _extract_variable(var_info, cmor_info, attrs, filepath, out_dir): _fix_var_metadata(var_info, cmor_info, cube) # Fix coordinates - if cube.coords('month of the year'): # MOBO-DIC_MPIM + if cube.coords('month of the year'): # MOBO-DIC-MPIM _fix_climatological_time(cube) elif cube.coords('Julian Day'): # MOBO-DIC2004-2019 _fix_time(cube)