From 4bd7f294798a3ef5c0d14f71b9a592c025571817 Mon Sep 17 00:00:00 2001 From: Pavel Perezhogin Date: Mon, 18 Aug 2025 10:40:02 -0400 Subject: [PATCH] address Robert Hallberg code review --- src/framework/MOM_ANN.F90 | 2 +- src/parameterizations/lateral/MOM_Zanna_Bolton.F90 | 6 +++--- src/parameterizations/lateral/MOM_hor_visc.F90 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/framework/MOM_ANN.F90 b/src/framework/MOM_ANN.F90 index 56cafcf7d5..4e921ccd48 100644 --- a/src/framework/MOM_ANN.F90 +++ b/src/framework/MOM_ANN.F90 @@ -1,4 +1,4 @@ -!> Implements the general purpose ANN. +!> Implements the general purpose Artificial Neural Network (ANN). module MOM_ANN ! This file is part of MOM6. See LICENSE.md for the license diff --git a/src/parameterizations/lateral/MOM_Zanna_Bolton.F90 b/src/parameterizations/lateral/MOM_Zanna_Bolton.F90 index 792d89f837..e06af5a749 100644 --- a/src/parameterizations/lateral/MOM_Zanna_Bolton.F90 +++ b/src/parameterizations/lateral/MOM_Zanna_Bolton.F90 @@ -721,7 +721,7 @@ subroutine compute_stress_ANN_collocated(G, GV, CS) vort_xy_h(i,j,k) = 0.25 * ( (CS%vort_xy(I-1,J-1,k) + CS%vort_xy(I,J,k)) & + (CS%vort_xy(I-1,J,k) + CS%vort_xy(I,J-1,k)) ) - sqr_h(i,j) = (CS%sh_xx(i,j,k)**2 + sh_xy_h(i,j,k)**2 + vort_xy_h(i,j,k)**2) * G%mask2dT(i,j) + sqr_h(i,j) = (((CS%sh_xx(i,j,k)**2) + (sh_xy_h(i,j,k)**2)) + (vort_xy_h(i,j,k)**2)) * G%mask2dT(i,j) enddo; enddo do j=js,je ; do i=is,ie @@ -887,7 +887,7 @@ subroutine compute_stress_divergence(u, v, h, diffu, diffv, dx2h, dy2h, dx2q, dy do j=js,je ; do I=Isq,Ieq h_u = 0.5 * (G%mask2dT(i,j)*h(i,j,k) + G%mask2dT(i+1,j)*h(i+1,j,k)) + h_neglect fx = ((G%IdyCu(I,j)*(Mxx(i+1,j) - Mxx(i,j)) + & - G%IdxCu(I,j)*(dx2q(I,J)*Mxy(I,J) - dx2q(I,J-1)*Mxy(I,J-1))) * & + G%IdxCu(I,j)*((dx2q(I,J)*Mxy(I,J)) - (dx2q(I,J-1)*Mxy(I,J-1)))) * & G%IareaCu(I,j)) / h_u diffu(I,j,k) = diffu(I,j,k) + fx if (save_ZB2020u) & @@ -898,7 +898,7 @@ subroutine compute_stress_divergence(u, v, h, diffu, diffv, dx2h, dy2h, dx2q, dy do J=Jsq,Jeq ; do i=is,ie h_v = 0.5 * (G%mask2dT(i,j)*h(i,j,k) + G%mask2dT(i,j+1)*h(i,j+1,k)) + h_neglect fy = ((G%IdxCv(i,J)*(Myy(i,j+1) - Myy(i,j)) + & - G%IdyCv(i,J)*(dy2q(I,J)*Mxy(I,J) - dy2q(I-1,J)*Mxy(I-1,J))) * & + G%IdyCv(i,J)*((dy2q(I,J)*Mxy(I,J)) - (dy2q(I-1,J)*Mxy(I-1,J)))) * & G%IareaCv(i,J)) / h_v diffv(i,J,k) = diffv(i,J,k) + fy if (save_ZB2020v) & diff --git a/src/parameterizations/lateral/MOM_hor_visc.F90 b/src/parameterizations/lateral/MOM_hor_visc.F90 index fff9a3fe50..b40c7c93f6 100644 --- a/src/parameterizations/lateral/MOM_hor_visc.F90 +++ b/src/parameterizations/lateral/MOM_hor_visc.F90 @@ -969,8 +969,8 @@ subroutine horizontal_viscosity(u, v, h, uh, vh, diffu, diffv, MEKE, VarMix, G, if (CS%use_circulation) then do J=js_vort,je_vort ; do I=is_vort,ie_vort vort_xy(I,J) = G%mask2dBu(I,J) * G%IareaBu(I,J) * ( & - (v(i+1,J,k)*G%dyCv(i+1,J) - v(i,J,k)*G%dyCv(i,J)) & - - (u(I,j+1,k)*G%dxCu(I,j+1) - u(I,j,k)*G%dxCu(I,j)) & + ((v(i+1,J,k)*G%dyCv(i+1,J)) - (v(i,J,k)*G%dyCv(i,J))) & + - ((u(I,j+1,k)*G%dxCu(I,j+1)) - (u(I,j,k)*G%dxCu(I,j))) & ) enddo ; enddo else