Changeset 9667 for NEMO/trunk/src/OCE/LBC/mpp_lnk_generic.h90

Timestamp:

2018-05-28T17:47:05+02:00 (6 years ago)

Author:

smasson

Message:

trunk: cyclic north-south periodicity and nperio cleaning, see #2093

File:

• NEMO/trunk/src/OCE/LBC/mpp_lnk_generic.h90 (modified) (4 diffs)

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

@@ -62 +62 @@
       INTEGER  ::   ml_req1, ml_req2, ml_err     ! for key_mpi_isend
       REAL(wp) ::   zland
-      LOGICAL  ::   ll_Iperio, ll_Jperio
       INTEGER , DIMENSION(MPI_STATUS_SIZE)      ::   ml_stat        ! for key_mpi_isend
       REAL(wp), DIMENSION(:,:,:,:,:,:), ALLOCATABLE ::   zt3ns, zt3sn   ! north-south & south-north  halos
@@ -75 +74 @@
          &      zt3ew(jpj,nn_hls,ipk,ipl,ipf,2), zt3we(jpj,nn_hls,ipk,ipl,ipf,2)  )
       !
-      ll_Iperio = nbondi == 2 .AND. (nperio == 1 .OR. nperio == 4 .OR. nperio == 6)
-      ll_Jperio = nbondj == 2 .AND.  jperio == 7
-      !
       IF( PRESENT( pval ) ) THEN   ;   zland = pval      ! set land value
       ELSE                         ;   zland = 0._wp     ! zero by default
@@ -111 +107 @@
          DO jf = 1, ipf                      ! number of arrays to be treated
             !
-            !                             ! East-West boundaries
-            IF( ll_Iperio ) THEN                   !* cyclic
+            !                                ! East-West boundaries
+            IF( l_Iperio ) THEN                    !* cyclic
                ARRAY_IN( 1 ,:,:,:,jf) = ARRAY_IN(jpim1,:,:,:,jf)
                ARRAY_IN(jpi,:,:,:,jf) = ARRAY_IN(  2  ,:,:,:,jf)
@@ -120 +116 @@
             ENDIF
             !                                ! North-South boundaries
-            IF( ll_Jperio ) THEN                   !* cyclic (only with no mpp j-split)
+            IF( l_Jperio ) THEN                    !* cyclic (only with no mpp j-split)
                ARRAY_IN(:, 1 ,:,:,jf) = ARRAY_IN(:, jpjm1,:,:,jf)
                ARRAY_IN(:,jpj,:,:,jf) = ARRAY_IN(:,   2  ,:,:,jf)