Skip to content
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

(*)Fix Kd_interface diagnostic in newer diabatic_ALE #635

Merged
merged 2 commits into from
Jun 5, 2024
Merged

(*)Fix Kd_interface diagnostic in newer diabatic_ALE #635

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed6d7eb
(*)Fix Kd_interface diag in newer diabatic_ALE
Hallberg-NOAA May 16, 2024
5693bff
Merge branch 'dev/gfdl' into Kd_interface_diag_fix
marshallward Jun 5, 2024
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
15 changes: 10 additions & 5 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 @@ -1258,9 +1258,6 @@ subroutine diabatic_ALE(u, v, h, tv, BLD, fluxes, visc, ADp, CDp, dt, Time_end,
call hchksum(Kd_heat, "after set_diffusivity Kd_heat", G%HI, haloshift=0, scale=GV%HZ_T_to_m2_s)
endif

! Store the diagnosed typical diffusivity at interfaces.
if (CS%id_Kd_int > 0) call post_data(CS%id_Kd_int, Kd_heat, CS%diag)

! Set diffusivities for heat and salt separately, and possibly change the meaning of Kd_heat.
if (CS%double_diffuse) then
! Add contributions from double diffusion
Expand Down Expand Up @@ -1520,6 +1517,14 @@ subroutine diabatic_ALE(u, v, h, tv, BLD, fluxes, visc, ADp, CDp, dt, Time_end,
if (CS%id_Kd_heat > 0) call post_data(CS%id_Kd_heat, Kd_heat, CS%diag)
if (CS%id_Kd_salt > 0) call post_data(CS%id_Kd_salt, Kd_salt, CS%diag)
if (CS%id_Kd_ePBL > 0) call post_data(CS%id_Kd_ePBL, Kd_ePBL, CS%diag)
if (CS%id_Kd_int > 0) then
if (CS%double_diffuse .or. CS%useKPP) then
do K=1,nz ; do j=js,je ; do i=is,ie
Kd_heat(i,j,k) = min(Kd_heat(i,j,k), Kd_salt(i,j,k))
enddo ; enddo ; enddo
endif
call post_data(CS%id_Kd_int, Kd_heat, CS%diag)
endif

if (CS%id_ea_t > 0) call post_data(CS%id_ea_t, ent_t(:,:,1:nz), CS%diag)
if (CS%id_eb_t > 0) call post_data(CS%id_eb_t, ent_t(:,:,2:nz+1), CS%diag)
Expand Down Expand Up @@ -3275,8 +3280,8 @@ subroutine diabatic_driver_init(Time, G, GV, US, param_file, useALEalgorithm, di
CS%id_Kd_int = register_diag_field('ocean_model', 'Kd_interface', diag%axesTi, Time, &
'Total diapycnal diffusivity at interfaces', 'm2 s-1', conversion=GV%HZ_T_to_m2_s)
if (CS%use_energetic_PBL) then
CS%id_Kd_ePBL = register_diag_field('ocean_model', 'Kd_ePBL', diag%axesTi, Time, &
'ePBL diapycnal diffusivity at interfaces', 'm2 s-1', conversion=GV%HZ_T_to_m2_s)
CS%id_Kd_ePBL = register_diag_field('ocean_model', 'Kd_ePBL', diag%axesTi, Time, &
'ePBL diapycnal diffusivity at interfaces', 'm2 s-1', conversion=GV%HZ_T_to_m2_s)
endif

CS%id_Kd_heat = register_diag_field('ocean_model', 'Kd_heat', diag%axesTi, Time, &
Expand Down
Loading