Skip to content

Commit e6e0870

Browse files
c2xuHallberg-NOAA
andauthored
Bug fix related to directional internal wave drag (#774)
Co-authored-by: Robert Hallberg <Robert.Hallberg@noaa.gov>
1 parent a4d13e8 commit e6e0870

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

src/core/MOM_barotropic.F90

+3-8
Original file line numberDiff line numberDiff line change
@@ -4959,15 +4959,10 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
49594959

49604960
if (len_trim(wave_drag_u) > 0 .and. len_trim(wave_drag_v) > 0) then
49614961
call MOM_read_data(wave_drag_file, wave_drag_u, CS%lin_drag_u, G%Domain, &
4962-
position=EAST_FACE, scale=GV%m_to_H*US%T_to_s)
4963-
call pass_var(CS%lin_drag_u, G%Domain)
4964-
CS%lin_drag_u(:,:) = wave_drag_scale * CS%lin_drag_u(:,:)
4965-
4962+
position=EAST_FACE, scale=wave_drag_scale*GV%m_to_H*US%T_to_s)
49664963
call MOM_read_data(wave_drag_file, wave_drag_v, CS%lin_drag_v, G%Domain, &
4967-
position=NORTH_FACE, scale=GV%m_to_H*US%T_to_s)
4968-
call pass_var(CS%lin_drag_v, G%Domain)
4969-
CS%lin_drag_v(:,:) = wave_drag_scale * CS%lin_drag_v(:,:)
4970-
4964+
position=NORTH_FACE, scale=wave_drag_scale*GV%m_to_H*US%T_to_s)
4965+
call pass_vector(CS%lin_drag_u, CS%lin_drag_v, G%domain, direction=To_All+SCALAR_PAIR)
49714966
else
49724967
allocate(lin_drag_h(isd:ied,jsd:jed), source=0.0)
49734968

0 commit comments

Comments
 (0)