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 datasets names (ESGF) in ECS recipes #3327

Merged
merged 4 commits into from Nov 9, 2023
Merged

Update Obs4MIPs datasets names (ESGF) in ECS recipes #3327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79f0432
Update Obs4MIPs datasets names (ESGF)
rbeucher Aug 14, 2023
efe2706
Update reference dataset to TRMM
rbeucher Nov 7, 2023
5dddd96
Merge branch 'main' into esgf_recipe_ecs
rbeucher Nov 7, 2023
c2bdb30
Merge branch 'main' of github.com:ESMValGroup/ESMValTool into esgf_re…
rbeucher Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions esmvaltool/recipes/recipe_ecs_constraints.yml
View file
Open in desktop
Expand Up @@ -522,9 +522,9 @@ diagnostics:
mip: Amon
start_year: 1986
end_year: 2005
reference_dataset: GPCP-SG
reference_dataset: GPCP-V2.2
additional_datasets:
- {dataset: GPCP-SG, project: obs4MIPs, level: L3, version: v2.2, tier: 1}
- {dataset: GPCP-V2.2, project: obs4MIPs, level: L3, tier: 1}
additional_datasets:
- {dataset: ACCESS1-0}
- {dataset: ACCESS1-3}
Expand Down Expand Up @@ -593,9 +593,9 @@ diagnostics:
mip: Amon
start_year: 2003
end_year: 2005
reference_dataset: AIRS
reference_dataset: AIRS-2-1
additional_datasets:
- {dataset: AIRS, project: obs4MIPs, level: L3, version: RetStd-v5, tier: 1}
- {dataset: AIRS-2-1, project: obs4MIPs, level: L3, tier: 1}
additional_datasets:
- {dataset: ACCESS1-0}
- {dataset: ACCESS1-3}
Expand Down Expand Up @@ -755,7 +755,7 @@ diagnostics:
end_year: 2005
reference_dataset: CERES-EBAF
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1}
rsutcs:
<<: *var_settings_cmip5
preprocessor: default
Expand All @@ -764,7 +764,7 @@ diagnostics:
end_year: 2005
reference_dataset: CERES-EBAF
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1}
rsdt:
<<: *var_settings_cmip5
preprocessor: default
Expand All @@ -773,7 +773,7 @@ diagnostics:
end_year: 2005
reference_dataset: CERES-EBAF
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1}
additional_datasets:
- {dataset: ACCESS1-0}
- {dataset: ACCESS1-3}
Expand Down Expand Up @@ -1175,9 +1175,9 @@ diagnostics:
exp: [historical, rcp85]
start_year: 2005
end_year: 2010
reference_dataset: 'AIRS-2-0|MLS-AURA'
reference_dataset: AIRS-2-0|MLS-AURA
additional_datasets:
- {dataset: AIRS-2-0, project: obs4MIPs, level: L3, version: v2, tier: 1}
- {dataset: AIRS-2-0, project: obs4MIPs, level: L3, tier: 1}
- {dataset: MLS-AURA, project: OBS6, type: sat, version: '004', tier: 3}
additional_datasets:
- {dataset: ACCESS1-0}
Expand Down
57 changes: 25 additions & 32 deletions esmvaltool/recipes/recipe_ecs_scatter.yml
View file
Open in desktop
Expand Up @@ -126,14 +126,14 @@ diagnostics:
- atmos
variables:
pr:
reference_dataset: TRMM-L3
reference_dataset: TRMM
mip: Amon
exp: historical
start_year: 1986
end_year: 2005
project: CMIP5
additional_datasets:
- {dataset: TRMM-L3, project: obs4MIPs, level: v7, version: 7A,
- {dataset: TRMM, project: obs4MIPs, level: v7,
start_year: 1998, end_year: 2013, tier: 1}
- {dataset: ACCESS1-0, ensemble: r1i1p1}
# - {dataset: ACCESS1-3, ensemble: r1i1p1}
Expand Down Expand Up @@ -162,11 +162,11 @@ diagnostics:
- {dataset: MRI-CGCM3, ensemble: r1i1p1}
- {dataset: NorESM1-M, ensemble: r1i1p1}
prStderr:
reference_dataset: TRMM-L3
reference_dataset: TRMM
mip: Amon
frequency: mon
additional_datasets:
- {dataset: TRMM-L3, project: obs4MIPs, level: v7, version: 7A,
- {dataset: TRMM, project: obs4MIPs, level: v7,
start_year: 1998, end_year: 2013, tier: 1}
scripts:
ecs_scatter:
Expand All @@ -188,14 +188,14 @@ diagnostics:
variables:
hus:
preprocessor: pp500
reference_dataset: AIRS
reference_dataset: AIRS-2-1
mip: Amon
exp: historical
start_year: 1986
end_year: 2005
project: CMIP5
additional_datasets:
- {dataset: AIRS, project: obs4MIPs, level: L3, version: RetStd-v5,
- {dataset: AIRS-2-1, project: obs4MIPs, level: L3,
start_year: 2003, end_year: 2010, tier: 1}
- {dataset: ACCESS1-0, ensemble: r1i1p1}
# - {dataset: ACCESS1-3, ensemble: r1i1p1}
Expand Down Expand Up @@ -225,11 +225,11 @@ diagnostics:
- {dataset: NorESM1-M, ensemble: r1i1p1}
husStderr:
preprocessor: pp500
reference_dataset: AIRS
reference_dataset: AIRS-2-1
mip: Amon
frequency: mon
additional_datasets:
- {dataset: AIRS, project: obs4MIPs, level: L3, version: RetStd-v5,
- {dataset: AIRS-2-1, project: obs4MIPs, level: L3,
start_year: 2003, end_year: 2010, tier: 1}
scripts:
ecs_scatter:
Expand Down Expand Up @@ -396,24 +396,24 @@ diagnostics:
exp: historical
project: CMIP5
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7,
start_year: 2001, end_year: 2005, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, start_year: 2001, end_year: 2005,
tier: 1}
rsutcs:
reference_dataset: CERES-EBAF
mip: Amon
exp: historical
project: CMIP5
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7,
start_year: 2001, end_year: 2005, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, start_year: 2001, end_year: 2005,
tier: 1}
rsdt:
reference_dataset: CERES-EBAF
mip: Amon
exp: historical
project: CMIP5
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, version: Ed2-7,
start_year: 2001, end_year: 2005, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, start_year: 2001, end_year: 2005,
tier: 1}
scripts:
ecs_scatter:
diag: covrefl
Expand All @@ -433,15 +433,14 @@ diagnostics:
- atmos
variables:
pr:
reference_dataset: TRMM-L3
reference_dataset: TRMM
start_year: 1998
end_year: 2013
exp: historical
mip: Amon
project: CMIP6
additional_datasets:
- {dataset: TRMM-L3, project: obs4MIPs, level: v7,
version: 7A, tier: 1}
- {dataset: TRMM, project: obs4MIPs, level: v7, tier: 1}
- {dataset: BCC-CSM2-MR, grid: gn, ensemble: r1i1p1f1}
- {dataset: BCC-ESM1, grid: gn, ensemble: r1i1p1f1}
- {dataset: CAMS-CSM1-0, grid: gn, ensemble: r1i1p1f1}
Expand All @@ -457,14 +456,13 @@ diagnostics:
- {dataset: MIROC6, grid: gn, ensemble: r1i1p1f1}
- {dataset: MRI-ESM2-0, grid: gn, ensemble: r1i1p1f1}
prStderr:
reference_dataset: TRMM-L3
reference_dataset: TRMM
mip: Amon
frequency: mon
start_year: 1998
end_year: 2013
additional_datasets:
- {dataset: TRMM-L3, project: obs4MIPs, level: v7,
version: 7A, tier: 1}
- {dataset: TRMM, project: obs4MIPs, level: v7, tier: 1}
scripts:
ecs_scatter:
diag: itczidx
Expand All @@ -484,15 +482,14 @@ diagnostics:
variables:
hus:
preprocessor: pp500
reference_dataset: AIRS
reference_dataset: AIRS-2-1
start_year: 2003
end_year: 2010
exp: historical
mip: Amon
project: CMIP6
additional_datasets:
- {dataset: AIRS, project: obs4MIPs, level: L3,
version: RetStd-v5, tier: 1}
- {dataset: AIRS-2-1, project: obs4MIPs, level: L3, tier: 1}
- {dataset: BCC-CSM2-MR, grid: gn, ensemble: r1i1p1f1}
- {dataset: BCC-ESM1, grid: gn, ensemble: r1i1p1f1}
- {dataset: CAMS-CSM1-0, grid: gn, ensemble: r1i1p1f1}
Expand All @@ -509,14 +506,13 @@ diagnostics:
- {dataset: MRI-ESM2-0, grid: gn, ensemble: r1i1p1f1}
husStderr:
preprocessor: pp500
reference_dataset: AIRS
reference_dataset: AIRS-2-1
mip: Amon
frequency: mon
start_year: 2003
end_year: 2010
additional_datasets:
- {dataset: AIRS, project: obs4MIPs, level: L3,
version: RetStd-v5, tier: 1}
- {dataset: AIRS-2-1, project: obs4MIPs, level: L3, tier: 1}
scripts:
ecs_scatter:
diag: humidx
Expand Down Expand Up @@ -689,8 +685,7 @@ diagnostics:
mip: Amon
project: CMIP6
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B,
version: Ed2-7, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1}
- {dataset: BCC-CSM2-MR, grid: gn, ensemble: r1i1p1f1}
- {dataset: BCC-ESM1, grid: gn, ensemble: r2i1p1f1}
# - {dataset: CAMS-CSM1-0, grid: gn, ensemble: r1i1p1f1}
Expand All @@ -713,8 +708,7 @@ diagnostics:
mip: Amon
project: CMIP6
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B,
version: Ed2-7, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1}
- {dataset: BCC-CSM2-MR, grid: gn, ensemble: r1i1p1f1}
- {dataset: BCC-ESM1, grid: gn, ensemble: r2i1p1f1}
# - {dataset: CAMS-CSM1-0, grid: gn, ensemble: r1i1p1f1}
Expand All @@ -737,8 +731,7 @@ diagnostics:
mip: Amon
project: CMIP6
additional_datasets:
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B,
version: Ed2-7, tier: 1}
- {dataset: CERES-EBAF, project: obs4MIPs, level: L3B, tier: 1}
- {dataset: BCC-CSM2-MR, grid: gn, ensemble: r1i1p1f1}
- {dataset: BCC-ESM1, grid: gn, ensemble: r2i1p1f1}
# - {dataset: CAMS-CSM1-0, grid: gn, ensemble: r1i1p1f1}
Expand Down