Changeset 15424 for NEMO/branches/UKMO/r14075_coupling_sequence/src/OCE/LBC

Timestamp:

2021-10-21T14:28:46+02:00 (3 years ago)

Author:

jcastill

Message:

Compiling code

File:

• NEMO/branches/UKMO/r14075_coupling_sequence/src/OCE/LBC/lib_mpp.F90 (modified) (2 diffs)

NEMO/branches/UKMO/r14075_coupling_sequence/src/OCE/LBC/lib_mpp.F90

@@ -673 +673 @@
       !!
       !!----------------------------------------------------------------------
+#if defined key_oasis3 
+      USE mod_oasis      ! coupling routines 
+#endif
+
       LOGICAL, OPTIONAL, INTENT(in) :: ld_abort    ! source process number
       LOGICAL ::   ll_abort
@@ -684 +688 @@
          CALL mpi_abort( MPI_COMM_WORLD )
       ELSE
+#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
-#endif
-      IF( ll_abort ) STOP 123
+#endif 
+      ENDIF 
+#endif 
+      IF( ll_abort ) CALL ctl_stop ('STOP', 'NEMO abort mppstop')
       !
    END SUBROUTINE mppstop