Changeset 11277 for branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

Timestamp:

2019-07-17T15:29:15+02:00 (5 years ago)

Author:

kingr

Message:

Merged Juan's changes for running AMM15 woth wave coupling.
Corrected minor logic error to allow AMM7-uncoupled to reproduce earlier results.
Few line spacing changes to allow merging with OBS br and trunk rvn 5518.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90 (modified) (2 diffs)

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

@@ -62 +62 @@
    USE lbcnfd         ! north fold treatment
    USE in_out_manager ! I/O manager
+   USE mod_oasis      ! coupling routines
 
    IMPLICIT NONE
@@ -2023 +2024 @@
       !!----------------------------------------------------------------------
       !
+#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