Skip to content

Update MOM diagnostics for CMIP7 #346

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

Merged
alperaltuntas merged 7 commits into from
Sep 8, 2026
Merged

Update MOM diagnostics for CMIP7 #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4865d9c
Update MOM diagnostics for CMIP7
iangrooms Sep 4, 2026
479f136
Update param_templates/diag_table.yaml
iangrooms Sep 8, 2026
00f958a
Update param_templates/diag_table.yaml
iangrooms Sep 8, 2026
c6b45f3
Update param_templates/diag_table.yaml
iangrooms Sep 8, 2026
ddcc61c
Update param_templates/diag_table.yaml
iangrooms Sep 8, 2026
0c47835
Update param_templates/diag_table.yaml
iangrooms Sep 8, 2026
14afc89
json
iangrooms Sep 8, 2026
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
31 changes: 20 additions & 11 deletions param_templates/diag_table.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FieldLists:
- &prognostic ["uo", "vo", "h", "e", "thetao", "so", "KE", "MEKE", "rhopot0", "rhopot2",
"difvho", "difvso", "Kv_u", "Kv_v", "taux_bot", "tauy_bot"]

- &prognostic_z ["uo", "vo", "h", "thetao", "so", "agessc", "rhopot0", "N2_int", "rhopot2",
- &prognostic_z ["uo", "vo", "h", "thetao", "so", "agessc", "rhopot0", "obvfsq", "rhopot2",
"difvho", "difvso", "Kv_u", "Kv_v"]

- &prognostic_rho2 ["thetao", "so", "agessc", "e"]
Expand All @@ -19,7 +19,7 @@ FieldLists:

- &surface_flds_common ["tos", "tos:tos_min:min", "tos:tos_max:max",
"sos", "sos:sos_min:min", "sos:sos_max:max",
"SSU", "SSV", "opottempmint", "somint", "Rd_dx", "speed",
"SSU:uos", "SSV:vos", "opottempmint", "somint", "Rd_dx", "speed",
"mlotst", "mlotst:mlotst_min:min", "mlotst:mlotst_max:max"]

- &surface_flds_daily ["zos", "zossq"]
Expand All @@ -33,9 +33,9 @@ FieldLists:
"hfsifrazil", "wfo", "ficeberg", "fsitherm",
"hflso", "pso", "seaice_melt_heat", "Heat_PmE"]

- &enthalpy_flds ["heat_content_lrunoff", "heat_content_frunoff", "heat_content_lprec",
"heat_content_fprec", "heat_content_cond",
"heat_content_evap"]
- &enthalpy_flds ["heat_content_lrunoff:hfrunoffds", "heat_content_frunoff",
"heat_content_lprec:hfrainds", "heat_content_fprec",
"heat_content_cond", "heat_content_evap:hfevapds"]

- &forcing_flds_dev ["net_heat_coupler", "LwLatSens", "heat_content_lrunoff",
"heat_content_frunoff", "heat_content_lprec",
Expand All @@ -54,7 +54,8 @@ FieldLists:
"geolon_v", "geolat_v", "deptho", "wet", "wet_c", "wet_u",
"wet_v", "Coriolis", "areacello", "areacello_cu", "areacello_cv",
"areacello_bu", "sin_rot", "cos_rot", "cpocean", "rhozero", "skeb_taper_v",
"skeb_taper_u"]
"skeb_taper_u", "dxt:dxto", "dxCu:dxuo", "dxCv:dxvo",
"dyt:dyto", "dyCu:dyuo", "dyCv:dyvo", "sftof"]

- &transports ["volcello", "vmo", "vhGM", "vhml", "umo", "uhGM", "uhml"]

Expand All @@ -66,20 +67,24 @@ FieldLists:

- &cfc_2d ["cfc11_flux", "cfc12_flux", "ice_fraction", "u10_sqr"]

- &geothermal ["Geo_heat"]
- &geothermal ["hfgeou"]

- &glc_terms ["frunoff_glc", "lrunoff_glc"]
- &glc_terms ["frunoff_glc", "lrunoff_glc:flandice"]

- &kpp_test ["KPP_QminusSW", "KPP_netSalt", "KPP_NLT_dTdt", "KPP_NLT_dSdt", "KPP_NLT_temp_budget",
"KPP_NLT_saln_budget"]

- &cmip7_native ["dispkexyfo", "hfibthermds", "mlotstsq", "pbo", "S_adx_2d", "S_ady_2d", "sob",
"sossq", "tob", "tossq", "zos", "zossq", "BS_coeff_h"]
- &cmip7_native ["dispkexyfo", "hfibthermds", "masso", "mlotstsq", "pbo",
"S_adx_2d", "S_ady_2d", "sob", "sossq", "t17d", "t20d",
"tnkebto", "tob", "tossq", "volo", "zos", "zossq",
"BS_coeff_h"]

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

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

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

###############################################################################
# Section 2: Defaults for all files, unless overridden in the file entry.
Expand Down Expand Up @@ -161,6 +166,10 @@ Files:
[ *forcing_flds_b ]
else:
[ *forcing_flds_cg ]
lists7:
$OCN_DIAG_MODE not in ["spinup", "none"] and $COMP_WAV == "ww3" and $MOM6_WW3_CPL_METHOD != "none":
$WAVE_METHOD == "SURFACE_BANDS":
[ *cmip7_wave ]

# essential variables mapped to z space
h.z:
Expand Down
100 changes: 70 additions & 30 deletions param_templates/json/diag_table.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"so",
"agessc",
"rhopot0",
"N2_int",
"obvfsq",
"rhopot2",
"difvho",
"difvso",
Expand Down Expand Up @@ -64,8 +64,8 @@
"sos",
"sos:sos_min:min",
"sos:sos_max:max",
"SSU",
"SSV",
"SSU:uos",
"SSV:vos",
"opottempmint",
"somint",
"Rd_dx",
Expand Down Expand Up @@ -113,12 +113,12 @@
"Heat_PmE"
],
[
"heat_content_lrunoff",
"heat_content_lrunoff:hfrunoffds",
"heat_content_frunoff",
"heat_content_lprec",
"heat_content_lprec:hfrainds",
"heat_content_fprec",
"heat_content_cond",
"heat_content_evap"
"heat_content_evap:hfevapds"
],
[
"net_heat_coupler",
Expand Down Expand Up @@ -174,7 +174,14 @@
"cpocean",
"rhozero",
"skeb_taper_v",
"skeb_taper_u"
"skeb_taper_u",
"dxt:dxto",
"dxCu:dxuo",
"dxCv:dxvo",
"dyt:dyto",
"dyCu:dyuo",
"dyCv:dyvo",
"sftof"
],
[
"volcello",
Expand Down Expand Up @@ -210,11 +217,11 @@
"u10_sqr"
],
[
"Geo_heat"
"hfgeou"
],
[
"frunoff_glc",
"lrunoff_glc"
"lrunoff_glc:flandice"
],
[
"KPP_QminusSW",
Expand All @@ -227,14 +234,19 @@
[
"dispkexyfo",
"hfibthermds",
"masso",
"mlotstsq",
"pbo",
"S_adx_2d",
"S_ady_2d",
"sob",
"sossq",
"t17d",
"t20d",
"tnkebto",
"tob",
"tossq",
"volo",
"zos",
"zossq",
"BS_coeff_h"
Expand All @@ -252,7 +264,12 @@
"tossq",
"rsdo",
"T_adx_2d",
"T_ady_2d"
"T_ady_2d",
"t20d"
],
[
"surface_stokes_x:sduo",
"surface_stokes_y:sdvo"
]
],
"FileDefaults": {
Expand Down Expand Up @@ -388,12 +405,12 @@
"Heat_PmE"
],
[
"heat_content_lrunoff",
"heat_content_lrunoff:hfrunoffds",
"heat_content_frunoff",
"heat_content_lprec",
"heat_content_lprec:hfrainds",
"heat_content_fprec",
"heat_content_cond",
"heat_content_evap"
"heat_content_evap:hfevapds"
],
[
"tos",
Expand All @@ -402,8 +419,8 @@
"sos",
"sos:sos_min:min",
"sos:sos_max:max",
"SSU",
"SSV",
"SSU:uos",
"SSV:vos",
"opottempmint",
"somint",
"Rd_dx",
Expand All @@ -421,14 +438,19 @@
[
"dispkexyfo",
"hfibthermds",
"masso",
"mlotstsq",
"pbo",
"S_adx_2d",
"S_ady_2d",
"sob",
"sossq",
"t17d",
"t20d",
"tnkebto",
"tob",
"tossq",
"volo",
"zos",
"zossq",
"BS_coeff_h"
Expand Down Expand Up @@ -485,12 +507,12 @@
"Heat_PmE"
],
[
"heat_content_lrunoff",
"heat_content_lrunoff:hfrunoffds",
"heat_content_frunoff",
"heat_content_lprec",
"heat_content_lprec:hfrainds",
"heat_content_fprec",
"heat_content_cond",
"heat_content_evap"
"heat_content_evap:hfevapds"
],
[
"tos",
Expand All @@ -499,8 +521,8 @@
"sos",
"sos:sos_min:min",
"sos:sos_max:max",
"SSU",
"SSV",
"SSU:uos",
"SSV:vos",
"opottempmint",
"somint",
"Rd_dx",
Expand Down Expand Up @@ -531,7 +553,7 @@
"$COMP_ATM == \"cam\"": [
[
"frunoff_glc",
"lrunoff_glc"
"lrunoff_glc:flandice"
]
]
},
Expand Down Expand Up @@ -560,6 +582,16 @@
"salt_flux_added"
]
]
},
"lists7": {
"$OCN_DIAG_MODE not in [\"spinup\", \"none\"] and $COMP_WAV == \"ww3\" and $MOM6_WW3_CPL_METHOD != \"none\"": {
"$WAVE_METHOD == \"SURFACE_BANDS\"": [
[
"surface_stokes_x:sduo",
"surface_stokes_y:sdvo"
]
]
}
}
}
}
Expand All @@ -578,7 +610,7 @@
"so",
"agessc",
"rhopot0",
"N2_int",
"obvfsq",
"rhopot2",
"difvho",
"difvso",
Expand All @@ -604,7 +636,7 @@
"so",
"agessc",
"rhopot0",
"N2_int",
"obvfsq",
"rhopot2",
"difvho",
"difvso",
Expand Down Expand Up @@ -671,8 +703,8 @@
"sos",
"sos:sos_min:min",
"sos:sos_max:max",
"SSU",
"SSV",
"SSU:uos",
"SSV:vos",
"opottempmint",
"somint",
"Rd_dx",
Expand All @@ -699,8 +731,8 @@
"sos",
"sos:sos_min:min",
"sos:sos_max:max",
"SSU",
"SSV",
"SSU:uos",
"SSV:vos",
"opottempmint",
"somint",
"Rd_dx",
Expand All @@ -722,7 +754,8 @@
"tossq",
"rsdo",
"T_adx_2d",
"T_ady_2d"
"T_ady_2d",
"t20d"
]
]
}
Expand Down Expand Up @@ -823,13 +856,20 @@
"cpocean",
"rhozero",
"skeb_taper_v",
"skeb_taper_u"
"skeb_taper_u",
"dxt:dxto",
"dxCu:dxuo",
"dxCv:dxvo",
"dyt:dyto",
"dyCu:dyuo",
"dyCv:dyvo",
"sftof"
]
],
"lists2": {
"$DO_GEOTHERMAL == \"True\"": [
[
"Geo_heat"
"hfgeou"
]
]
}
Expand Down
Loading