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

Timestamp:

2020-04-23T15:14:45+02:00 (4 years ago)

Author:

smasson

Message:

Extra_Halo: input file only over inner domain + new variables names, see #2366

File:

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

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

@@ -56 +56 @@
       INTEGER  ::   ipi, ipk, ipl, ipf         ! dimension of the input array
       INTEGER  ::   imigr, iihom, ijhom             ! local integers
-      INTEGER  ::   ierr, ibuffsize, ilci, ildi, ilei, iilb
+      INTEGER  ::   ierr, ibuffsize, ijpi, iis0, iie0, iilb
       INTEGER  ::   ij, iproc
       INTEGER, DIMENSION (jpmaxngh)       ::   ml_req_nf   ! for mpi_isend when avoiding mpi_allgather
@@ -111 +111 @@
                CASE ( 'T' , 'W' ,'U' )                            ! T-, U-, W-point
                   DO ji = 1, nn_hls+1
-                     jj_s(jf,ji) = nlcj - 2*nn_hls +ji -1
+                     jj_s(jf,ji) = jpj - 2*nn_hls +ji -1
                   ENDDO
                CASE ( 'V' , 'F' )                                 ! V-, F-point
                   DO ji = 1, nn_hls+1
-                     jj_s(jf,ji) = nlcj - 2*nn_hls +ji - 2
+                     jj_s(jf,ji) = jpj - 2*nn_hls +ji - 2
                   ENDDO
                END SELECT
@@ -124 +124 @@
                CASE ( 'T' , 'W' ,'U' )                            ! T-, U-, W-point
                   DO ji = 1, nn_hls
-                     jj_s(jf,ji) = nlcj - 2*nn_hls + ji
+                     jj_s(jf,ji) = jpj - 2*nn_hls + ji
                   ENDDO
                   ipj_s(jf) = nn_hls                  ! need only one line anyway
                CASE ( 'V' , 'F' )                                 ! V-, F-point
                   DO ji = 1, nn_hls+1
-                     jj_s(jf,ji) = nlcj - 2*nn_hls +ji -1
+                     jj_s(jf,ji) = jpj - 2*nn_hls +ji -1
                   ENDDO
                END SELECT
@@ -175 +175 @@
             iproc = nfipproc(isendto(jr),jpnj)
             IF(iproc /= -1) THEN
-               iilb = nimppt(iproc+1)
-               ilci = nlcit (iproc+1)
-               ildi = nldit (iproc+1) + nn_hls-1
-               ilei = nleit (iproc+1) + nn_hls-1
-               IF( iilb            ==      1 )   ildi = nn_hls   ! e-w boundary already done -> force to take 1st column
-               IF( iilb + ilci - 1 == jpiglo )   ilei = nlei+1   ! e-w boundary already done -> force to take last column
+               iilb =  nimppt(iproc+1)
+               ijpi =  jpiall(iproc+1)
+               iis0 = nis0all(iproc+1) + nn_hls-1
+               iie0 = nie0all(iproc+1) + nn_hls-1
+               IF( iilb            ==      1 )   iis0 = nn_hls   ! e-w boundary already done -> force to take 1st column
+               IF( iilb + ijpi - 1 == jpiglo )   iie0 = Nie0+1   ! e-w boundary already done -> force to take last column
                iilb = nfiimpp(isendto(jr),jpnj) - nfiimpp(isendto(1),jpnj)
             ENDIF
@@ -190 +190 @@
                   DO jl = 1, ipl
                      DO jk = 1, ipk
-                        DO ji = ildi, ilei
+                        DO ji = iis0, iie0
                            ztabr(iilb-nn_hls+1+ji,jj,jk,jl,jf) = zfoldwk(ji,js,jk,jl,1)
                         END DO
@@ -200 +200 @@
                   DO jl = 1, ipl
                      DO jk = 1, ipk
-                        DO ji = ildi, ilei
+                        DO ji = iis0, iie0
                            ztabr(iilb-nn_hls+1+ji,jj,jk,jl,jf) = ARRAY_IN(ji,jj_s(jf,jj),jk,jl,jf)
                         END DO
@@ -233 +233 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jj = nlcj - ijpj +1, nlcj
-                     ij = jj - nlcj + ijpj
+                  DO jj = jpj - ijpj +1, jpj
+                     ij = jj - jpj + ijpj
                      znorthloc(1:jpi,ij,jk,jl,jf) = ARRAY_IN(1:jpi,jj,jk,jl,jf)
                   END DO
@@ -262 +262 @@
          DO jr = 1, ndim_rank_north         ! recover the global north array
             iproc = nrank_north(jr) + 1
-            iilb  = nimppt(iproc)
-            ilci  = nlcit (iproc)
-            ildi  = nldit (iproc)
-            ilei  = nleit (iproc)
-            IF( iilb            ==      1 )   ildi = 1      ! e-w boundary already done -> force to take 1st column
-            IF( iilb + ilci - 1 == jpiglo )   ilei = ilci   ! e-w boundary already done -> force to take last column
+            iilb  =  nimppt(iproc)
+            ijpi  =  jpiall(iproc)
+            iis0  = nis0all(iproc)
+            iie0  = nie0all(iproc)
+            IF( iilb            ==      1 )   iis0 = 1      ! e-w boundary already done -> force to take 1st column
+            IF( iilb + ijpi - 1 == jpiglo )   iie0 = ijpi   ! e-w boundary already done -> force to take last column
             DO jf = 1, ipf
                DO jl = 1, ipl
                   DO jk = 1, ipk
                      DO jj = 1, ijpj
-                        DO ji = ildi, ilei
+                        DO ji = iis0, iie0
                            ztab(ji+iilb-1,jj,jk,jl,jf) = znorthgloio(ji,jj,jk,jl,jf,jr)
                         END DO
@@ -287 +287 @@
             DO jl = 1, ipl
                DO jk = 1, ipk
-                  DO jj = nlcj-ijpj+1, nlcj             ! Scatter back to ARRAY_IN
-                     ij = jj - nlcj + ijpj
-                     DO ji= 1, nlci
+                  DO jj = jpj-ijpj+1, jpj             ! Scatter back to ARRAY_IN
+                     ij = jj - jpj + ijpj
+                     DO ji= 1, jpi
                         ARRAY_IN(ji,jj,jk,jl,jf) = ztab(ji+nimpp-1,ij,jk,jl,jf)
                      END DO