Skip to content

Update REF ENSO recipes for CMIP7 #4470

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

Open
flicj191 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update REF ENSO recipes for CMIP7 #4470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions esmvaltool/diag_scripts/enso_metrics/climatology_diagnostic1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ def main(cfg):
prov = provenance_record(grp, list(cfg["input_data"].keys()))
for metadata in var_attr:
logger.info("iterate though datasets\n %s", pformat(metadata))
if metadata["project"] == "CMIP6":
if metadata["project"].startswith("CMIP"):
pairs.append(metadata)
fig, filename, rmse = plot_level1(pairs, cfg, prov)

logger.info("metric %s", rmse)
save_figure(
"_".join(filename),
prov,
Expand Down
2 changes: 1 addition & 1 deletion esmvaltool/diag_scripts/enso_metrics/climatology_diagnosticlevel2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ def main(cfg):
# create pairs, add obs first to list
pairs = [var_attr[-1]]
logger.info("iterate though datasets\n %s", pformat(metadata))
if metadata["project"] == "CMIP6":
if metadata["project"].startswith("CMIP"):
pairs.append(metadata)
fig = plotmaps_level2(pairs, grp)
filename = "_".join(
Expand Down
2 changes: 1 addition & 1 deletion esmvaltool/diag_scripts/enso_metrics/climatology_diagnosticlevel3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def main(cfg):
# create pairs, add obs first to list
pairs = [var_attr[-1]]
logger.info("iterate though datasets\n %s", pformat(metadata))
if metadata["project"] == "CMIP6":
if metadata["project"].startswith("CMIP"):
pairs.append(metadata)
fig = plotmaps_level3(pairs, itcz=False)
# save_plotdata(data_cubes, grp, pairs, cfg)
Expand Down
10 changes: 10 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/enso_diag1metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,11 +549,21 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP6",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP7",
)

group_obs_models(obs, models, metric, var_preproc, cfg)

Expand Down
10 changes: 10 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/enso_divedowns/ampseasskew_1113.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,21 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP6",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP7",
)

# log
msg = f"{metric} : observation datasets {len(obs)}, models {pformat(models)}"
Expand Down
10 changes: 10 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/enso_divedowns/durdiver_1415.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,21 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP6",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP7",
)

msg = (
f"{metric} : observation datasets {len(obs)}, models {len(models)}"
Expand Down
10 changes: 10 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/enso_divedowns/lifecycle_10.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,21 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP6",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP7",
)

# log
msg = (
Expand Down
10 changes: 10 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/enso_divedowns/pattern_9.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,21 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP6",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP7",
)

msg = f"{metric} : observation datasets {len(obs)}, models {pformat(models)}"
logger.info(msg)
Expand Down
10 changes: 10 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/feedback/feedback_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,11 +416,21 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP6",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP7",
)

# log
msg = (
Expand Down
10 changes: 10 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/feedback/feedback_metrics_lvl4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,21 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP6",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP7",
)

# log
msg = (
Expand Down
2 changes: 2 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/feedback/feedback_nhf_lvl3_4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,9 @@ def main(cfg):

obs += select_metadata(input_data, project="OBS")
obs += select_metadata(input_data, project="OBS6")
obs += select_metadata(input_data, project="obs4MIPs")
models += select_metadata(input_data, project="CMIP6")
models += select_metadata(input_data, project="CMIP7")

# log
msg = f"{metric} : observation datasets {len(obs)}, models {len(models)}"
Expand Down
2 changes: 2 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/feedback/feedback_nhf_metric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ def main(cfg):

obs += select_metadata(input_data, project="OBS")
obs += select_metadata(input_data, project="OBS6")
obs += select_metadata(input_data, project="obs4MIPs")
models += select_metadata(input_data, project="CMIP6")
models += select_metadata(input_data, project="CMIP7")

# log
msg = f"{metric} : observation datasets {len(obs)}, models {len(models)}"
Expand Down
10 changes: 10 additions & 0 deletions esmvaltool/diag_scripts/enso_metrics/teleconnections_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,21 @@ def main(cfg):
variable_group=var_prep,
project="OBS6",
)
obs += select_metadata(
input_data,
variable_group=var_prep,
project="obs4MIPs",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP6",
)
models += select_metadata(
input_data,
variable_group=var_prep,
project="CMIP7",
)

# log
msg = (
Expand Down
59 changes: 40 additions & 19 deletions ...ipes/ref/recipe_enso_basicclimatology.yml → ...ef/recipe_enso_basicclimatology_CMIP7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@ documentation:

datasets:
## one CMIP6 model for REF ##
- {dataset: ACCESS-CM2, project: CMIP6, exp: historical, ensemble: r1i1p1f1, grid: gn, start_year: 1850, end_year: 2014}
# - {dataset: ACCESS-CM2, project: CMIP6, exp: historical, ensemble: r1i1p1f1, grid: gn, start_year: 1850, end_year: 2014}
- dataset: DUMMY-MODEL
project: CMIP7
exp: historical
ensemble: r1i1p1f3
grid: g999
activity: CMIP
institute: CCCma
frequency: mon
region: glb



Expand Down Expand Up @@ -97,49 +106,57 @@ diagnostics:
pr_double:
short_name: pr
preprocessor: ITCZ_bias
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: "GPCP-V2.3", project: obs4MIPs, tier: 1, start_year: 1979, end_year: 2017}
- {dataset: "GPCP-V3.3", project: obs4MIPs, tier: 1, start_year: 1983, end_year: 2021}
eq_pr_bias:
short_name: pr
preprocessor: eq_bias
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: "GPCP-V2.3", project: obs4MIPs, tier: 1, start_year: 1979, end_year: 2017}
- {dataset: "GPCP-V3.3", project: obs4MIPs, tier: 1, start_year: 1983, end_year: 2021}
eq_sst_bias:
short_name: tos
preprocessor: eq_bias
mip: Omon
mip: ocean
branding_suffix: tavg-u-hxy-sea
additional_datasets:
- {dataset: TROPFLUX, version: v1, project: OBS6, type: reanaly, tier: 2, start_year: 1979, end_year: 2018}
eq_tauu_bias:
short_name: tauu
preprocessor: eq_bias
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: TROPFLUX, version: v1, project: OBS6, type: reanaly, tier: 2, mip: Amon, start_year: 1979, end_year: 2018}
pr_double_seacycle:
short_name: pr
preprocessor: ITCZ_sea_cycle
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: "GPCP-V2.3", project: obs4MIPs, tier: 1, start_year: 1979, end_year: 2017}
- {dataset: "GPCP-V3.3", project: obs4MIPs, tier: 1, start_year: 1983, end_year: 2021}
eq_pr_seacycle:
short_name: pr
preprocessor: eq_sea_cycle
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: "GPCP-V2.3", project: obs4MIPs, tier: 1, start_year: 1979, end_year: 2017}
- {dataset: "GPCP-V3.3", project: obs4MIPs, tier: 1, start_year: 1983, end_year: 2021}
eq_sst_seacycle:
short_name: tos
preprocessor: eq_sea_cycle
mip: Omon
mip: ocean
branding_suffix: tavg-u-hxy-sea
additional_datasets:
- {dataset: TROPFLUX, version: v1, project: OBS6, type: reanaly, tier: 2, mip: Omon}
eq_tauu_seacycle:
short_name: tauu
preprocessor: eq_sea_cycle
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: TROPFLUX, version: v1, project: OBS6, type: reanaly, tier: 2, mip: Amon, start_year: 1979, end_year: 2018}
scripts:
Expand All @@ -152,25 +169,29 @@ diagnostics:
pr_bias:
short_name: pr
preprocessor: map_bias_level2
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: "GPCP-V2.3", project: obs4MIPs, tier: 1, start_year: 1979, end_year: 2017}
- - {dataset: "GPCP-V3.3", project: obs4MIPs, tier: 1, start_year: 1983, end_year: 2021}
pr_seacycle:
short_name: pr
preprocessor: map_sea_cyclel2
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: "GPCP-V2.3", project: obs4MIPs, tier: 1, start_year: 1979, end_year: 2017}
- - {dataset: "GPCP-V3.3", project: obs4MIPs, tier: 1, start_year: 1983, end_year: 2021}
sst_bias:
short_name: tos
preprocessor: map_bias_level2
mip: Omon
mip: ocean
branding_suffix: tavg-u-hxy-sea
additional_datasets:
- {dataset: TROPFLUX, version: v1, project: OBS6, type: reanaly, tier: 2, mip: Omon}
tauu_bias:
short_name: tauu
preprocessor: map_bias_level2
mip: Amon
mip: atmos
branding_suffix: tavg-u-hxy-u
additional_datasets:
- {dataset: TROPFLUX, version: v1, project: OBS6, type: reanaly, tier: 2, mip: Amon, start_year: 1979, end_year: 2018}

Expand Down
Loading