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

Merged
gustavo-marques merged 4 commits into from
Apr 10, 2026
Merged

Diag table updates (#308) #319

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
4db71c6
Add diag_table changes as described in Issue #308
alperaltuntas Apr 2, 2026
01afabe
formatting
alperaltuntas Apr 2, 2026
e70e703
use cmor names for newly added fields. add BS_coeff_h
alperaltuntas Apr 7, 2026
7ad5daa
use CMOR names for remaining fields
alperaltuntas Apr 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
54 changes: 41 additions & 13 deletions param_templates/diag_table.yaml
View file
Open in desktop
Comment thread
iangrooms marked this conversation as resolved.
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 @@ -22,32 +24,36 @@ FieldLists:

- &surface_flds_daily ["zos", "zossq"]

- &surface_flds_monthly ["sst_global", "sss_global", "SSH", "mass_wt"]
- &surface_flds_monthly ["tosga", "sosga", "SSH", "mass_wt"]

- &kpp_diags ["KPP_OBLdepth:oml", "KPP_OBLdepth:oml_min:min", "KPP_OBLdepth:oml_max:max"]

- &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",
"geolon_v", "geolat_v", "deptho", "wet", "wet_c", "wet_u",
"wet_v", "Coriolis", "areacello", "areacello_cu", "areacello_cv",
"areacello_bu", "sin_rot", "cos_rot", "C_P", "Rho_0", "skeb_taper_v",
"areacello_bu", "sin_rot", "cos_rot", "cpocean", "rhozero", "skeb_taper_v",
"skeb_taper_u"]

- &transports ["volcello", "vmo", "vhGM", "vhml", "umo", "uhGM", "uhml"]
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 ["dispkexyfo", "hfibthermds", "mlotstsq", "pbo", "S_adx_2d", "S_ady_2d", "sob",
"sossq", "tob", "tossq", "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"]

###############################################################################
# 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,10 @@ Files:
packing: = 1 if $TEST else 2
lists:
[ *prognostic_z,
*transports ]
*transports,
*visc_flds,
*cmip7_z,
]
lists2:
$USE_CFC_CAP == "True":
[ *cfc_3d ]
Expand All @@ -188,7 +214,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
123 changes: 102 additions & 21 deletions param_templates/json/diag_table.json
View file
Open in desktop
Comment thread
iangrooms marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
"zossq"
],
[
"sst_global",
"sss_global",
"tosga",
"sosga",
"SSH",
"mass_wt"
],
Expand All @@ -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 @@ -167,8 +171,8 @@
"areacello_bu",
"sin_rot",
"cos_rot",
"C_P",
"Rho_0",
"cpocean",
"rhozero",
"skeb_taper_v",
"skeb_taper_u"
],
Expand Down Expand Up @@ -219,6 +223,36 @@
"KPP_NLT_dSdt",
"KPP_NLT_temp_budget",
"KPP_NLT_saln_budget"
],
[
"dispkexyfo",
"hfibthermds",
"mlotstsq",
"pbo",
"S_adx_2d",
"S_ady_2d",
"sob",
"sossq",
"tob",
"tossq",
"zos",
"zossq",
"BS_coeff_h"
],
[
"opottempdiff",
"T_advection_xy",
"opottemptend",
"osaltdiff",
"S_advection_xy",
"osalttend",
"rsdoabsorb"
],
[
"tossq",
"rsdo",
"T_adx_2d",
"T_ady_2d"
]
],
"Files": {
Expand Down Expand Up @@ -370,21 +404,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 @@ -406,10 +437,28 @@
"mlotst:mlotst_max:max"
],
[
"sst_global",
"sss_global",
"tosga",
"sosga",
"SSH",
"mass_wt"
],
[
"dispkexyfo",
"hfibthermds",
"mlotstsq",
"pbo",
"S_adx_2d",
"S_ady_2d",
"sob",
"sossq",
"tob",
"tossq",
"zos",
"zossq",
"BS_coeff_h"
],
[
"skeb_amp"
]
]
},
Expand Down Expand Up @@ -442,6 +491,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 +555,21 @@
"umo",
"uhGM",
"uhml"
],
[
"diftrelo",
"diftrblo",
"difmxybo",
"difmxylo"
],
[
"opottempdiff",
"T_advection_xy",
"opottemptend",
"osaltdiff",
"S_advection_xy",
"osalttend",
"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 Expand Up @@ -692,8 +773,8 @@
"areacello_bu",
"sin_rot",
"cos_rot",
"C_P",
"Rho_0",
"cpocean",
"rhozero",
"skeb_taper_v",
"skeb_taper_u"
]
Expand Down
Loading