Changeset 10314 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/stpctl.F90

Timestamp:

2018-11-15T17:27:18+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: action 2: add generic glob_min/max/sum and locmin/max, complete timing and report (including bdy and icb), see #2133

File:

• NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/stpctl.F90 (modified) (5 diffs)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/stpctl.F90

@@ -61 +61 @@
       !!
       INTEGER  ::   ji, jj, jk             ! dummy loop indices
-      INTEGER  ::   iih, ijh               ! local integers
-      INTEGER  ::   iiu, iju, iku          !   -       -
-      INTEGER  ::   iis1, ijs1, iks1       !   -       -
-      INTEGER  ::   iis2, ijs2, iks2       !   -       -
+      INTEGER  ::   ih(2)                  ! local integers
+      INTEGER  ::   iu(3)                  !   -       -
+      INTEGER  ::   is1(3)                 !   -       -
+      INTEGER  ::   is2(3)                 !   -       -
       REAL(wp) ::   zzz                    ! local real 
       INTEGER , DIMENSION(3) ::   ilocu, ilocs1, ilocs2
@@ -112 +112 @@
       !
       IF( lk_mpp ) THEN
-         CALL mpp_max_multiple( zmax(:), 5 )    ! max over the global domain
+         CALL mpp_max( "stpctl", zmax )    ! max over the global domain
          !
          nstop = NINT( zmax(5) )                 ! nstop indicator sheared among all local domains
@@ -129 +129 @@
          &  ISNAN( zmax(1) + zmax(2) + zmax(3) )  ) THEN   ! NaN encounter in the tests
          IF( lk_mpp ) THEN
-            CALL mpp_maxloc( ABS(sshn)        , ssmask(:,:)  , zzz, iih , ijh        )
-            CALL mpp_maxloc( ABS(un)          , umask (:,:,:), zzz, iiu , iju , iku  )
-            CALL mpp_minloc( tsn(:,:,:,jp_sal), tmask (:,:,:), zzz, iis1, ijs1, iks1 )
-            CALL mpp_maxloc( tsn(:,:,:,jp_sal), tmask (:,:,:), zzz, iis2, ijs2, iks2 )
+            CALL mpp_maxloc( 'stpctl', ABS(sshn)        , ssmask(:,:)  , zzz, ih  )
+            CALL mpp_maxloc( 'stpctl', ABS(un)          , umask (:,:,:), zzz, iu  )
+            CALL mpp_minloc( 'stpctl', tsn(:,:,:,jp_sal), tmask (:,:,:), zzz, is1 )
+            CALL mpp_maxloc( 'stpctl', tsn(:,:,:,jp_sal), tmask (:,:,:), zzz, is2 )
          ELSE
             iloch  = MINLOC( ABS( sshn(:,:)   )                               )
@@ -138 +138 @@
             ilocs1 = MINLOC( tsn(:,:,:,jp_sal) , mask = tmask(:,:,:) == 1._wp )
             ilocs2 = MAXLOC( tsn(:,:,:,jp_sal) , mask = tmask(:,:,:) == 1._wp )
-            iih  = iloch (1) + nimpp - 1   ;   ijh  = iloch (2) + njmpp - 1
-            iiu  = ilocu (1) + nimpp - 1   ;   iju  = ilocu (2) + njmpp - 1   ;   iku  = ilocu (3)
-            iis1 = ilocs1(1) + nimpp - 1   ;   ijs1 = ilocs1(2) + njmpp - 1   ;   iks1 = ilocs1(3)
-            iis2 = ilocs2(1) + nimpp - 1   ;   ijs2 = ilocs2(2) + njmpp - 1   ;   iks2 = ilocs2(3)
+            ih(1)  = iloch (1) + nimpp - 1   ;   ih(2)  = iloch (2) + njmpp - 1
+            iu(1)  = ilocu (1) + nimpp - 1   ;   iu(2)  = ilocu (2) + njmpp - 1   ;   iu(3)  = ilocu (3)
+            is1(1) = ilocs1(1) + nimpp - 1   ;   is1(2) = ilocs1(2) + njmpp - 1   ;   is1(3) = ilocs1(3)
+            is2(1) = ilocs2(1) + nimpp - 1   ;   is2(2) = ilocs2(2) + njmpp - 1   ;   is2(3) = ilocs2(3)
          ENDIF
          IF(lwp) THEN
@@ -147 +147 @@
             WRITE(numout,*) ' stp_ctl: |ssh| > 10 m  or  |U| > 10 m/s  or  S <= 0  or  S >= 100  or  NaN encounter in the tests'
             WRITE(numout,*) ' ======= '
-            WRITE(numout,9100) kt,   zmax(1), iih , ijh
-            WRITE(numout,9200) kt,   zmax(2), iiu , iju , iku
-            WRITE(numout,9300) kt, - zmax(3), iis1, ijs1, iks1
-            WRITE(numout,9400) kt,   zmax(4), iis2, ijs2, iks2
+            WRITE(numout,9100) kt,   zmax(1), ih(1) , ih(2)
+            WRITE(numout,9200) kt,   zmax(2), iu(1) , iu(2) , iu(3)
+            WRITE(numout,9300) kt, - zmax(3), is1(1), is1(2), is1(3)
+            WRITE(numout,9400) kt,   zmax(4), is2(1), is2(2), is2(3)
             WRITE(numout,*)
             WRITE(numout,*) '          output of last computed fields in output.abort.nc file'