Changeset 10358 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/LBC/lib_mpp.F90

Timestamp:

2018-11-25T15:24:21+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: action 5b: by default, suppress global communication in stpctl, see #2133

File:

• NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/LBC/lib_mpp.F90 (modified) (8 diffs)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/LBC/lib_mpp.F90

@@ -574 +574 @@
       INTEGER, INTENT(in   ), OPTIONAL     ::   kcom 
       INTEGER  ::   ierror, ilocalcomm
-      LOGICAL, SAVE ::   ll_switch 
+      LOGICAL, SAVE ::   ll_switch , lllast
       INTEGER, SAVE ::   ireq = -1
       !!----------------------------------------------------------------------
       ilocalcomm = mpi_comm_oce
-      IF( PRESENT(kcom) )   ilocalcomm = kcom
+      IF( PRESENT(  kcom) )   ilocalcomm = kcom
+      lllast = .FALSE.
+      IF( PRESENT(ldlast) )   lllast = ldlast
       
       IF ( ireq /= -1 ) THEN   ! get ld_switch(2) from ll_switch (from previous call)
@@ -586 +588 @@
          IF( ln_timing ) CALL tic_tac(.FALSE., ld_global = .TRUE.)
       ENDIF
-      IF( .NOT. ldlast ) &     ! send ll_switch to be received on next call
+      IF( .NOT. lllast ) &     ! send ll_switch to be received on next call
          CALL mpi_iallreduce( ld_switch(1), ll_switch, 1, MPI_LOGICAL, mpi_lor, ilocalcomm, ireq, ierror )
 
@@ -751 +753 @@
 
 
-   SUBROUTINE mppstop( ldfinal ) 
+   SUBROUTINE mppstop( ldfinal, ld_force_abort ) 
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***
@@ -759 +761 @@
       !!----------------------------------------------------------------------
       LOGICAL, OPTIONAL, INTENT(in) :: ldfinal    ! source process number
-      LOGICAL ::   llfinal
+      LOGICAL, OPTIONAL, INTENT(in) :: ld_force_abort    ! source process number
+      LOGICAL ::   llfinal, ll_force_abort
       INTEGER ::   info
       !!----------------------------------------------------------------------
-      !
-      CALL mppsync
-      CALL mpi_finalize( info )
       llfinal = .FALSE.
       IF( PRESENT(ldfinal) ) llfinal = ldfinal
+      ll_force_abort = .FALSE.
+      IF( PRESENT(ld_force_abort) ) ll_force_abort = ld_force_abort
+      !
+      IF(ll_force_abort) THEN
+         CALL mpi_abort( MPI_COMM_WORLD )
+      ELSE
+         CALL mppsync
+         CALL mpi_finalize( info )
+      ENDIF
       IF( .NOT. llfinal ) STOP 123456
       !
@@ -1638 +1647 @@
    END SUBROUTINE mpp_ilor
 
-   SUBROUTINE mppstop
+   SUBROUTINE mppstop( ldfinal, ld_force_abort )
+      LOGICAL, OPTIONAL, INTENT(in) :: ldfinal    ! source process number
+      LOGICAL, OPTIONAL, INTENT(in) :: ld_force_abort    ! source process number
       STOP      ! non MPP case, just stop the run
    END SUBROUTINE mppstop
@@ -1766 +1777 @@
       iost=0
       IF( cdacce(1:6) == 'DIRECT' )  THEN
-         OPEN( UNIT=knum, FILE=clfile, FORM=cdform, ACCESS=cdacce, STATUS=cdstat, RECL=klengh, ERR=100, IOSTAT=iost )
+         OPEN( UNIT=knum, FILE=clfile, FORM=cdform, ACCESS=cdacce, STATUS=cdstat, RECL=klengh         , ERR=100, IOSTAT=iost )
+      ELSE IF( cdstat(1:6) == 'APPEND' )  THEN
+         OPEN( UNIT=knum, FILE=clfile, FORM=cdform, ACCESS=cdacce, STATUS='UNKNOWN', POSITION='APPEND', ERR=100, IOSTAT=iost )
       ELSE
-         OPEN( UNIT=knum, FILE=clfile, FORM=cdform, ACCESS=cdacce, STATUS=cdstat             , ERR=100, IOSTAT=iost )
-      ENDIF
-      IF( iost /= 0 .AND. TRIM(clfile) == '/dev/null' ) &
-         &  OPEN(UNIT=knum,FILE='NUL', FORM=cdform, ACCESS=cdacce, STATUS=cdstat             , ERR=100, IOSTAT=iost )   ! for windows
+         OPEN( UNIT=knum, FILE=clfile, FORM=cdform, ACCESS=cdacce, STATUS=cdstat                      , ERR=100, IOSTAT=iost )
+      ENDIF
+      IF( iost /= 0 .AND. TRIM(clfile) == '/dev/null' ) &   ! for windows
+         &  OPEN(UNIT=knum,FILE='NUL', FORM=cdform, ACCESS=cdacce, STATUS=cdstat                      , ERR=100, IOSTAT=iost )   
       IF( iost == 0 ) THEN
          IF(ldwp) THEN
-            WRITE(kout,*) '     file   : ', clfile,' open ok'
+            WRITE(kout,*) '     file   : ', TRIM(clfile),' open ok'
             WRITE(kout,*) '     unit   = ', knum
             WRITE(kout,*) '     status = ', cdstat
@@ -1786 +1799 @@
          IF(ldwp) THEN
             WRITE(kout,*)
-            WRITE(kout,*) ' ===>>>> : bad opening file: ', clfile
+            WRITE(kout,*) ' ===>>>> : bad opening file: ', TRIM(clfile)
             WRITE(kout,*) ' =======   ===  '
             WRITE(kout,*) '           unit   = ', knum
@@ -1797 +1810 @@
          ELSE  !!! Force writing to make sure we get the information - at least once - in this violent STOP!!
             WRITE(*,*)
-            WRITE(*,*) ' ===>>>> : bad opening file: ', clfile
+            WRITE(*,*) ' ===>>>> : bad opening file: ', TRIM(clfile)
             WRITE(*,*) ' =======   ===  '
             WRITE(*,*) '           unit   = ', knum