Changeset 11105 for NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/LBC/lib_mpp.F90

Timestamp:

2019-06-13T18:20:13+02:00 (5 years ago)

Author:

dancopsey

Message:

Merged in changes from dev_merge_2017_GC_couple_pkg branch except for zotx1 and zoty1 changes in sbccpl.F90.

File:

• NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/LBC/lib_mpp.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/LBC/lib_mpp.F90

@@ -896 +896 @@
 
    SUBROUTINE mppstop( ldfinal, ld_force_abort ) 
+   
+   USE mod_oasis      ! coupling routines
+
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***
@@ -912 +915 @@
       IF( PRESENT(ld_force_abort) ) ll_force_abort = ld_force_abort
       !
+      
+#if defined key_oasis3
+      ! If we're trying to shut down cleanly then we need to consider the fact
+      ! that this could be part of an MPMD configuration - we don't want to
+      ! leave other components deadlocked.
+
+      CALL oasis_abort(nproc,"mppstop","NEMO initiated abort")
+
+
+#else
       IF(ll_force_abort) THEN
          CALL mpi_abort( MPI_COMM_WORLD )
@@ -920 +933 @@
       IF( .NOT. llfinal ) STOP 123
       !
+#endif
    END SUBROUTINE mppstop
 
@@ -2021 +2035 @@
          ENDIF
          CALL FLUSH( kout ) 
-         STOP 'ctl_opn bad opening'
+         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening')
       ENDIF
       !