Update Obs4MIPs names in perfmetrics_CMIP5 (#3325)

Co-authored-by: Klaus Zimmermann <[email protected]>
ESMValGroup · Nov 14, 2023 · 7473e8b · 7473e8b
1 parent 7c1921d
commit 7473e8b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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