Changeset 8280 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/LBC

Timestamp:

2017-07-05T10:28:51+02:00 (7 years ago)

Author:

timgraham

Message:

331: Merge of MEDUSA stable branch and HadGEM3 coupling branches into GO6 package branch.

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -2049 +2049 @@
 
    SUBROUTINE mppstop
+   
+#if defined key_oasis3
+   USE mod_oasis      ! coupling routines
+#endif
+
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***
@@ -2058 +2063 @@
       !!----------------------------------------------------------------------
       !
+      
+#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
+      
       CALL mppsync
       CALL mpi_finalize( info )
+#endif
+
       !
    END SUBROUTINE mppstop
@@ -3884 +3902 @@
       IF( numevo_ice /= -1 )   CALL FLUSH(numevo_ice)
       !
+      IF( cd1 == 'MPPSTOP' ) THEN
+         IF(lwp) WRITE(numout,*)  'E R R O R: Calling mppstop'
+         CALL mppstop()
+      ENDIF
       IF( cd1 == 'STOP' ) THEN
          IF(lwp) WRITE(numout,*)  'huge E-R-R-O-R : immediate stop'
@@ -3988 +4010 @@
             WRITE(kout,*)
          ENDIF
-         STOP 'ctl_opn bad opening'
+         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening')
       ENDIF