From 1f707270f555729416fee8f4e14f824d5eedc251 Mon Sep 17 00:00:00 2001 From: "Alan J. Wallcraft" Date: Wed, 26 Feb 2025 22:08:04 +0000 Subject: [PATCH 1/2] Update btstep negative eta warning In Boussinesq mode the eta below bathyT warning includes the location, but in non-Boussinesq mode the corresponding negative eta warning does not. Added the location to the negative eta warning. No answers are changed. --- src/core/MOM_barotropic.F90 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/MOM_barotropic.F90 b/src/core/MOM_barotropic.F90 index 0948580e9f..e4cf784a2d 100644 --- a/src/core/MOM_barotropic.F90 +++ b/src/core/MOM_barotropic.F90 @@ -2536,8 +2536,11 @@ subroutine btstep(U_in, V_in, eta_in, dt, bc_accel_u, bc_accel_v, forces, pbce, else do j=js,je ; do i=is,ie if (eta(i,j) < 0.0) then + write(mesg,'(" at ", ES12.4, ES12.4, i7, i7)') & + G%geoLonT(i,j), G%geoLatT(i,j), i + G%HI%idg_offset, j + G%HI%jdg_offset if (err_count < 2) & - call MOM_error(WARNING, "btstep: negative eta in a non-Boussinesq barotropic solver.", all_print=.true.) + call MOM_error(WARNING, "btstep: negative eta in a non-Boussinesq barotropic solver "//& + trim(mesg), all_print=.true.) err_count = err_count + 1 endif enddo ; enddo From 41ed3912a0f98272c2bb36f0513a82b1b252399c Mon Sep 17 00:00:00 2001 From: "Alan J. Wallcraft" Date: Mon, 3 Mar 2025 20:30:36 +0000 Subject: [PATCH 2/2] 4 space indenting of continuation lines --- src/core/MOM_barotropic.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/MOM_barotropic.F90 b/src/core/MOM_barotropic.F90 index e4cf784a2d..e7b2787bcf 100644 --- a/src/core/MOM_barotropic.F90 +++ b/src/core/MOM_barotropic.F90 @@ -2537,10 +2537,10 @@ subroutine btstep(U_in, V_in, eta_in, dt, bc_accel_u, bc_accel_v, forces, pbce, do j=js,je ; do i=is,ie if (eta(i,j) < 0.0) then write(mesg,'(" at ", ES12.4, ES12.4, i7, i7)') & - G%geoLonT(i,j), G%geoLatT(i,j), i + G%HI%idg_offset, j + G%HI%jdg_offset + G%geoLonT(i,j), G%geoLatT(i,j), i + G%HI%idg_offset, j + G%HI%jdg_offset if (err_count < 2) & call MOM_error(WARNING, "btstep: negative eta in a non-Boussinesq barotropic solver "//& - trim(mesg), all_print=.true.) + trim(mesg), all_print=.true.) err_count = err_count + 1 endif enddo ; enddo