Skip to content

MOM6: Adds 5 CMIP7 diagnostics for vertically integrated heat/salt content #572

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
Hallberg-NOAA merged 1 commit into from
Dec 27, 2025
Merged

MOM6: Adds 5 CMIP7 diagnostics for vertically integrated heat/salt content #572

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
68 changes: 54 additions & 14 deletions ocean_only/global_ALE/layer/available_diags.000000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,6 +1838,60 @@
! long_name: Global Area Average Sea Surface Absolute Salinity
! units: psu
! standard_name: sea_surface_absolute_salinity
"temp_int" [Used] (CMOR equivalent is "opottempmint")
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
! long_name: Density weighted column integrated potential temperature
! units: degC kg m-2
! cell_methods: xh:mean yh:mean area:mean
! variants: {temp_int,opottempmint}
"salt_int" [Used] (CMOR equivalent is "somint")
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
! long_name: Density weighted column integrated salinity
! units: psu kg m-2
! cell_methods: xh:mean yh:mean yh:sum area:mean
! variants: {salt_int,somint}
"absscint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Integral wrt depth of seawater absolute salinity expressed as salt mass content
! units: kg m-2
! standard_name: integral_wrt_depth_of_sea_water_absolute_salinity_expressed_as_salt_mass_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {absscint,absscint_xyave}
"pfscint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Integral wrt depth of seawater preformed salinity expressed as salt mass content
! units: kg m-2
! standard_name: integral_wrt_depth_of_sea_water_preformed_salinity_expressed_as_salt_mass_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {pfscint,pfscint_xyave}
"scint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Integral wrt depth of seawater practical salinity expressed as salt mass content
! units: kg m-2
! standard_name: integral_wrt_depth_of_sea_water_practical_salinity_expressed_as_salt_mass_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {scint,scint_xyave}
"chcint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Depth Integrated Seawater Conservative Temperature Expressed As Heat Content
! units: J m-2
! standard_name: integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {chcint,chcint_xyave}
"phcint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Integrated Ocean Heat Content from Potential Temperature
! units: J m-2
! standard_name: integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {phcint,phcint_xyave}
"u" [Used] (CMOR equivalent is "uo")
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xq, yh, zl
Expand Down Expand Up @@ -2206,20 +2260,6 @@
! long_name: The column mass for calculating mass-weighted average properties
! units: kg m-2
! cell_methods: xh:mean yh:mean area:mean
"temp_int" [Used] (CMOR equivalent is "opottempmint")
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
! long_name: Density weighted column integrated potential temperature
! units: degC kg m-2
! cell_methods: xh:mean yh:mean area:mean
! variants: {temp_int,opottempmint}
"salt_int" [Used] (CMOR equivalent is "somint")
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
! long_name: Density weighted column integrated salinity
! units: psu kg m-2
! cell_methods: xh:mean yh:mean area:mean
! variants: {salt_int,somint}
"col_mass" [Unused]
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
Expand Down
68 changes: 54 additions & 14 deletions ocean_only/global_ALE/z/available_diags.000000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,6 +1864,60 @@
! long_name: Global Area Average Sea Surface Absolute Salinity
! units: psu
! standard_name: sea_surface_absolute_salinity
"temp_int" [Used] (CMOR equivalent is "opottempmint")
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
! long_name: Density weighted column integrated potential temperature
! units: degC kg m-2
! cell_methods: xh:mean yh:mean area:mean
! variants: {temp_int,opottempmint}
"salt_int" [Used] (CMOR equivalent is "somint")
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
! long_name: Density weighted column integrated salinity
! units: psu kg m-2
! cell_methods: xh:mean yh:mean yh:sum area:mean
! variants: {salt_int,somint}
"absscint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Integral wrt depth of seawater absolute salinity expressed as salt mass content
! units: kg m-2
! standard_name: integral_wrt_depth_of_sea_water_absolute_salinity_expressed_as_salt_mass_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {absscint,absscint_xyave}
"pfscint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Integral wrt depth of seawater preformed salinity expressed as salt mass content
! units: kg m-2
! standard_name: integral_wrt_depth_of_sea_water_preformed_salinity_expressed_as_salt_mass_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {pfscint,pfscint_xyave}
"scint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Integral wrt depth of seawater practical salinity expressed as salt mass content
! units: kg m-2
! standard_name: integral_wrt_depth_of_sea_water_practical_salinity_expressed_as_salt_mass_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {scint,scint_xyave}
"chcint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Depth Integrated Seawater Conservative Temperature Expressed As Heat Content
! units: J m-2
! standard_name: integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {chcint,chcint_xyave}
"phcint" [Unused]
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xh, yh, zl
! long_name: Integrated Ocean Heat Content from Potential Temperature
! units: J m-2
! standard_name: integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content
! cell_methods: xh:mean yh:mean zl:sum area:mean
! variants: {phcint,phcint_xyave}
"u" [Used] (CMOR equivalent is "uo")
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! dimensions: xq, yh, zl
Expand Down Expand Up @@ -2232,20 +2286,6 @@
! long_name: The column mass for calculating mass-weighted average properties
! units: kg m-2
! cell_methods: xh:mean yh:mean area:mean
"temp_int" [Used] (CMOR equivalent is "opottempmint")
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
! long_name: Density weighted column integrated potential temperature
! units: degC kg m-2
! cell_methods: xh:mean yh:mean area:mean
! variants: {temp_int,opottempmint}
"salt_int" [Used] (CMOR equivalent is "somint")
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
! long_name: Density weighted column integrated salinity
! units: psu kg m-2
! cell_methods: xh:mean yh:mean area:mean
! variants: {salt_int,somint}
"col_mass" [Unused]
! modules: {ocean_model,ocean_model_d2}
! dimensions: xh, yh
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Open in desktop
Submodule MOM6 updated 46 files
+2 −1 config_src/drivers/FMS_cap/ocean_model_MOM.F90
+2 −1 config_src/drivers/STALE_mct_cap/mom_ocean_model_mct.F90
+2 −1 config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+18 −38 config_src/infra/FMS1/MOM_interp_infra.F90
+28 −6 config_src/infra/FMS1/MOM_io_infra.F90
+133 −15 config_src/infra/FMS2/MOM_interp_infra.F90
+60 −10 config_src/infra/FMS2/MOM_io_infra.F90
+10 −2 src/ALE/MOM_regridding.F90
+3 −4 src/core/MOM.F90
+7 −7 src/core/MOM_barotropic.F90
+1 −1 src/core/MOM_check_scaling.F90
+1 −1 src/core/MOM_interface_heights.F90
+1 −1 src/core/MOM_verticalGrid.F90
+6 −6 src/diagnostics/MOM_diagnose_KdWork.F90
+123 −17 src/diagnostics/MOM_diagnostics.F90
+2 −2 src/diagnostics/MOM_sum_output.F90
+3 −3 src/diagnostics/MOM_wave_speed.F90
+2 −0 src/equation_of_state/MOM_EOS.F90
+1 −1 src/equation_of_state/MOM_EOS_Wright.F90
+1 −1 src/equation_of_state/MOM_EOS_Wright_full.F90
+1 −1 src/equation_of_state/MOM_EOS_Wright_red.F90
+2 −2 src/framework/MOM_diag_mediator.F90
+1 −1 src/framework/MOM_horizontal_regridding.F90
+48 −2 src/framework/MOM_interpolate.F90
+1 −1 src/framework/MOM_netcdf.F90
+18 −8 src/ice_shelf/MOM_ice_shelf.F90
+3 −3 src/ice_shelf/MOM_ice_shelf_dynamics.F90
+3 −3 src/ice_shelf/MOM_ice_shelf_initialize.F90
+1 −1 src/initialization/MOM_state_initialization.F90
+3 −2 src/ocean_data_assim/MOM_oda_driver.F90
+5 −5 src/parameterizations/lateral/MOM_internal_tides.F90
+2 −2 src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+4 −4 src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+1 −1 src/parameterizations/lateral/MOM_self_attr_load.F90
+5 −5 src/parameterizations/stochastic/MOM_stochastics.F90
+5 −4 src/parameterizations/vertical/MOM_ALE_sponge.F90
+2 −2 src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
+5 −4 src/parameterizations/vertical/MOM_energetic_PBL.F90
+1 −1 src/parameterizations/vertical/MOM_geothermal.F90
+1 −1 src/parameterizations/vertical/MOM_kappa_shear.F90
+5 −7 src/parameterizations/vertical/MOM_set_diffusivity.F90
+2 −2 src/parameterizations/vertical/MOM_set_viscosity.F90
+2 −2 src/parameterizations/vertical/MOM_tidal_mixing.F90
+1 −1 src/tracer/MARBL_tracers.F90
+1 −1 src/tracer/MOM_CFC_cap.F90
+1 −1 src/user/SCM_CVMix_tests.F90