From f938e100ea92d4765807936a2106910525c5a327 Mon Sep 17 00:00:00 2001 From: Francesca Mele <francesca.mele@cmcc.it> Date: Tue, 27 Sep 2022 12:17:26 +0200 Subject: [PATCH] minor bugfix after merge, #79 --- src/OCE/DYN/dynvor.F90 | 8 ++++---- src/OCE/LDF/ldfslp.F90 | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/OCE/DYN/dynvor.F90 b/src/OCE/DYN/dynvor.F90 index 0f43b4bd2..b3fe56191 100644 --- a/src/OCE/DYN/dynvor.F90 +++ b/src/OCE/DYN/dynvor.F90 @@ -955,10 +955,10 @@ CONTAINS ztsw_jp1 = zwz(ji ,jj ) + zwz(ji-1,jj ) + zwz(ji-1,jj+1) ztsw_ip1 = zwz(ji+1,jj-1) + zwz(ji ,jj-1) + zwz(ji ,jj ) ! - zua = + r1_12 * r1_e1u(ji,jj) * ( ztne * zwy + ztnw_ip1 * zwy_ip1 & - & + ztse * zwy_jm1 + ztsw_ip1 * zwy_ip1_jm1 ) - zva = - r1_12 * r1_e2v(ji,jj) * ( ztsw_jp1 * zwx_im1_jp1 + ztse_jp1 * zwx_jp1 & - & + ztnw * zwx_im1 + ztne * zwx ) + zua = + r1_12 * r1_e1u(ji,jj) * ( ( ztne * zwy + ztnw_ip1 * zwy_ip1 ) & ! add () for + & + ( ztse * zwy_jm1 + ztsw_ip1 * zwy_ip1_jm1 ) ) ! NP repro + zva = - r1_12 * r1_e2v(ji,jj) * ( ( ztsw_jp1 * zwx_im1_jp1 + ztse_jp1 * zwx_jp1 ) & + & + ( ztnw * zwx_im1 + ztne * zwx ) ) pu_rhs(ji,jj,jk) = pu_rhs(ji,jj,jk) + zua pv_rhs(ji,jj,jk) = pv_rhs(ji,jj,jk) + zva END_2D diff --git a/src/OCE/LDF/ldfslp.F90 b/src/OCE/LDF/ldfslp.F90 index f25ec900e..e6247b49f 100644 --- a/src/OCE/LDF/ldfslp.F90 +++ b/src/OCE/LDF/ldfslp.F90 @@ -243,7 +243,6 @@ CONTAINS & + 2.*( ( zww(ji ,jj-1,jk) + zww(ji-1,jj ,jk) ) & & + ( zww(ji+1,jj ,jk) + zww(ji ,jj+1,jk) ) ) & & + 4.* zww(ji,jj ,jk) ) - END_2D ! !* decrease along coastal boundaries uslp(ji,jj,jk) = zuslp * ( umask(ji,jj+1,jk) + umask(ji,jj-1,jk ) ) * 0.5_wp & & * ( umask(ji,jj ,jk) + umask(ji,jj ,jk+1) ) * 0.5_wp -- GitLab