Changeset 11913 for NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE/LBC/lib_mpp.F90

Timestamp:

2019-11-15T16:16:56+01:00 (4 years ago)

Author:

dancopsey

Message:

Merge in bulk of coupling changes.

File:

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

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

@@ -664 +664 @@
 
    SUBROUTINE mppstop( ld_abort ) 
+
+      USE mod_oasis      ! coupling routines
+
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***
@@ -677 +680 @@
       IF( PRESENT(ld_abort) ) ll_abort = ld_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 defined key_mpp_mpi
       IF(ll_abort) THEN
@@ -687 +700 @@
       IF( ll_abort ) STOP 123
       !
+#endif
    END SUBROUTINE mppstop