Update obs4mips names in Bock et al recipes for compatibility with ES…

…GF (#3324) Co-authored-by: Bouwe Andela <[email protected]>
ESMValGroup · Nov 13, 2023 · 838d5f5 · 838d5f5
1 parent d14c309
commit 838d5f5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/esmvaltool/recipes/bock20jgr/recipe_bock20jgr_fig_6-7.yml b/esmvaltool/recipes/bock20jgr/recipe_bock20jgr_fig_6-7.yml
@@ -359,7 +359,7 @@ diagnostics:
     variables:
       pr:
         preprocessor: ppNOLEV1
-        reference_dataset: GPCP-SG
+        reference_dataset: GPCP-V2.2
         alternative_dataset: GHCN
         mip: Amon
         project: CMIP5
@@ -393,8 +393,7 @@ diagnostics:
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
       - {dataset: MCM-UA-1-0, grid: gn, ensemble: r1i1p1f1, project: CMIP6}
 
-      - {dataset: GPCP-SG, project: obs4MIPs, level: L3,
-         version: v2.2, tier: 1}
+      - {dataset: GPCP-V2.2, project: obs4MIPs, level: L3, tier: 1}
       - {dataset: GHCN, project: OBS, type: ground, version: 1, tier: 2}
     scripts:
       grading:
@@ -530,8 +529,7 @@ diagnostics:
       - {dataset: CIESM, grid: gr, ensemble: r1i1p1f1, project: CMIP6}
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
 
-      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B,
-         version: Ed2-8, tier: 1, start_year: 2001, end_year: 2015}
+      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2015}
     scripts:
       grading:
         <<: *grading_settings
@@ -568,8 +566,7 @@ diagnostics:
       - {dataset: CanESM5-CanOE, ensemble: r1i1p2f1, grid: gn, project: CMIP6}
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
 
-      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B,
-         version: Ed2-8, tier: 1, start_year: 2001, end_year: 2015}
+      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2015}
     scripts:
       grading:
         <<: *grading_settings
@@ -611,8 +608,7 @@ diagnostics:
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
       - {dataset: MCM-UA-1-0, grid: gn, ensemble: r1i1p1f1, project: CMIP6}
 
-      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B,
-         version: Ed2-8, tier: 1, start_year: 2001, end_year: 2015}
+      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2015}
     scripts:
       grading:
         <<: *grading_settings
@@ -628,7 +624,7 @@ diagnostics:
     variables:
       hus:
         preprocessor: pp400
-        reference_dataset: AIRS
+        reference_dataset: AIRS-2-1
         alternative_dataset: ERA-Interim
         mip: Amon
         project: CMIP5
@@ -652,10 +648,8 @@ diagnostics:
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
       - {dataset: MCM-UA-1-0, grid: gn, ensemble: r1i1p1f1, project: CMIP6}
 
-      - {dataset: AIRS, project: obs4MIPs, level: L3,
-         version: RetStd-v5, tier: 1, start_year: 2003, end_year: 2010}
-      - {dataset: ERA-Interim, project: OBS6, type: reanaly,
-         version: 1, tier: 3}
+      - {dataset: AIRS-2-1, project: obs4MIPs, level: L3, tier: 1, start_year: 2003, end_year: 2010}
+      - {dataset: ERA-Interim, project: OBS6, type: reanaly, version: 1, tier: 3}
     scripts:
       grading:
         <<: *grading_settings
@@ -694,8 +688,7 @@ diagnostics:
       - {dataset: CIESM, grid: gr, ensemble: r1i1p1f1, project: CMIP6}
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
 
-      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B,
-         version: Ed2-8, tier: 1, start_year: 2001, end_year: 2015}
+      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2015}
     scripts:
       grading:
         <<: *grading_settings
@@ -744,8 +737,7 @@ diagnostics:
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
       - {dataset: MCM-UA-1-0, grid: gn, ensemble: r1i1p1f1, project: CMIP6}
 
-      - {dataset: ERA-Interim, project: OBS6, type: reanaly,
-         version: 1, tier: 3}
+      - {dataset: ERA-Interim, project: OBS6, type: reanaly, version: 1, tier: 3}
       - {dataset: NCEP-NCAR-R1, project: OBS6, type: reanaly, version: 1, tier: 2}
     scripts:
       grading:
@@ -1085,7 +1077,7 @@ diagnostics:
     variables:
       pr:
         <<: *var_settings
-        reference_dataset: GPCP-SG
+        reference_dataset: GPCP-V2.2
         alternative_dataset: GHCN
     additional_datasets:
       - {<<: *cmip3, dataset: bccr_bcm2_0, institute: BCCR}
@@ -1113,7 +1105,7 @@ diagnostics:
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
       - {dataset: MCM-UA-1-0, grid: gn, ensemble: r1i1p1f1, project: CMIP6}
 
-      - {dataset: GPCP-SG, project: obs4MIPs, level: L3, version: v2.2, tier: 1}
+      - {dataset: GPCP-V2.2, project: obs4MIPs, level: L3, tier: 1}
       - {dataset: GHCN, project: OBS, type: ground, version: 1, tier: 2}
 
   psl_cor:
@@ -1175,8 +1167,7 @@ diagnostics:
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
       - {dataset: MCM-UA-1-0, grid: gn, ensemble: r1i1p1f1, project: CMIP6}
 
-      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-8,
-         tier: 1, start_year: 2001, end_year: 2015}
+      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2015}
 
   swcre_cor:
     <<: *corr_diag
@@ -1199,8 +1190,7 @@ diagnostics:
       - {dataset: CanESM5-CanOE, ensemble: r1i1p2f1, grid: gn, project: CMIP6}
       - {dataset: FGOALS-f3-L, ensemble: r1i1p1f1, grid: gr, project: CMIP6}
 
-      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-8,
-         tier: 1, start_year: 2001, end_year: 2015}
+      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1, start_year: 2001, end_year: 2015}
 
   fig_7:
     title: Collection of pattern correlations

diff --git a/esmvaltool/recipes/bock20jgr/recipe_bock20jgr_fig_8-10.yml b/esmvaltool/recipes/bock20jgr/recipe_bock20jgr_fig_8-10.yml
@@ -415,8 +415,7 @@ diagnostics:
         derive: true
         additional_datasets: *cmip3_all
     additional_datasets:
-      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7,
-         start_year: 2001, end_year: 2010, tier: 1}
+      - {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, start_year: 2001, end_year: 2010, tier: 1}
     scripts:
       clim:
         script: clouds/clouds_ipcc.ncl