Changeset 13266 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/LBC/mpp_nfd_generic.h90

Timestamp:

2020-07-08T14:49:37+02:00 (4 years ago)

Author:

acc

Message:

Extra_Halo: revert previous bugfix in mppini.F90 and fix, instead, the ordering and treatment of processors in the north-fold communicator. Now passes all SETTE including an extra version of ORCA2_ICE_PISCES, REPRO_8_4 with land-suppression and ln_nnogather=F. run.stat differences from trunk@13218 in ORCA2_ICE_PISCES associated with calving (REPRO tests which have ln_calving=F match). Also tracer.stat differences after 42 timesteps (unexplained).

File:

• NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/LBC/mpp_nfd_generic.h90 (modified) (5 diffs)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/LBC/mpp_nfd_generic.h90

@@ -90 +90 @@
       INTEGER  ::   ii1, ii2, ij1, ij2
       INTEGER  ::   ipimax, i0max
-      INTEGER  ::   ij, iproc, ipni
+      INTEGER  ::   ij, iproc, ipni, ijnr
       INTEGER, DIMENSION (jpmaxngh)       ::   ml_req_nf   ! for mpi_isend when avoiding mpi_allgather
       INTEGER                             ::   ml_err      ! for mpi_isend when avoiding mpi_allgather
@@ -298 +298 @@
          i0max = jpimax - 2 * nn_hls
          ibuffsize = i0max * ipj * ipk * ipl * ipf
-         ALLOCATE( znorthloc(i0max,ipj,ipk,ipl,ipf), znorthglo(i0max,ipj,ipk,ipl,ipf,jpni) )
+         ALLOCATE( znorthloc(i0max,ipj,ipk,ipl,ipf), znorthglo(i0max,ipj,ipk,ipl,ipf,ndim_rank_north) )
          !
          DO jf = 1, ipf   ;   DO jl = 1, ipl   ;   DO jk = 1, ipk               ! put in znorthloc ipj j-lines of ptab
@@ -307 +307 @@
                   znorthloc(ji,jj,jk,jl,jf) = ARRAY_IN(ii2,ij2,jk,jl,jf)
                END DO
-               DO ji = Nie0+1, i0max
+               DO ji = Ni_0+1, i0max
                   znorthloc(ji,jj,jk,jl,jf) = HUGE(0._wp)   ! avoid sending uninitialized values (make sure we don't use it)
                END DO
@@ -322 +322 @@
          !
          ! need to fill only the first ipj lines of ztabglo as lbc_nfd don't use the last nn_hls lines
+         ijnr = 0
          DO jr = 1, jpni                                                        ! recover the global north array
             iproc = nfproc(jr)
@@ -352 +353 @@
                !
             ELSE
+               ijnr = ijnr + 1
                DO jf = 1, ipf   ;   DO jl = 1, ipl   ;   DO jk = 1, ipk
                   DO jj = 1, ipj
                      DO ji = 1, ipi
                         ii1 = impp + nn_hls + ji - 1             ! corresponds to mig(nn_hls + ji) but for subdomain iproc
-                        ztabglo(ii1,jj,jk,jl,jf) = znorthglo(ji,jj,jk,jl,jf,jr)
+                        ztabglo(ii1,jj,jk,jl,jf) = znorthglo(ji,jj,jk,jl,jf,ijnr)
                      END DO
                   END DO