Skip to content

Commit

Permalink
Merge branch 'log_firstmode' into fix_diags_intwaves
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphael Dussin authored and Raphael Dussin committed Aug 27, 2021
2 parents e2fd5e5 + c742000 commit e1c8f91
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/parameterizations/lateral/MOM_internal_tides.F90
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,9 @@ subroutine propagate_int_tide(h, tv, cn, TKE_itidal_input, vel_btTide, Nb, dt, &
I_rho0 = 1.0 / GV%Rho0
cn_subRO = 1e-100*US%m_s_to_L_T ! The hard-coded value here might need to increase.

! init local variables
! init local arrays
drag_scale(:,:) = 0.

! Set the wave speeds for the modes, using cg(n) ~ cg(1)/n.**********************
! This is wrong, of course, but it works reasonably in some cases.
! Uncomment if wave_speed is not used to calculate the true values (BDM).
Expand Down Expand Up @@ -2210,7 +2211,11 @@ subroutine internal_tides_init(Time, G, GV, US, param_file, diag, CS)

! Allocate and populate frequency array (each a multiple of first for now)
allocate(CS%frequency(num_freq))
call get_param(param_file, mdl, "FIRST_MODE_PERIOD", period_1, units="s", scale=US%s_to_T)
call get_param(param_file, mdl, "FIRST_MODE_PERIOD", period_1, &
"The period of the first mode for internal tides", default=44567., &
units="s", scale=US%s_to_T)
call log_param(param_file, mdl, "FIRST_MODE_PERIOD", period_1)

do fr=1,num_freq
CS%frequency(fr) = (8.0*atan(1.0) * (real(fr)) / period_1) ! ADDED BDM
enddo
Expand Down

0 comments on commit e1c8f91

Please sign in to comment.