Changeset 9805 for NEMO/trunk/src/OCE

Timestamp:

2018-06-15T17:03:42+02:00 (6 years ago)

Author:

smasson

Message:

trunk: set proper NP folding corners, see #2101

File:

• NEMO/trunk/src/OCE/LBC/mpp_nfd_generic.h90 (modified) (3 diffs)

NEMO/trunk/src/OCE/LBC/mpp_nfd_generic.h90

@@ -95 +95 @@
          ALLOCATE( ztabl(jpimax   ,4,ipk,ipl,ipf) , ztabr(jpimax*jpmaxngh,4,ipk,ipl,ipf) ) 
          !
-         ztabr(:,:,:,:,:) = 0._wp
-         ztabl(:,:,:,:,:) = 0._wp
-         !
          DO jf = 1, ipf
             DO jl = 1, ipl
@@ -119 +116 @@
             iproc = nfipproc(isendto(jr),jpnj)
             IF(iproc /= -1) THEN
+               iilb = nimppt(iproc+1)
+               ildi = nldit (iproc+1)
                ilei = nleit (iproc+1)
-               ildi = nldit (iproc+1)
+               IF( iilb           ==      1 )   ildi = 1     ! e-w boundary already done -> force to take 1st column
+               IF( iilb + jpi - 1 == jpiglo )   ilei = jpi   ! e-w boundary already done -> force to take last column
                iilb = nfiimpp(isendto(jr),jpnj) - nfiimpp(isendto(1),jpnj)
             ENDIF
@@ -182 +182 @@
             &                znorthgloio, itaille, MPI_DOUBLE_PRECISION, ncomm_north, ierr )
          !
-         ztab(:,:,:,:,:) = 0._wp
          DO jr = 1, ndim_rank_north         ! recover the global north array
             iproc = nrank_north(jr) + 1
+            iilb  = nimppt(iproc)
             ildi  = nldit (iproc)
             ilei  = nleit (iproc)
-            iilb  = nimppt(iproc)
+            IF( iilb           ==      1 )   ildi = 1     ! e-w boundary already done -> force to take 1st column
+            IF( iilb + jpi - 1 == jpiglo )   ilei = jpi   ! e-w boundary already done -> force to take last column
             DO jf = 1, ipf
                DO jl = 1, ipl