From 8c68db1016b3ef08f9b136282c18fc997bf0be0b Mon Sep 17 00:00:00 2001 From: Sebastien MASSON <massons@irene150.c-irene.tgcc.ccc.cea.fr> Date: Fri, 23 Sep 2022 19:18:00 +0200 Subject: [PATCH] minor fix in ldfslp.F90 for NP folding, #68 --- src/OCE/LDF/ldfslp.F90 | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/OCE/LDF/ldfslp.F90 b/src/OCE/LDF/ldfslp.F90 index d48046735..6231b844d 100644 --- a/src/OCE/LDF/ldfslp.F90 +++ b/src/OCE/LDF/ldfslp.F90 @@ -233,16 +233,16 @@ CONTAINS ! !* horizontal Shapiro filter DO jk = 2, jpkm1 DO_2D( 0, 0, 0, 0 ) ! rows jj=2 and =jpjm1 only - uslp(ji,jj,jk) = z1_16 * ( zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk) & - & + zwz(ji-1,jj+1,jk) + zwz(ji+1,jj+1,jk) & - & + 2.*( zwz(ji ,jj-1,jk) + zwz(ji-1,jj ,jk) & - & + zwz(ji+1,jj ,jk) + zwz(ji ,jj+1,jk) ) & - & + 4.* zwz(ji ,jj ,jk) ) - vslp(ji,jj,jk) = z1_16 * ( zww(ji-1,jj-1,jk) + zww(ji+1,jj-1,jk) & - & + zww(ji-1,jj+1,jk) + zww(ji+1,jj+1,jk) & - & + 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) ) + uslp(ji,jj,jk) = z1_16 * ( ( zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk) ) & ! need additional () for + & + ( zwz(ji-1,jj+1,jk) + zwz(ji+1,jj+1,jk) ) & ! reproducibility around NP + & + 2.*( ( zwz(ji ,jj-1,jk) + zwz(ji-1,jj ,jk) ) & + & + ( zwz(ji+1,jj ,jk) + zwz(ji ,jj+1,jk) ) ) & + & + 4.* zwz(ji ,jj ,jk) ) + vslp(ji,jj,jk) = z1_16 * ( ( zww(ji-1,jj-1,jk) + zww(ji+1,jj-1,jk) ) & ! need additional () for + & + ( zww(ji-1,jj+1,jk) + zww(ji+1,jj+1,jk) ) & ! reproducibility around NP + & + 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 DO_2D( 0, 0, 0, 0 ) @@ -294,17 +294,17 @@ CONTAINS DO jk = 2, jpkm1 DO_2D( 0, 0, 0, 0 ) ! rows jj=2 and =jpjm1 only zcofw = wmask(ji,jj,jk) * z1_16 - wslpi(ji,jj,jk) = ( zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk) & - & + zwz(ji-1,jj+1,jk) + zwz(ji+1,jj+1,jk) & - & + 2.*( zwz(ji ,jj-1,jk) + zwz(ji-1,jj ,jk) & - & + zwz(ji+1,jj ,jk) + zwz(ji ,jj+1,jk) ) & - & + 4.* zwz(ji ,jj ,jk) ) * zcofw - - wslpj(ji,jj,jk) = ( zww(ji-1,jj-1,jk) + zww(ji+1,jj-1,jk) & - & + zww(ji-1,jj+1,jk) + zww(ji+1,jj+1,jk) & - & + 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) ) * zcofw + wslpi(ji,jj,jk) = ( ( zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk) ) & ! need additional () for + & + ( zwz(ji-1,jj+1,jk) + zwz(ji+1,jj+1,jk) ) & ! reproducibility around NP + & + 2.*( ( zwz(ji ,jj-1,jk) + zwz(ji-1,jj ,jk) ) & + & + ( zwz(ji+1,jj ,jk) + zwz(ji ,jj+1,jk) ) ) & + & + 4.* zwz(ji ,jj ,jk) ) * zcofw + + wslpj(ji,jj,jk) = ( ( zww(ji-1,jj-1,jk) + zww(ji+1,jj-1,jk) ) & ! need additional () for + & + ( zww(ji-1,jj+1,jk) + zww(ji+1,jj+1,jk) ) & ! reproducibility around NP + & + 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) ) * zcofw END_2D ! !* decrease in vicinity of topography DO_2D( 0, 0, 0, 0 ) -- GitLab