Changeset 5675 for branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

Timestamp:

2015-08-10T16:39:02+02:00 (9 years ago)

Author:

dancopsey

Message:

Applied clean shutdown code imported from Met Office internal branch ​http://fcm2/projects/NEMO/browser/NEMO/branches/dev/frrh/vn3.5_beta_clean_shutdown

File:

• branches/UKMO/dev_r5518_clean_shutdown/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) (3 diffs)

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

@@ -2006 +2006 @@
 
    SUBROUTINE mppstop
+   
+#if defined key_oasis3 || defined key_oasis3mct
+
+#if defined key_oasis3mct
+   USE mod_oasis
+#endif
+
+#endif
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***
@@ -2015 +2023 @@
       !!----------------------------------------------------------------------
       !
+#if defined key_oasis3 || defined key_oasis3mct
+      ! 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
 
@@ -3784 +3802 @@
             WRITE(kout,*)
          ENDIF
-         STOP 'ctl_opn bad opening'
+         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening')
       ENDIF