Skip to content

(*)Fix nonBousinesq handling of the case when sea level drops below the seafloor #1161

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

Open
Hallberg-NOAA wants to merge 1 commit into
base: dev/gfdl
Choose a base branch
from
Open

(*)Fix nonBousinesq handling of the case when sea level drops below the seafloor #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions src/core/MOM_barotropic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,8 +654,7 @@ subroutine btstep(U_in, V_in, eta_in, dt, bc_accel_u, bc_accel_v, forces, pbce,
real, dimension(SZI_(G),SZJB_(G)) :: Drag_v
! The meridional acceleration due to frequency-dependent drag [L T-2 ~> m s-2]
real, target, dimension(SZIW_(CS),SZJW_(CS)) :: &
eta ! The barotropic free surface height anomaly or column mass
! anomaly [H ~> m or kg m-2]
eta ! The barotropic free surface height anomaly or column mass [H ~> m or kg m-2]
real, dimension(SZIW_(CS),SZJW_(CS)) :: &
eta_sum, & ! eta summed across the timesteps [H ~> m or kg m-2].
eta_wtd, & ! A weighted estimate used to calculate eta_out [H ~> m or kg m-2].
Expand Down Expand Up @@ -2278,7 +2277,7 @@ subroutine btstep_timeloop(eta, ubt, vbt, uhbt0, Datu, BTCL_u, vhbt0, Datv, BTCL
type(memory_size_type), intent(in) :: MS !< A type that describes the memory sizes of
!! the argument arrays.
real, dimension(SZIW_(CS),SZJW_(CS)), target, intent(inout) :: &
eta !< The barotropic free surface height anomaly or column mass anomaly [H ~> m or kg m-2]
eta !< The barotropic free surface height anomaly or total column mass [H ~> m or kg m-2]
real, dimension(SZIBW_(CS),SZJW_(CS)), intent(inout) :: &
ubt !< The zonal barotropic velocity [L T-1 ~> m s-1]
real, dimension(SZIW_(CS),SZJBW_(CS)), intent(inout) :: &
Expand Down Expand Up @@ -2362,7 +2361,7 @@ subroutine btstep_timeloop(eta, ubt, vbt, uhbt0, Datu, BTCL_u, vhbt0, Datv, BTCL
!! that introduced directly into the barotropic solver rather than coming
!! in via the visc_rem_v arrays from the layered equations [T-1 ~> s-1]
real, dimension(SZIW_(CS),SZJW_(CS)), intent(inout) :: &
eta_PF !< The 2-D eta field (either SSH anomaly or column mass anomaly) that was used to
eta_PF !< The 2-D eta field (either SSH anomaly or column mass) that was used to
!! calculate the input pressure gradient accelerations [H ~> m or kg m-2]
real, dimension(SZIW_(CS),SZJW_(CS)), intent(in) :: &
gtot_E !< The effective total reduced gravity used to relate free surface height
Expand Down Expand Up @@ -2868,16 +2867,18 @@ subroutine btstep_timeloop(eta, ubt, vbt, uhbt0, Datu, BTCL_u, vhbt0, Datv, BTCL
eta_acc = abs( CS%IareaT_OBCmask(i,j) * &
((uhbt_int(I-1,j) - uhbt_int(I,j)) + (vhbt_int(i,J-1) - vhbt_int(i,J))) )
eta_acc = max( eta_acc, abs( eta_cor_multiplier*eta_src(i,j) ), abs( eta_IC(i,j) ) )
if ( G%mask2dT(i,j) * ( eta(i,j) + GV%Z_to_H*G%bathyT(i,j) ) > &
-G%mask2dT(i,j) * eta_acc * epsilon(eta_acc) * 2. ) &
eta(i,j) = max( eta(i,j), -GV%Z_to_H*G%bathyT(i,j) )
eta_wtd(i,j) = eta_wtd(i,j) + eta(i,j) * wt_eta(n)
if ((eta(i,j) < -GV%Z_to_H*G%bathyT(i,j)) .and. (G%mask2dT(i,j) > 0.0)) then
write(mesg,'(ES24.16," vs. ",ES24.16, " at ", ES12.4, ES12.4, i7, i7)') GV%H_to_m*eta(i,j), &
-US%Z_to_m*G%bathyT(i,j), G%geoLonT(i,j), G%geoLatT(i,j), i + G%HI%idg_offset, j + G%HI%jdg_offset
if (CS%bt_limit_integral_transport) &
call MOM_error(FATAL, "btstep: eta has dropped below bathyT: "//trim(mesg))
! These blocks correct the sitution when the sea-surface drops below the seafloor by a
! tiny amount that could be attributable to floating-point round-off.
if (GV%Boussinesq) then
if ( G%mask2dT(i,j) * ( eta(i,j) + GV%Z_to_H*G%bathyT(i,j) ) > &
-G%mask2dT(i,j) * eta_acc * epsilon(eta_acc) * 2. ) &
eta(i,j) = max( eta(i,j), -GV%Z_to_H*G%bathyT(i,j) )
else
if (G%mask2dT(i,j) * eta(i,j) < 0.0) then
if (abs(eta(i,j)) < 2.*epsilon(eta_acc) * eta_acc) eta(i,j) = 0.0
endif
endif
eta_wtd(i,j) = eta_wtd(i,j) + eta(i,j) * wt_eta(n)
enddo ; enddo
else
!$OMP do
Expand Down Expand Up @@ -3143,8 +3144,7 @@ subroutine btloop_eta_predictor(n, dtbt, ubt, vbt, eta, ubt_int, vbt_int, uhbt,
real, dimension(SZIW_(CS),SZJBW_(CS)), intent(in) :: &
vbt !< The zonal barotropic velocity [L T-1 ~> m s-1].
real, target, dimension(SZIW_(CS),SZJW_(CS)), intent(in) :: &
eta !< The barotropic free surface height anomaly or column mass
!! anomaly [H ~> m or kg m-2]
eta !< The barotropic free surface height anomaly or column mass [H ~> m or kg m-2]
real, dimension(SZIBW_(CS),SZJW_(CS)), intent(in) :: &
ubt_int !< The running time integral of ubt over the time steps [L ~> m].
real, dimension(SZIW_(CS),SZJBW_(CS)), intent(in) :: &
Expand Down Expand Up @@ -3251,10 +3251,10 @@ subroutine btloop_find_PF(PFu, PFv, isv, iev, jsv, jev, eta_PF_BT, eta_PF, &
integer, intent(in) :: jsv !< The starting j-index of eta_pred being set in ths loop
integer, intent(in) :: jev !< The ending j-index of eta_pred being set in ths loop
real, dimension(SZIW_(CS),SZJW_(CS)), intent(in) :: &
eta_PF_BT !< The eta array (either the SSH anomaly or column mass anomaly) that
eta_PF_BT !< The eta array (either the SSH anomaly or column mass) that
!! determines the barotropic pressure force [H ~> m or kg m-2]
real, dimension(SZIW_(CS),SZJW_(CS)), intent(in) :: &
eta_PF !< The input 2-D eta field (either SSH anomaly or column mass anomaly)
eta_PF !< The input 2-D eta field (either SSH anomaly or column mass)
!! that was used to calculate the input pressure gradient
!! accelerations [H ~> m or kg m-2].
real, dimension(SZIW_(CS),SZJW_(CS)), intent(in) :: &
Expand Down Expand Up @@ -3339,7 +3339,7 @@ subroutine btloop_add_dyn_PF(PFu, PFv, eta_pred, eta, dyn_coef_eta, p_surf_dyn,
eta_pred !< The updated eta field (either SSH anomaly or column mass anomaly) that is
!! used to estimate the divergence that is to be damped [H ~> m or kg m-2].
real, dimension(SZIW_(CS),SZJW_(CS)), intent(in) :: &
eta !< The previous eta field (either SSH anomaly or column mass anomaly) that is
eta !< The previous eta field (either SSH anomaly or column mass) that is
!! used to estimate the divergence that is to be damped [H ~> m or kg m-2].
real, dimension(SZIW_(CS),SZJW_(CS)), intent(in) :: &
dyn_coef_eta !< The coefficient relating the changes in eta to the dynamic surface pressure
Expand Down
8 changes: 4 additions & 4 deletions src/core/MOM_dynamics_split_RK2.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ module MOM_dynamics_split_RK2
!! that were fed into the barotopic calculation [L T-2 ~> m s-2]

! The following variables are only used with the split time stepping scheme.
real ALLOCABLE_, dimension(NIMEM_,NJMEM_) :: eta !< Instantaneous free surface height (in Boussinesq
!! mode) or column mass anomaly (in non-Boussinesq
real ALLOCABLE_, dimension(NIMEM_,NJMEM_) :: eta !< Instantaneous free surface height anomaly (in
!! Boussinesq mode) or column mass (in non-Boussinesq
!! mode) [H ~> m or kg m-2]
real ALLOCABLE_, dimension(NIMEMB_PTR_,NJMEM_,NKMEM_) :: u_av !< layer x-velocity with vertical mean replaced by
!! time-mean barotropic velocity over a baroclinic
Expand Down Expand Up @@ -388,8 +388,8 @@ subroutine step_MOM_dyn_split_RK2(u_inst, v_inst, h, tv, visc, Time_local, dt, f
taux_bot => NULL(), & ! A pointer to the zonal bottom stress in some cases [R L Z T-2 ~> Pa]
tauy_bot => NULL(), & ! A pointer to the meridional bottom stress in some cases [R L Z T-2 ~> Pa]
! This pointer is just used as shorthand for CS%eta.
eta => NULL() ! A pointer to the instantaneous free surface height (in Boussinesq
! mode) or column mass anomaly (in non-Boussinesq mode) [H ~> m or kg m-2]
eta => NULL() ! A pointer to the instantaneous free surface height anomaly (in Boussinesq
! mode) or column mass (in non-Boussinesq mode) [H ~> m or kg m-2]

real, pointer, dimension(:,:,:) :: &
! These pointers are used to alter which fields are passed to btstep with various options:
Expand Down
8 changes: 4 additions & 4 deletions src/core/MOM_dynamics_split_RK2b.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ module MOM_dynamics_split_RK2b
!! that were fed into the barotopic calculation [L T-2 ~> m s-2]

! The following variables are only used with the split time stepping scheme.
real ALLOCABLE_, dimension(NIMEM_,NJMEM_) :: eta !< Instantaneous free surface height (in Boussinesq
!! mode) or column mass anomaly (in non-Boussinesq
real ALLOCABLE_, dimension(NIMEM_,NJMEM_) :: eta !< Instantaneous free surface height anomaly (in
!! Boussinesq mode) or column mass (in non-Boussinesq
!! mode) [H ~> m or kg m-2]
real ALLOCABLE_, dimension(NIMEMB_PTR_,NJMEM_,NKMEM_) :: u_av !< layer x-velocity with vertical mean replaced by
!! time-mean barotropic velocity over a baroclinic
Expand Down Expand Up @@ -383,8 +383,8 @@ subroutine step_MOM_dyn_split_RK2b(u_av, v_av, h, tv, visc, Time_local, dt, forc
taux_bot => NULL(), & ! A pointer to the zonal bottom stress in some cases [R L Z T-2 ~> Pa]
tauy_bot => NULL(), & ! A pointer to the meridional bottom stress in some cases [R L Z T-2 ~> Pa]
! This pointer is just used as shorthand for CS%eta.
eta => NULL() ! A pointer to the instantaneous free surface height (in Boussinesq
! mode) or column mass anomaly (in non-Boussinesq mode) [H ~> m or kg m-2]
eta => NULL() ! A pointer to the instantaneous free surface height anomaly (in Boussinesq
! mode) or column mass (in non-Boussinesq mode) [H ~> m or kg m-2]

real, pointer, dimension(:,:,:) :: &
! These pointers are used to alter which fields are passed to btstep with various options:
Expand Down
Loading