Skip to content

(*)Consolidate conversion of 4 salt tendency diags #840

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 2 commits into from
May 29, 2025
Merged

(*)Consolidate conversion of 4 salt tendency diags #840

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f486837
(*)Consolidate conversion of 4 salt tendency diags
Hallberg-NOAA Feb 22, 2025
3805208
Merge branch 'dev/gfdl' into salt_tendency_diag_conversion
marshallward May 29, 2025
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
19 changes: 9 additions & 10 deletions src/parameterizations/vertical/MOM_diabatic_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2928,7 +2928,6 @@ subroutine diagnose_diabatic_diff_tendency(tv, h, temp_old, saln_old, dt, G, GV,
real, dimension(SZI_(G),SZJ_(G),SZK_(GV)) :: work_3d ! A 3-d work array for diagnostics [various]
real, dimension(SZI_(G),SZJ_(G)) :: work_2d ! A 2-d work array for diagnostics [various]
real :: Idt ! The inverse of the timestep [T-1 ~> s-1]
real :: ppt2mks ! Conversion factor from S to kg/kg [S-1 ~> ppt-1].
integer :: i, j, k, is, ie, js, je, nz
logical :: do_saln_tend ! Calculate salinity-based tendency diagnostics

Expand Down Expand Up @@ -2978,9 +2977,8 @@ subroutine diagnose_diabatic_diff_tendency(tv, h, temp_old, saln_old, dt, G, GV,

! salt tendency
if (CS%id_diabatic_diff_salt_tend > 0 .or. CS%id_diabatic_diff_salt_tend_2d > 0) then
ppt2mks = US%S_to_ppt*0.001
do k=1,nz ; do j=js,je ; do i=is,ie
work_3d(i,j,k) = h(i,j,k)*GV%H_to_RZ * ppt2mks * work_3d(i,j,k)
work_3d(i,j,k) = h(i,j,k) * work_3d(i,j,k)
enddo ; enddo ; enddo
if (CS%id_diabatic_diff_salt_tend > 0) then
call post_data(CS%id_diabatic_diff_salt_tend, work_3d, CS%diag, alt_h=h)
Expand Down Expand Up @@ -3023,7 +3021,6 @@ subroutine diagnose_boundary_forcing_tendency(tv, h, temp_old, saln_old, h_old,
real, dimension(SZI_(G),SZJ_(G),SZK_(GV)) :: work_3d ! A 3-d work array for diagnostics [various]
real, dimension(SZI_(G),SZJ_(G)) :: work_2d ! A 2-d work array for diagnostics [various]
real :: Idt ! The inverse of the timestep [T-1 ~> s-1]
real :: ppt2mks ! Conversion factor from S to kg/kg [S-1 ~> ppt-1].
integer :: i, j, k, is, ie, js, je, nz

is = G%isc ; ie = G%iec ; js = G%jsc ; je = G%jec ; nz = GV%ke
Expand Down Expand Up @@ -3074,9 +3071,8 @@ subroutine diagnose_boundary_forcing_tendency(tv, h, temp_old, saln_old, h_old,

! salt tendency
if (CS%id_boundary_forcing_salt_tend > 0 .or. CS%id_boundary_forcing_salt_tend_2d > 0) then
ppt2mks = US%S_to_ppt*0.001
do k=1,nz ; do j=js,je ; do i=is,ie
work_3d(i,j,k) = GV%H_to_RZ * ppt2mks * Idt * (h(i,j,k) * tv%S(i,j,k) - h_old(i,j,k) * saln_old(i,j,k))
work_3d(i,j,k) = Idt * (h(i,j,k) * tv%S(i,j,k) - h_old(i,j,k) * saln_old(i,j,k))
enddo ; enddo ; enddo
if (CS%id_boundary_forcing_salt_tend > 0) then
call post_data(CS%id_boundary_forcing_salt_tend, work_3d, CS%diag, alt_h=h_old)
Expand Down Expand Up @@ -3587,7 +3583,8 @@ subroutine diabatic_driver_init(Time, G, GV, US, param_file, useALEalgorithm, di
CS%id_diabatic_diff_salt_tend = register_diag_field('ocean_model', &
'diabatic_salt_tendency', diag%axesTL, Time, &
'Diabatic diffusion of salt tendency', &
'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s, cmor_field_name='osaltdiff', &
'kg m-2 s-1', conversion=US%S_to_ppt*0.001*GV%H_to_RZ*US%RZ_T_to_kg_m2s, &
cmor_field_name='osaltdiff', &
cmor_standard_name='tendency_of_sea_water_salinity_expressed_as_salt_content_'// &
'due_to_parameterized_dianeutral_mixing', &
cmor_long_name='Tendency of sea water salinity expressed as salt content '// &
Expand All @@ -3614,7 +3611,8 @@ subroutine diabatic_driver_init(Time, G, GV, US, param_file, useALEalgorithm, di
CS%id_diabatic_diff_salt_tend_2d = register_diag_field('ocean_model', &
'diabatic_salt_tendency_2d', diag%axesT1, Time, &
'Depth integrated diabatic diffusion salt tendency', &
'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s, cmor_field_name='osaltdiff_2d', &
'kg m-2 s-1', conversion=US%S_to_ppt*0.001*GV%H_to_RZ*US%RZ_T_to_kg_m2s, &
cmor_field_name='osaltdiff_2d', &
cmor_standard_name='tendency_of_sea_water_salinity_expressed_as_salt_content_'// &
'due_to_parameterized_dianeutral_mixing_depth_integrated', &
cmor_long_name='Tendency of sea water salinity expressed as salt content '// &
Expand Down Expand Up @@ -3661,7 +3659,8 @@ subroutine diabatic_driver_init(Time, G, GV, US, param_file, useALEalgorithm, di

CS%id_boundary_forcing_salt_tend = register_diag_field('ocean_model',&
'boundary_forcing_salt_tendency', diag%axesTL, Time, &
'Boundary forcing salt tendency', 'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s, &
'Boundary forcing salt tendency', &
'kg m-2 s-1', conversion=US%S_to_ppt*0.001*GV%H_to_RZ*US%RZ_T_to_kg_m2s, &
v_extensive = .true.)
if (CS%id_boundary_forcing_salt_tend > 0) then
CS%boundary_forcing_tendency_diag = .true.
Expand All @@ -3680,7 +3679,7 @@ subroutine diabatic_driver_init(Time, G, GV, US, param_file, useALEalgorithm, di
CS%id_boundary_forcing_salt_tend_2d = register_diag_field('ocean_model',&
'boundary_forcing_salt_tendency_2d', diag%axesT1, Time, &
'Depth integrated boundary forcing of ocean salt', &
'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s)
'kg m-2 s-1', conversion=US%S_to_ppt*0.001*GV%H_to_RZ*US%RZ_T_to_kg_m2s)
if (CS%id_boundary_forcing_salt_tend_2d > 0) then
CS%boundary_forcing_tendency_diag = .true.
endif
Expand Down
Loading