Fix for MASK_OUTSIDE_OBCS with MASKING_DEPTH

config_src/infra/FMS1/MOM_constants.F90

@@ -3,12 +3,16 @@ module MOM_constants
 
 ! This file is part of MOM6. See LICENSE.md for the license.
 
-use constants_mod, only : HLV, HLF
+use constants_mod, only : FMS_HLV => HLV
+use constants_mod, only : FMS_HLF => HLF
 
 implicit none ; private
 
-!> The constant offset for converting temperatures in Kelvin to Celsius
 real, public, parameter :: CELSIUS_KELVIN_OFFSET = 273.15
-public :: HLV, HLF
+  !< The constant offset for converting temperatures in Kelvin to Celsius [K]
+real, public, parameter :: HLV = real(FMS_HLV, kind=kind(1.0))
+  !< Latent heat of vaporization [J kg-1]
+real, public, parameter :: HLF = real(FMS_HLF, kind=kind(1.0))
+  !< Latent heat of fusion [J kg-1]
 
 end module MOM_constants

config_src/infra/FMS2/MOM_constants.F90

@@ -3,12 +3,16 @@ module MOM_constants
 
 ! This file is part of MOM6. See LICENSE.md for the license.
 
-use constants_mod, only : HLV, HLF
+use constants_mod, only : FMS_HLV => HLV
+use constants_mod, only : FMS_HLF => HLF
 
 implicit none ; private
 
-!> The constant offset for converting temperatures in Kelvin to Celsius
 real, public, parameter :: CELSIUS_KELVIN_OFFSET = 273.15
-public :: HLV, HLF
+  !< The constant offset for converting temperatures in Kelvin to Celsius [K]
+real, public, parameter :: HLV = real(FMS_HLV, kind=kind(1.0))
+  !< Latent heat of vaporization [J kg-1]
+real, public, parameter :: HLF = real(FMS_HLF, kind=kind(1.0))
+  !< Latent heat of fusion [J kg-1]
 
 end module MOM_constants

src/core/MOM.F90

@@ -2883,6 +2883,26 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, &
     ! reservoirs are used.
     call open_boundary_register_restarts(HI, GV, US, CS%OBC, CS%tracer_Reg, &
                           param_file, restart_CSp, use_temperature)
+    if (turns /= 0) then
+      if (CS%OBC%radiation_BCs_exist_globally) then
+        OBC_in%rx_normal => CS%OBC%rx_normal
+        OBC_in%ry_normal => CS%OBC%ry_normal
+      endif
+      if (CS%OBC%oblique_BCs_exist_globally) then
+        OBC_in%rx_oblique_u => CS%OBC%rx_oblique_u
+        OBC_in%ry_oblique_u => CS%OBC%ry_oblique_u
+        OBC_in%rx_oblique_v => CS%OBC%rx_oblique_v
+        OBC_in%ry_oblique_v => CS%OBC%ry_oblique_v
+        OBC_in%cff_normal_u => CS%OBC%cff_normal_u
+        OBC_in%cff_normal_v => CS%OBC%cff_normal_v
+      endif
+      if (any(CS%OBC%tracer_x_reservoirs_used)) then
+        OBC_in%tres_x => CS%OBC%tres_x
+      endif
+      if (any(CS%OBC%tracer_y_reservoirs_used)) then
+        OBC_in%tres_y => CS%OBC%tres_y
+      endif
+    endif
   endif
 
   if (present(waves_CSp)) then

src/core/MOM_barotropic.F90

@@ -742,6 +742,7 @@ subroutine btstep(U_in, V_in, eta_in, dt, bc_accel_u, bc_accel_v, forces, pbce,
   integer :: isd, ied, jsd, jed, IsdB, IedB, JsdB, JedB
   integer :: ioff, joff
   integer :: l_seg
+  real :: factor(SZI_(G),SZJ_(G))     ! If non-zero, work on given points.
 
   if (.not.CS%module_is_initialized) call MOM_error(FATAL, &
       "btstep: Module MOM_barotropic must be initialized before it is used.")
@@ -2457,17 +2458,69 @@ subroutine btstep(U_in, V_in, eta_in, dt, bc_accel_u, bc_accel_v, forces, pbce,
                       haloshift=iev-ie, unscale=US%L_to_m**2*GV%H_to_m)
     endif
 
+    do j=jsv,jev
+      do i=isv,iev
+        factor(i,j) = CS%IareaT(i,j)
+      enddo
+    enddo
+
+    ! Update factor so that nothing changes outside of the OBC (problem for interior OBCs only)
+    if (associated(OBC)) then ; if (OBC%OBC_pe) then
+!     do j=jsv,jev
+!       if (OBC%specified_u_BCs_exist_globally .or. OBC%open_u_BCs_exist_globally) then
+!         do i=isv,iev-1 ; if (OBC%segnum_u(I,j) /= OBC_NONE) then
+!           if (OBC%segment(OBC%segnum_u(I,j))%direction == OBC_DIRECTION_E) then
+!             factor(i+1,j) = 0.0
+!           elseif (OBC%segment(OBC%segnum_u(I,j))%direction == OBC_DIRECTION_W) then
+!             factor(i,j) = 0.0
+!           endif
+!         endif ; enddo
+!       endif
+      do i=isv,iev
+        if (OBC%specified_u_BCs_exist_globally .or. OBC%open_u_BCs_exist_globally) then
+          do j=jsv,jev
+            if (OBC%segnum_u(I-1,j) /= OBC_NONE) then
+              if (OBC%segment(OBC%segnum_u(I-1,j))%direction == OBC_DIRECTION_E) then
+                factor(i,j) = 0.0
+              endif
+            endif
+            if (OBC%segnum_u(I,j) /= OBC_NONE) then
+              if (OBC%segment(OBC%segnum_u(I,j))%direction == OBC_DIRECTION_W) then
+                factor(i,j) = 0.0
+              endif
+            endif
+          enddo
+        endif
+      enddo
+      do j=jsv,jev
+        if (OBC%specified_v_BCs_exist_globally .or. OBC%open_v_BCs_exist_globally) then
+          do i=isv,iev
+            if (OBC%segnum_v(i,J-1) /= OBC_NONE) then
+              if (OBC%segment(OBC%segnum_v(i,J-1))%direction == OBC_DIRECTION_N) then
+                factor(i,j) = 0.0
+              endif
+            endif
+            if (OBC%segnum_v(i,J) /= OBC_NONE) then
+              if (OBC%segment(OBC%segnum_v(i,J))%direction == OBC_DIRECTION_S) then
+                factor(i,j) = 0.0
+              endif
+            endif
+          enddo
+        endif
+      enddo
+    endif ; endif
+
     if (integral_BT_cont) then
       !$OMP do
       do j=jsv,jev ; do i=isv,iev
-        eta(i,j) = (eta_IC(i,j) + n*eta_src(i,j)) + CS%IareaT(i,j) * &
+        eta(i,j) = (eta_IC(i,j) + n*eta_src(i,j)) + factor(i,j) * &
                    ((uhbt_int(I-1,j) - uhbt_int(I,j)) + (vhbt_int(i,J-1) - vhbt_int(i,J)))
         eta_wtd(i,j) = eta_wtd(i,j) + eta(i,j) * wt_eta(n)
       enddo ; enddo
     else
       !$OMP do
       do j=jsv,jev ; do i=isv,iev
-        eta(i,j) = (eta(i,j) + eta_src(i,j)) + (dtbt * CS%IareaT(i,j)) * &
+        eta(i,j) = (eta(i,j) + eta_src(i,j)) + (dtbt * factor(i,j)) * &
                    ((uhbt(I-1,j) - uhbt(I,j)) + (vhbt(i,J-1) - vhbt(i,J)))
         eta_wtd(i,j) = eta_wtd(i,j) + eta(i,j) * wt_eta(n)
       enddo ; enddo
@@ -5270,7 +5323,7 @@ subroutine register_barotropic_restarts(HI, GV, US, param_file, CS, restart_CS)
   character(len=40)  :: mdl = "MOM_barotropic"  ! This module's name.
   integer :: isd, ied, jsd, jed, IsdB, IedB, JsdB, JedB
   real :: am2, ak1      !< Bandwidth parameters of the M2 and K1 streaming filters [nondim]
-  real :: om2, ok1      !< Target frequencies of the M2 and K1 streaming filters [T-1 ~> s-1]
+  real :: om2, ok1      !< Target frequencies of the M2 and K1 streaming filters [rad T-1 ~> rad s-1]
 
   isd = HI%isd ; ied = HI%ied ; jsd = HI%jsd ; jed = HI%jed
   IsdB = HI%IsdB ; IedB = HI%IedB ; JsdB = HI%JsdB ; JedB = HI%JedB
@@ -5301,13 +5354,13 @@ subroutine register_barotropic_restarts(HI, GV, US, param_file, CS, restart_CS)
                  "Frequency of the M2 tidal constituent. "//&
                  "This is only used if TIDES and TIDE_M2"// &
                  " are true, or if OBC_TIDE_N_CONSTITUENTS > 0 and M2"// &
-                 " is in OBC_TIDE_CONSTITUENTS.", units="s-1", default=tidal_frequency("M2"), &
+                 " is in OBC_TIDE_CONSTITUENTS.", units="rad s-1", default=tidal_frequency("M2"), &
                  scale=US%T_to_s, do_not_log=.true.)
   call get_param(param_file, mdl, "TIDE_K1_FREQ", ok1, &
                  "Frequency of the K1 tidal constituent. "//&
                  "This is only used if TIDES and TIDE_K1"// &
                  " are true, or if OBC_TIDE_N_CONSTITUENTS > 0 and K1"// &
-                 " is in OBC_TIDE_CONSTITUENTS.", units="s-1", default=tidal_frequency("K1"), &
+                 " is in OBC_TIDE_CONSTITUENTS.", units="rad s-1", default=tidal_frequency("K1"), &
                  scale=US%T_to_s, do_not_log=.true.)
 
   ALLOC_(CS%ubtav(IsdB:IedB,jsd:jed))      ; CS%ubtav(:,:) = 0.0