Adjust OBC mask to be consistent with land mask.

src/core/MOM_open_boundary.F90

@@ -25,6 +25,7 @@ module MOM_open_boundary
 public open_boundary_query
 public open_boundary_end
 public open_boundary_impose_normal_slope
+public open_boundary_impose_land_mask
 public Radiation_Open_Bdry_Conds
 public set_Flather_positions
 public set_Flather_data
@@ -235,6 +236,35 @@ subroutine open_boundary_impose_normal_slope(OBC, G, depth)
 
 end subroutine open_boundary_impose_normal_slope
 
+!> Sets the slope of bathymetry normal to an open bounndary to zero.
+subroutine open_boundary_impose_land_mask(OBC, G)
+  type(ocean_OBC_type),              pointer       :: OBC !< Open boundary control structure
+  type(ocean_grid_type),             intent(in) :: G !< Ocean grid structure
+  ! Local variables
+  integer :: i, j
+
+  if (.not.associated(OBC)) return
+
+  if (associated(OBC%OBC_kind_u)) then
+    do j=G%jsd,G%jed ; do I=G%isd,G%ied-1
+      if (G%mask2dCu(I,j) == 0) then
+        OBC%OBC_kind_u(I,j) = OBC_NONE
+        OBC%OBC_mask_u(I,j) = .false.
+      endif
+    enddo ; enddo
+  endif
+
+  if (associated(OBC%OBC_kind_v)) then
+    do J=G%jsd,G%jed-1 ; do i=G%isd,G%ied
+      if (G%mask2dCv(i,J) == 0) then
+        OBC%OBC_kind_v(i,J) = OBC_NONE
+        OBC%OBC_mask_v(i,J) = .false.
+      endif
+    enddo ; enddo
+  endif
+
+end subroutine open_boundary_impose_land_mask
+
 !> Diagnose radiation conditions at open boundaries
 subroutine Radiation_Open_Bdry_Conds(OBC, u_new, u_old, v_new, v_old, &
                                      h_new, h_old, G)

src/initialization/MOM_fixed_initialization.F90

@@ -21,6 +21,7 @@ module MOM_fixed_initialization
 use MOM_open_boundary, only : ocean_OBC_type
 use MOM_open_boundary, only : open_boundary_config, open_boundary_query
 use MOM_open_boundary, only : set_Flather_positions, open_boundary_impose_normal_slope
+use MOM_open_boundary, only : open_boundary_impose_land_mask
 use MOM_string_functions, only : uppercase
 use user_initialization, only : user_initialize_topography, USER_set_OBC_positions
 use DOME_initialization, only : DOME_initialize_topography, DOME_set_OBC_positions
@@ -112,6 +113,9 @@ subroutine MOM_initialize_fixed(G, OBC, PF, write_geom, output_dir)
 
   ! This call sets masks that prohibit flow over any point interpreted as land
   call initialize_masks(G, PF)
+
+  ! Make OBC mask consistent with land mask
+  call open_boundary_impose_land_mask(OBC, G)
   if (debug) then
     call hchksum(G%bathyT, 'MOM_initialize_fixed: depth ', G%HI, haloshift=1)
     call hchksum(G%mask2dT, 'MOM_initialize_fixed: mask2dT ', G%HI)