Changeset 9772 for NEMO/branches/2018/dev_r9759_HPC09_ESIWACE/src/OCE/LBC/mppini.F90

Timestamp:

2018-06-08T14:52:48+02:00 (6 years ago)

Author:

smasson

Message:

dev_r9759_HPC09_ESIWACE: add benchmark features

File:

• NEMO/branches/2018/dev_r9759_HPC09_ESIWACE/src/OCE/LBC/mppini.F90 (modified) (4 diffs)

NEMO/branches/2018/dev_r9759_HPC09_ESIWACE/src/OCE/LBC/mppini.F90

@@ -151 +151 @@
       INTEGER, ALLOCATABLE, DIMENSION(:,:) ::   ilei, ildi, iono, ioea         !  -     -
       INTEGER, ALLOCATABLE, DIMENSION(:,:) ::   ilej, ildj, ioso, iowe         !  -     -
-      INTEGER, DIMENSION(jpiglo,jpjglo) ::   imask   ! 2D global domain workspace
+      INTEGER, ALLOCATABLE, DIMENSION(:,:) ::   imask   ! 2D global domain
       !!----------------------------------------------------------------------
 
@@ -196 +196 @@
 
       !
-      IF ( jpni * jpnj == jpnij ) THEN    ! regular domain lay out over processors
-         imask(:,:) = 1               
-      ELSEIF ( jpni*jpnj > jpnij ) THEN   ! remove land-only processor (i.e. where imask(:,:)=0)
+      ALLOCATE ( imask(jpiglo,jpjglo), stat=ierr )
+      !
+      IF ( jpni*jpnj > jpnij ) THEN   ! remove land-only processor (i.e. where imask(:,:)=0)
+         IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'mpp_init: unable to allocate global ocean arrays' )
          CALL mpp_init_mask( imask )   
-      ELSE                                ! error
+      ELSEIF ( jpnij > jpni*jpnj ) THEN   ! error
          CALL ctl_stop( 'mpp_init: jpnij > jpni x jpnj. Check namelist setting!' )
       ENDIF
@@ -335 +336 @@
          !
          ! Check wet points over the entire domain to preserve the MPI communication stencil
-         isurf = 0
-         DO jj = 1, ilj
-            DO  ji = 1, ili
-               IF( imask(ji+iimppt(ii,ij)-1, jj+ijmppt(ii,ij)-1) == 1)   isurf = isurf+1
-            END DO
-         END DO
+        IF ( jpni * jpnj == jpnij ) THEN    ! regular domain lay out over processors
+           isurf = ili * ilj
+         ELSE
+           isurf = 0
+           DO jj = 1, ilj
+              DO  ji = 1, ili
+                 IF( imask(ji+iimppt(ii,ij)-1, jj+ijmppt(ii,ij)-1) == 1)   isurf = isurf+1
+              END DO
+           END DO
+         ENDIF
          !
          IF( isurf /= 0 ) THEN
@@ -349 +354 @@
          ENDIF
       END DO
+      DEALLOCATE ( imask )
       !
       nfipproc(:,:) = ipproc(:,:)