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

Jump to bottom

Add missing L_StokesL computation #98

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Add missing L_StokesL computation #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8d8125
Add missing L_StokesL computation
gustavo-marques Oct 30, 2024
8c8a00e
add CVt2 to init_kpp API
gustavo-marques Oct 30, 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
21 changes: 14 additions & 7 deletions src/shared/cvmix_kpp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,12 @@ module cvmix_kpp

! !IROUTINE: cvmix_init_kpp
! !INTERFACE:
subroutine cvmix_init_kpp(ri_crit, minOBLdepth, maxOBLdepth, minVtsqr, &
vonkarman, Cstar, zeta_m, zeta_s, surf_layer_ext, &
Cv, interp_type, interp_type2, MatchTechnique, &
old_vals, lEkman, lStokesMOST, lMonOb, lnoDGat1, &
lenhanced_diff, lnonzero_surf_nonlocal, &
Langmuir_mixing_str, Langmuir_entrainment_str, &
subroutine cvmix_init_kpp(ri_crit, minOBLdepth, maxOBLdepth, minVtsqr, &
vonkarman, Cstar, zeta_m, zeta_s, surf_layer_ext, &
CVt2, Cv, interp_type, interp_type2, MatchTechnique, &
old_vals, lEkman, lStokesMOST, lMonOb, lnoDGat1, &
lenhanced_diff, lnonzero_surf_nonlocal, &
Langmuir_mixing_str, Langmuir_entrainment_str, &
l_LMD_ws, CVmix_kpp_params_user)

! !DESCRIPTION:
Expand All @@ -246,6 +246,7 @@ subroutine cvmix_init_kpp(ri_crit, minOBLdepth, maxOBLdepth, minVtsqr, &
zeta_m, &
zeta_s, &
surf_layer_ext, &
CVt2, &
Cv
character(len=*), optional, intent(in) :: interp_type, &
interp_type2, &
Expand Down Expand Up @@ -487,7 +488,12 @@ subroutine cvmix_init_kpp(ri_crit, minOBLdepth, maxOBLdepth, minVtsqr, &
else
call cvmix_put_kpp('lStokesMOST', .false., CVmix_kpp_params_user)
end if
call cvmix_put_kpp('CVt2', 2.6_cvmix_r8, CVmix_kpp_params_user)

if (present(CVt2)) then
call cvmix_put_kpp('CVt2', CVt2, CVmix_kpp_params_user)
else
call cvmix_put_kpp('CVt2', 1.6_cvmix_r8, CVmix_kpp_params_user)
end if

if (present(lEkman)) then
call cvmix_put_kpp('lEkman', lEkman, CVmix_kpp_params_user)
Expand Down Expand Up @@ -2434,6 +2440,7 @@ subroutine cvmix_kpp_compute_turbulent_scales_1d_OBL(sigma_coord, &
if (compute_ws) then
do kw = 1,n_sigma
chi_s = compute_Stokes_chi( xi(kw) , lchi_s=.true. )
L_StokesL = cvmix_one - xi(kw) !wgl - xi
w_s(kw)=compute_phi_inv(zeta(kw),CVmix_kpp_params_in,L_StokesL,lphi_s=.true.) * &
vonkar*surf_fric_vel / chi_s
end do
Expand Down
Loading