Skip to content
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

Jump to bottom

Update Obs4MIPs names in perfmetrics_CMIP5 #3325

Merged
merged 10 commits into from
Nov 14, 2023
Merged

Update Obs4MIPs names in perfmetrics_CMIP5 #3325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3d8db93
Update Obs4MIPs names in perfmetrics_CMIP5
rbeucher Aug 14, 2023
3f438cf
Update esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml
rbeucher Nov 13, 2023
fcfe4af
Update esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml
rbeucher Nov 13, 2023
6ae9928
Update esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml
rbeucher Nov 13, 2023
dbce4b2
Merge branch 'ESMValGroup:main' into esgf_recipes_perfmetrics_CMIP5
rbeucher Nov 13, 2023
d92d0e1
Remove extra whitespace
rbeucher Nov 14, 2023
95c74fd
Update esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml
rbeucher Nov 14, 2023
ca2f29a
Fix reference datasets names
rbeucher Nov 14, 2023
1327ec7
Update AIRS reference dataset
rbeucher Nov 14, 2023
c4b0d79
Merge branch 'main' into esgf_recipes_perfmetrics_CMIP5
rbeucher Nov 14, 2023
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
26 changes: 10 additions & 16 deletions esmvaltool/recipes/recipe_perfmetrics_CMIP5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ diagnostics:
variables:
pr:
preprocessor: ppNOLEV1
reference_dataset: GPCP-SG
reference_dataset: GPCP-V2.2
mip: Amon
project: CMIP5
exp: historical
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions esmvaltool/recipes/recipe_perfmetrics_CMIP5_4cds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1271,7 +1271,7 @@ diagnostics:
variables:
pr:
preprocessor: ppNOLEV1
reference_dataset: GPCP-SG
reference_dataset: GPCP-V2.2
mip: Amon
project: CMIP5
exp: historical
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
23 changes: 8 additions & 15 deletions esmvaltool/recipes/recipe_perfmetrics_land_CMIP5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down