Changeset 15276 for NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3_spmd/src/OCE/LBC/lib_mpp.F90

Timestamp:

2021-09-21T17:32:52+02:00 (3 years ago)

Author:

vsmart

Message:

Merge in changes from couple_stage2_spmd branch to allow for running from the Fortran cap

File:

• NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3_spmd/src/OCE/LBC/lib_mpp.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3_spmd/src/OCE/LBC/lib_mpp.F90

@@ -58 +58 @@
    !
    PUBLIC   ctl_stop, ctl_warn, ctl_opn, ctl_nam
+   PUBLIC   set_mpi_pre_initialised
    PUBLIC   mpp_start, mppstop, mppsync, mpp_comm_free
    PUBLIC   mpp_ini_north
@@ -100 +101 @@
 !$AGRIF_END_DO_NOT_TREAT
    LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .TRUE.    !: mpp flag
+   LOGICAL, PUBLIC            ::   mpi_pre_initialised = .FALSE.
 #else   
    INTEGER, PUBLIC, PARAMETER ::   MPI_STATUS_SIZE = 1
@@ -176 +178 @@
    !!----------------------------------------------------------------------
 CONTAINS
+
+   SUBROUTINE set_mpi_pre_initialised()
+      !!----------------------------------------------------------------------
+      !!                  ***  routine set_mpi_pre_initialised  ***
+      !!
+      !! ** Purpose :   set global variable mpi_pre_initialised
+      !!----------------------------------------------------------------------
+      INTEGER ::   ierr
+      !!----------------------------------------------------------------------
+#if defined key_mpp_mpi
+      call mpi_initialized(mpi_pre_initialised, ierr)
+#endif
+      !
+   END SUBROUTINE set_mpi_pre_initialised
 
    SUBROUTINE mpp_start( localComm )
@@ -692 +708 @@
       ELSE
          CALL mppsync
-         CALL mpi_finalize( info )
+         IF (.NOT. mpi_pre_initialised) THEN
+             CALL mpi_finalize( info )
+         ENDIF
       ENDIF
       IF( ll_abort ) STOP 123