Skip to content

Diag table updates (#308) #319

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
alperaltuntas wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Diag table updates (#308) #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4db71c6
Add diag_table changes as described in Issue #308
alperaltuntas Apr 2, 2026
01afabe
formatting
alperaltuntas Apr 2, 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
49 changes: 38 additions & 11 deletions param_templates/diag_table.yaml
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@iangrooms iangrooms Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as for diag_table.json about the CMOR names and BS_coeff_h.

Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
###############################################################################
---
FieldLists:
- &prognostic ["uo", "vo", "h", "e", "thetao", "so", "KE", "MEKE", "rhopot0", "rhopot2", "difvho", "difvso", "Kv_u", "Kv_v", "taux_bot", "tauy_bot"]
- &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", "difvho", "difvso", "Kv_u", "Kv_v"]
- &prognostic_z ["uo", "vo", "h", "thetao", "so", "agessc", "rhopot0", "N2_int", "rhopot2",
"difvho", "difvso", "Kv_u", "Kv_v"]

- &prognostic_rho2 ["thetao", "so", "agessc", "e"]

Expand All @@ -28,20 +30,24 @@ FieldLists:

- &forcing_flds ["tauuo", "tauvo", "friver", "prsn", "prlq", "evs", "hfsso", "rlntds",
"hfsnthermds", "sfdsi", "rsntds", "hfds", "ustar",
"hfsifrazil", "wfo", "vprec", "ficeberg", "fsitherm",
"hflso", "pso", "seaice_melt_heat", "Heat_PmE", "salt_flux_added"]
"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_vprec", "heat_content_cond",
- &enthalpy_flds ["heat_content_lrunoff", "heat_content_frunoff", "heat_content_lprec",
"heat_content_fprec", "heat_content_cond",
"heat_content_evap"]

- &forcing_flds_dev ["net_heat_coupler", "LwLatSens", "heat_content_lrunoff",
"heat_content_frunoff", "heat_content_lprec",
"heat_content_fprec", "heat_content_vprec", "heat_content_cond",
"heat_content_fprec", "heat_content_cond",
"hfevapds", "heat_content_surfwater",
"vprec_global_adjustment", "net_fresh_water_global_adjustment",
"salt_flux_global_restoring_adjustment", "net_massout", "net_massin"]

- &forcing_flds_b ["heat_content_frunoff_glc"]

- &forcing_flds_cg ["heat_content_vprec", "vprec", "salt_flux_added"]

- &visc_flds ["diftrelo", "diftrblo", "difmxybo", "difmxylo"]

- &static_flds ["geolon", "geolat", "geolon_c", "geolat_c", "geolon_u", "geolat_u",
Expand All @@ -64,7 +70,16 @@ FieldLists:

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

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

- &cmip7_native ["FrictWorkIntz", "hfibthermds", "mlotstsq", "pbo", "S_adx_2d", "S_ady_2d", "sob",
"sossq", "tob", "tossq", "zos", "zossq"]

- &cmip7_z ["Khh", "Ahh", "KHTH_t", "KHTR_h", "diabatic_heat_tendency", "T_advection_xy",
"Th_tendency", "diabatic_salt_tendency", "S_advection_xy", "Sh_tendency", "rsdoabsorb"]

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

###############################################################################
# Section 2: File lists:
Expand Down Expand Up @@ -129,7 +144,9 @@ Files:
*forcing_flds,
*enthalpy_flds,
*surface_flds_common,
*surface_flds_monthly]
*surface_flds_monthly,
*cmip7_native,
["skeb_amp"]]
lists3:
$USE_CFC_CAP == "True":
[ *cfc_2d ]
Expand All @@ -139,6 +156,12 @@ Files:
lists5:
$TEST == True:
[ *kpp_test ]
lists6:
$COMP_ATM == "cam":
[ *forcing_flds_b ]
else:
[ *forcing_flds_cg ]


# essential variable mapped to z_space
hist_z_space:
Expand All @@ -162,7 +185,9 @@ Files:
packing: = 1 if $TEST else 2
lists:
[ *prognostic_z,
*transports ]
*transports,
*cmip7_z,
]
lists2:
$USE_CFC_CAP == "True":
[ *cfc_3d ]
Expand All @@ -188,7 +213,9 @@ Files:
packing: = 1 if $TEST else 2
lists: [ *surface_flds_common,
*surface_flds_daily,
*kpp_diags ]
*kpp_diags,
*cmip7_sfc
]
forcing_avg:
suffix:
$TEST == True: "h.frc%4yr-%2mo-%2dy"
Expand Down
107 changes: 94 additions & 13 deletions param_templates/json/diag_table.json
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@iangrooms iangrooms Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my issue I listed Ahh, Khh, KHTH_t, and KHTR_h. Those are the MOM6 names, but I think they have CMOR names. Should we put the CMOR names here? The CMOR equivalents are
Ahh = difmxybo
Khh = difmxylo
KHTH_t = diftrblo
KHTR_h = diftelo
Also, we are using Leith+E backscatter by default, so we should save the coefficient BS_coeff_h in the native file.

Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,18 @@
"ustar",
"hfsifrazil",
"wfo",
"vprec",
"ficeberg",
"fsitherm",
"hflso",
"pso",
"seaice_melt_heat",
"Heat_PmE",
"salt_flux_added"
"Heat_PmE"
],
[
"heat_content_lrunoff",
"heat_content_frunoff",
"heat_content_lprec",
"heat_content_fprec",
"heat_content_vprec",
"heat_content_cond",
"heat_content_evap"
],
Expand All @@ -130,7 +127,6 @@
"heat_content_frunoff",
"heat_content_lprec",
"heat_content_fprec",
"heat_content_vprec",
"heat_content_cond",
"hfevapds",
"heat_content_surfwater",
Expand All @@ -140,6 +136,14 @@
"net_massout",
"net_massin"
],
[
"heat_content_frunoff_glc"
],
[
"heat_content_vprec",
"vprec",
"salt_flux_added"
],
[
"diftrelo",
"diftrblo",
Expand Down Expand Up @@ -219,6 +223,39 @@
"KPP_NLT_dSdt",
"KPP_NLT_temp_budget",
"KPP_NLT_saln_budget"
],
[
"FrictWorkIntz",
"hfibthermds",
"mlotstsq",
"pbo",
"S_adx_2d",
"S_ady_2d",
"sob",
"sossq",
"tob",
"tossq",
"zos",
"zossq"
],
[
"Khh",
"Ahh",
"KHTH_t",
"KHTR_h",
"diabatic_heat_tendency",
"T_advection_xy",
"Th_tendency",
"diabatic_salt_tendency",
"S_advection_xy",
"Sh_tendency",
"rsdoabsorb"
],
[
"tossq",
"rsdo",
"T_adx_2d",
"T_ady_2d"
]
],
"Files": {
Expand Down Expand Up @@ -370,21 +407,18 @@
"ustar",
"hfsifrazil",
"wfo",
"vprec",
"ficeberg",
"fsitherm",
"hflso",
"pso",
"seaice_melt_heat",
"Heat_PmE",
"salt_flux_added"
"Heat_PmE"
],
[
"heat_content_lrunoff",
"heat_content_frunoff",
"heat_content_lprec",
"heat_content_fprec",
"heat_content_vprec",
"heat_content_cond",
"heat_content_evap"
],
Expand All @@ -410,6 +444,23 @@
"sss_global",
"SSH",
"mass_wt"
],
[
"FrictWorkIntz",
"hfibthermds",
"mlotstsq",
"pbo",
"S_adx_2d",
"S_ady_2d",
"sob",
"sossq",
"tob",
"tossq",
"zos",
"zossq"
],
[
"skeb_amp"
]
]
},
Expand Down Expand Up @@ -442,6 +493,20 @@
"KPP_NLT_saln_budget"
]
]
},
"lists6": {
"$COMP_ATM == \"cam\"": [
[
"heat_content_frunoff_glc"
]
],
"else": [
[
"heat_content_vprec",
"vprec",
"salt_flux_added"
]
]
}
}
}
Expand Down Expand Up @@ -492,6 +557,19 @@
"umo",
"uhGM",
"uhml"
],
[
"Khh",
"Ahh",
"KHTH_t",
"KHTR_h",
"diabatic_heat_tendency",
"T_advection_xy",
"Th_tendency",
"diabatic_salt_tendency",
"S_advection_xy",
"Sh_tendency",
"rsdoabsorb"
]
],
"lists2": {
Expand Down Expand Up @@ -553,6 +631,12 @@
"KPP_OBLdepth:oml",
"KPP_OBLdepth:oml_min:min",
"KPP_OBLdepth:oml_max:max"
],
[
"tossq",
"rsdo",
"T_adx_2d",
"T_ady_2d"
]
]
}
Expand Down Expand Up @@ -597,14 +681,12 @@
"ustar",
"hfsifrazil",
"wfo",
"vprec",
"ficeberg",
"fsitherm",
"hflso",
"pso",
"seaice_melt_heat",
"Heat_PmE",
"salt_flux_added"
"Heat_PmE"
],
[
"net_heat_coupler",
Expand All @@ -613,7 +695,6 @@
"heat_content_frunoff",
"heat_content_lprec",
"heat_content_fprec",
"heat_content_vprec",
"heat_content_cond",
"hfevapds",
"heat_content_surfwater",
Expand Down
Loading