Changeset 10764 for NEMO/branches/UKMO/r8395_coupling_sequence/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

Timestamp:

2019-03-15T13:13:07+01:00 (5 years ago)

Author:

jcastill

Message:

Minimal set of changes for coupling order

File:

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

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

@@ -2406 +2406 @@
 
    SUBROUTINE mppstop
+      USE mod_oasis      ! coupling routines
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***
@@ -2415 +2416 @@
       !!----------------------------------------------------------------------
       !
+#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
@@ -4333 +4341 @@
          ENDIF
          CALL FLUSH(kout) 
-         STOP 'ctl_opn bad opening'
+         CALL ctl_stop ('STOP', 'NEMO abort ctl_opn bad opening')
       ENDIF
       !