Skip to content

Update MOM diagnostics for CMIP7 #354

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

Draft
chengz2 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update MOM diagnostics for CMIP7 #354

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
2 changes: 1 addition & 1 deletion cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

<entry id="OCN_DIAG_MODE">
<type>char</type>
<valid_values>spinup,production,development,none</valid_values>
<valid_values>spinup,production,development,cmip7,none</valid_values>
<default_value>production</default_value>
<group>run_component_mom</group>
<file>env_run.xml</file>
Expand Down
51 changes: 45 additions & 6 deletions param_templates/diag_table.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,36 @@ FieldLists:
"tnkebto", "tob", "tossq", "volo", "zos", "zossq",
"BS_coeff_h"]

- &cmip7_native_2d ["dispkexyfo", "hfibthermds", "masso", "mlotstsq", "tnkebto",
"pbo", "sob", "tob", "t17d", "volo", "soga", "thetaoga",
"tosga", "sosga", "SSH", "T_diffy_2d", "T_hbd_diffy_2d"]

- &cmip7_z ["opottempdiff", "T_advection_xy", "opottemptend", "osaltdiff",
"S_advection_xy", "osalttend", "rsdoabsorb"]

- &cmip7_z_3d ["opottempdiff", "opottemptend", "osaltdiff",
"osalttend", "rsdoabsorb", "BS_coeff_h"]

- &cmip7_sfc ["tossq", "rsdo", "T_adx_2d", "T_ady_2d", "t20d"]

- &cmip7_sfc_common ["tos", "tossq", "sos", "sossq", "zos", "zossq",
"SSU:uos", "SSV:vos", "opottempmint", "somint", "speed",
"mlotst", "mlotst:mlotst_min:min", "mlotst:mlotst_max:max",
"KPP_OBLdepth:oml", "rsdo", "T_ady_2d", "t20d"]

- &cmip7_wave ["surface_stokes_x:sduo", "surface_stokes_y:sdvo"]

- &cmip7_prog_z ["uo", "vo", "h", "thetao", "so", "agessc", "obvfsq", "difvho", "difvso"]

- &cmip7_transports ["volcello", "vmo", "vhGM", "vhml", "umo"]

- &cmip7_forcing_enthalpy ["tauuo", "tauvo", "ficeberg", "friver", "fsitherm",
"hfds", "hflso", "hfsnthermds", "rsntds", "sfdsi",
"pso", "wfo", "seaice_melt_heat", "Heat_PmE",
"heat_content_lrunoff:hfrunoffds",
"heat_content_lprec:hfrainds",
"heat_content_evap:hfevapds"]

###############################################################################
# Section 2: Defaults for all files, unless overridden in the file entry.
###############################################################################
Expand Down Expand Up @@ -119,8 +142,13 @@ Files:
fields:
$OCN_DIAG_MODE != "none":
module: "ocean_model_rho2"
lists: [ *transports,
*prognostic_rho2 ]
lists:
$OCN_DIAG_MODE == "cmip7":
[ *cmip7_transports,
*prognostic_rho2 ]
else:
[ *transports,
*prognostic_rho2 ]
lists2:
$USE_CFC_CAP == "True":
[ *cfc_3d ]
Expand All @@ -131,12 +159,17 @@ Files:
$OCN_DIAG_MODE != "none":
module: "ocean_model"
lists:
$OCN_DIAG_MODE == "cmip7":
[ *cmip7_sfc_common,
*cmip7_native_2d,
*cmip7_forcing_enthalpy ]
else:
[ *hist_additional,
*tracers,
*visc_flds,
*transports ]
lists2:
$OCN_DIAG_MODE not in ["spinup", "none"]:
$OCN_DIAG_MODE not in ["spinup", "cmip7", "none"]:
[ *prognostic,
*kpp_diags,
*forcing_flds,
Expand All @@ -151,7 +184,7 @@ Files:
*forcing_flds,
*enthalpy_flds,
*surface_flds_common,
*surface_flds_monthly]
*surface_flds_monthly ]
lists3:
$USE_CFC_CAP == "True":
[ *cfc_2d ]
Expand Down Expand Up @@ -180,12 +213,16 @@ Files:
$OCN_DIAG_MODE == "spinup":
[ *prognostic_z,
*transports ]
$OCN_DIAG_MODE == "cmip7":
[ *cmip7_prog_z,
*cmip7_transports,
*cmip7_z_3d,
*visc_flds ]
else:
[ *prognostic_z,
*transports,
*visc_flds,
*cmip7_z,
]
*cmip7_z ]
lists2:
$USE_CFC_CAP == "True":
[ *cfc_3d ]
Expand All @@ -209,6 +246,8 @@ Files:
[ *surface_flds_common,
*surface_flds_daily,
*kpp_diags ]
$OCN_DIAG_MODE == "cmip7":
[ *cmip7_sfc_common ]
else:
[ *surface_flds_common,
*surface_flds_daily,
Expand Down
Loading