Changeset 12737 for NEMO/releases/r4.0/r4.0-HEAD/src/OCE/LBC/mppini.F90

Timestamp:

2020-04-10T19:55:11+02:00 (4 years ago)

Author:

jchanut

Message:

Fixes AGRIF reproductibility with land processors removal, i.e. #2240. Trunk is not concerned by this problem since nbondi/nbondj variables are not used anymore.

File:

• NEMO/releases/r4.0/r4.0-HEAD/src/OCE/LBC/mppini.F90 (modified) (7 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/LBC/mppini.F90

@@ -90 +90 @@
       l_Jperio = jpnj == 1 .AND. (jperio == 2 .OR. jperio == 7)
       !
+      ! Set flags to detect global domain edges for AGRIF
+      l_Westedge = .true. ; l_Eastedge = .true. ; l_Northedge = .true.; l_Southedge = .true.
+      !
       IF(lwp) THEN
          WRITE(numout,*)
@@ -162 +165 @@
       INTEGER, ALLOCATABLE, DIMENSION(:,:) ::   ilej, ildj, ioso, iowe         !  -     -
       LOGICAL, ALLOCATABLE, DIMENSION(:,:) ::   llisoce                        !  -     -
+      LOGICAL, ALLOCATABLE, DIMENSION(:,:) ::   lliswest, lliseast, llisnorth, llissouth  !  -     -
       NAMELIST/nambdy/ ln_bdy, nb_bdy, ln_coords_file, cn_coords_file,           &
            &             ln_mask_file, cn_mask_file, cn_dyn2d, nn_dyn2d_dta,     &
@@ -331 +335 @@
          &       ilei(jpni,jpnj), ildi(jpni,jpnj), iono(jpni,jpnj), ioea(jpni,jpnj),   &
          &       ilej(jpni,jpnj), ildj(jpni,jpnj), ioso(jpni,jpnj), iowe(jpni,jpnj),   &
+#if defined key_agrif
+                 lliswest(jpni,jpnj), lliseast(jpni,jpnj),  & 
+         &       llisnorth(jpni,jpnj),llissouth(jpni,jpnj), &
+#endif
          &       STAT=ierr )
       CALL mpp_sum( 'mppini', ierr )
@@ -343 +351 @@
          IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'mpp_init:Agrif children requires ln_use_jattr = .false. ' )
       ENDIF
+      lliswest(:,:) = .false. ; lliseast(:,:) = .false. ; llisnorth(:,:) = .false. ; llissouth(:,:) = .false.
 #endif
       !
@@ -430 +439 @@
          ENDIF
          !
+#if defined key_agrif
+         IF ((ibondi(ii,ij) ==  1).OR.(ibondi(ii,ij) == 2)) lliseast(ii,ij)  = .true.      ! east 
+         IF ((ibondi(ii,ij) == -1).OR.(ibondi(ii,ij) == 2)) lliswest(ii,ij)  = .true.      ! west 
+         IF ((ibondj(ii,ij) ==  1).OR.(ibondj(ii,ij) == 2)) llisnorth(ii,ij) = .true.      ! north 
+         IF ((ibondj(ii,ij) == -1).OR.(ibondj(ii,ij) == 2)) llissouth(ii,ij) = .true.      ! south 
+#endif
       END DO
-
       ! 4. deal with land subdomains
       ! ----------------------------
@@ -601 +615 @@
       ! Suppress once vertical online interpolation is ok
 !!$      IF(.NOT.Agrif_Root())   jpkglo = Agrif_Parent( jpkglo )
+      l_Westedge  = lliswest(ii,ij)
+      l_Eastedge  = lliseast(ii,ij)
+      l_Northedge = llisnorth(ii,ij)
+      l_Southedge = llissouth(ii,ij) 
 #endif
       jpim1 = jpi-1                                            ! inner domain indices
@@ -716 +734 @@
          &       ilci, ilcj, ilei, ilej, ildi, ildj,              &
          &       iono, ioea, ioso, iowe, llisoce)
+#if defined key_agrif
+      DEALLOCATE(lliswest, lliseast, llisnorth, llissouth)
+#endif
       !
     END SUBROUTINE mpp_init