From 7473e8ba8a61ef679529d08deca062ff09a6c5d0 Mon Sep 17 00:00:00 2001 From: Romain Beucher Date: Tue, 14 Nov 2023 23:22:07 +1100 Subject: [PATCH] Update Obs4MIPs names in perfmetrics_CMIP5 (#3325) Co-authored-by: Klaus Zimmermann --- .../recipes/recipe_perfmetrics_CMIP5.yml | 26 +++++++------------ .../recipes/recipe_perfmetrics_CMIP5_4cds.yml | 16 ++++++------ .../recipes/recipe_perfmetrics_land_CMIP5.yml | 23 ++++++---------- 3 files changed, 26 insertions(+), 39 deletions(-) diff --git a/esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml b/esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml index ee7c8e96e1..f1ff96eb64 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml @@ -613,7 +613,7 @@ diagnostics: variables: pr: preprocessor: ppNOLEV1 - reference_dataset: GPCP-SG + reference_dataset: GPCP-V2.2 mip: Amon project: CMIP5 exp: historical @@ -670,8 +670,7 @@ diagnostics: - {dataset: MRI-ESM1} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: GPCP-SG, project: obs4MIPs, level: L3, - version: v2.2, tier: 1} + - {dataset: GPCP-V2.2, project: obs4MIPs, level: L3, tier: 1} scripts: grading: <<: *grading_settings @@ -811,8 +810,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, - version: Ed2-7, tier: 1} + - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1} scripts: latlon: <<: *latlon_settings @@ -883,8 +881,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, - version: Ed2-7, tier: 1} + - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1} scripts: latlon: <<: *latlon_settings @@ -958,8 +955,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, - version: Ed2-7, tier: 1} + - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1} scripts: grading: <<: *grading_settings @@ -975,7 +971,7 @@ diagnostics: variables: hus: preprocessor: pp400 - reference_dataset: AIRS + reference_dataset: AIRS-2-1 alternative_dataset: ERA-Interim mip: Amon project: CMIP5 @@ -1024,10 +1020,9 @@ diagnostics: - {dataset: MRI-ESM1} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: AIRS, project: obs4MIPs, level: L3, - version: RetStd-v5, tier: 1} - - {dataset: ERA-Interim, project: OBS6, type: reanaly, - version: 1, tier: 3} + - {dataset: AIRS-2-1, project: obs4MIPs, level: L3, tier: 1} + - {dataset: ERA-Interim, project: OBS6, + type: reanaly, version: 1, tier: 3} scripts: grading: <<: *grading_settings @@ -1090,8 +1085,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, - version: Ed2-7, tier: 1} + - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1} scripts: grading: <<: *grading_settings diff --git a/esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml b/esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml index b9e6b1ad1e..6e80cef108 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml @@ -1025,7 +1025,7 @@ diagnostics: variables: hus: preprocessor: pp400 - reference_dataset: AIRS + reference_dataset: AIRS-2-1 alternative_dataset: ERA-Interim mip: Amon project: CMIP5 @@ -1074,9 +1074,9 @@ diagnostics: - {dataset: MRI-ESM1} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: AIRS, project: obs4MIPs, level: L3, version: RetStd-v5, tier: 1} - - {dataset: ERA-Interim, project: OBS6, type: reanaly, - version: 1, tier: 3} + - {dataset: AIRS-2-1, project: obs4MIPs, level: L3, tier: 1} + - {dataset: ERA-Interim, project: OBS6, + type: reanaly, version: 1, tier: 3} scripts: grading: <<: *grading_settings @@ -1271,7 +1271,7 @@ diagnostics: variables: pr: preprocessor: ppNOLEV1 - reference_dataset: GPCP-SG + reference_dataset: GPCP-V2.2 mip: Amon project: CMIP5 exp: historical @@ -1328,7 +1328,7 @@ diagnostics: - {dataset: MRI-ESM1} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: GPCP-SG, project: obs4MIPs, level: L3, version: v2.2, tier: 1} + - {dataset: GPCP-V2.2, project: obs4MIPs, level: L3, tier: 1} scripts: grading: <<: *grading_settings @@ -1477,7 +1477,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1} + - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1} scripts: grading: <<: *grading_settings @@ -1544,7 +1544,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1} + - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1} scripts: grading: <<: *grading_settings diff --git a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml index 834b97e158..11ed80bbaa 100644 --- a/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml +++ b/esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml @@ -420,7 +420,7 @@ diagnostics: rlus: short_name: rlus preprocessor: ppNOLEV1 - reference_dataset: CERES-EBAF + reference_dataset: CERES-EBAF_Surface mip: Amon project: CMIP5 exp: historical @@ -460,9 +460,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, - version: Ed2-8, tier: 1, start_year: 2001, end_year: 2015} + - {dataset: CERES-EBAF_Surface, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2013} scripts: grading: <<: *grading_settings @@ -478,7 +476,7 @@ diagnostics: rlds: short_name: rlds preprocessor: ppNOLEV1 - reference_dataset: CERES-EBAF + reference_dataset: CERES-EBAF_Surface mip: Amon project: CMIP5 exp: historical @@ -519,9 +517,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, - version: Ed2-8, tier: 1, start_year: 2001, end_year: 2015} + - {dataset: CERES-EBAF_Surface, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2013} scripts: grading: <<: *grading_settings @@ -537,7 +533,7 @@ diagnostics: rsus: short_name: rsus preprocessor: ppNOLEV1 - reference_dataset: CERES-EBAF + reference_dataset: CERES-EBAF_Surface mip: Amon project: CMIP5 exp: historical @@ -577,9 +573,7 @@ diagnostics: - {dataset: MRI-CGCM3} - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, - version: Ed2-8, tier: 1, start_year: 2001, end_year: 2015} + - {dataset: CERES-EBAF_Surface, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2013} scripts: grading: <<: *grading_settings @@ -595,7 +589,7 @@ diagnostics: rsds: short_name: rsds preprocessor: ppNOLEV1 - reference_dataset: CERES-EBAF + reference_dataset: CERES-EBAF_Surface mip: Amon project: CMIP5 exp: historical @@ -637,8 +631,7 @@ diagnostics: - {dataset: NorESM1-M} - {dataset: NorESM1-ME} - - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, - version: Ed2-8, tier: 1, start_year: 2001, end_year: 2015} + - {dataset: CERES-EBAF_Surface, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2013} scripts: grading: <<: *grading_settings