Skip to content

MOM6: Correct temperature and salinity mean diagnostics when using conservative/absolute (#860) #519

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
merged 1 commit into from
Mar 21, 2025
Merged

MOM6: Correct temperature and salinity mean diagnostics when using conservative/absolute (#860) #519

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
30 changes: 30 additions & 0 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 @@ -1484,33 +1484,63 @@
! long_name: Layer Average Ocean Temperature
! units: degC
! cell_methods: zl:mean
"contemp_layer_ave" [Unused]
! modules: ocean_model
! long_name: Layer Average Ocean Conservative Temperature
! units: Celsius
! cell_methods: zl:mean
"salt_layer_ave" [Used]
! modules: ocean_model
! long_name: Layer Average Ocean Salinity
! units: psu
! cell_methods: zl:mean
"abssalt_layer_ave" [Unused]
! modules: ocean_model
! long_name: Layer Average Ocean Absolute Salinity
! units: g kg-1
! cell_methods: zl:mean
"thetaoga" [Used]
! modules: ocean_model
! long_name: Global Mean Ocean Potential Temperature
! units: degC
! standard_name: sea_water_potential_temperature
"bigthetaoga" [Unused]
! modules: ocean_model
! long_name: Global Mean Ocean Conservative Temperature
! units: Celsius
! standard_name: sea_water_conservative_temperature
"soga" [Used]
! modules: ocean_model
! long_name: Global Mean Ocean Salinity
! units: psu
! standard_name: sea_water_salinity
"abssoga" [Unused]
! modules: ocean_model
! long_name: Global Mean Ocean Absolute Salinity
! units: g kg-1
! standard_name: sea_water_absolute_salinity
"sst_global" [Unused]
! modules: ocean_model
! long_name: Global Area Average Sea Surface Temperature
! units: degC
! standard_name: sea_surface_temperature
! variants: {sst_global,tosga}
"sscont_global" [Unused]
! modules: ocean_model
! long_name: Global Area Average Sea Surface Conservative Temperature
! units: Celsius
! standard_name: sea_surface_temperature
"sss_global" [Unused]
! modules: ocean_model
! long_name: Global Area Average Sea Surface Salinity
! units: psu
! standard_name: sea_surface_salinity
! variants: {sss_global,sosga}
"ssabss_global" [Unused]
! modules: ocean_model
! long_name: Global Area Average Sea Surface Absolute Salinity
! units: psu
! standard_name: sea_surface_absolute_salinity
"u" [Used] (CMOR equivalent is "uo")
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! long_name: Zonal velocity
Expand Down
30 changes: 30 additions & 0 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 @@ -1506,33 +1506,63 @@
! long_name: Layer Average Ocean Temperature
! units: degC
! cell_methods: zl:mean
"contemp_layer_ave" [Unused]
! modules: ocean_model
! long_name: Layer Average Ocean Conservative Temperature
! units: Celsius
! cell_methods: zl:mean
"salt_layer_ave" [Used]
! modules: ocean_model
! long_name: Layer Average Ocean Salinity
! units: psu
! cell_methods: zl:mean
"abssalt_layer_ave" [Unused]
! modules: ocean_model
! long_name: Layer Average Ocean Absolute Salinity
! units: g kg-1
! cell_methods: zl:mean
"thetaoga" [Used]
! modules: ocean_model
! long_name: Global Mean Ocean Potential Temperature
! units: degC
! standard_name: sea_water_potential_temperature
"bigthetaoga" [Unused]
! modules: ocean_model
! long_name: Global Mean Ocean Conservative Temperature
! units: Celsius
! standard_name: sea_water_conservative_temperature
"soga" [Used]
! modules: ocean_model
! long_name: Global Mean Ocean Salinity
! units: psu
! standard_name: sea_water_salinity
"abssoga" [Unused]
! modules: ocean_model
! long_name: Global Mean Ocean Absolute Salinity
! units: g kg-1
! standard_name: sea_water_absolute_salinity
"sst_global" [Unused]
! modules: ocean_model
! long_name: Global Area Average Sea Surface Temperature
! units: degC
! standard_name: sea_surface_temperature
! variants: {sst_global,tosga}
"sscont_global" [Unused]
! modules: ocean_model
! long_name: Global Area Average Sea Surface Conservative Temperature
! units: Celsius
! standard_name: sea_surface_temperature
"sss_global" [Unused]
! modules: ocean_model
! long_name: Global Area Average Sea Surface Salinity
! units: psu
! standard_name: sea_surface_salinity
! variants: {sss_global,sosga}
"ssabss_global" [Unused]
! modules: ocean_model
! long_name: Global Area Average Sea Surface Absolute Salinity
! units: psu
! standard_name: sea_surface_absolute_salinity
"u" [Used] (CMOR equivalent is "uo")
! modules: {ocean_model,ocean_model_z,ocean_model_d2,ocean_model_z_d2}
! long_name: Zonal velocity
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Open in desktop
Submodule MOM6 updated 3 files
+463 −629 src/core/MOM_barotropic.F90
+112 −36 src/diagnostics/MOM_diagnostics.F90
+51 −27 src/parameterizations/lateral/MOM_hor_visc.F90