Changeset 15204 for NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src

Timestamp:

2021-08-25T20:27:59+02:00 (3 years ago)

Author:

vsmart

Message:

Use variable to control MPI initialisation/finalisation rather than cpp key

Location:

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src/OCE

Files:

• LBC/lib_mpp.F90 (modified) (3 diffs)
• nemogcm.F90 (modified) (3 diffs)

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

@@ -100 +100 @@
 !$AGRIF_END_DO_NOT_TREAT
    LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .TRUE.    !: mpp flag
+   INTEGER, PUBLIC            ::   mpi_pre_initialised = 0
 #else   
    INTEGER, PUBLIC, PARAMETER ::   MPI_STATUS_SIZE = 1
@@ -176 +177 @@
    !!----------------------------------------------------------------------
 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 +707 @@
       ELSE
          CALL mppsync
-#if !defined key_spmd
-         CALL mpi_finalize( info )
-#endif
+         IF (.NOT. mpi_pre_initialised) THEN
+             CALL mpi_finalize( info )
+         ENDIF
       ENDIF
       IF( ll_abort ) STOP 123

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage2_spmd/src/OCE/nemogcm.F90

@@ -311 +311 @@
 #endif
       !
-#if !defined key_spmd
-      IF(lwm) THEN
-         IF( nstop == 0 ) THEN   
-                STOP 0
-         ELSE        
-                STOP 123
+      IF (.NOT. mpi_pre_initialised) THEN
+         IF(lwm) THEN
+            IF( nstop == 0 ) THEN   
+                  STOP 0
+            ELSE        
+                  STOP 123
+            ENDIF
          ENDIF
       ENDIF
-#endif
       !
    END SUBROUTINE nemo_gcm_finalise
@@ -345 +345 @@
       !                             !-------------------------------------------------!
       !
+      CALL set_mpi_pre_initialised()
 #if defined key_iomput
 !      IF( Agrif_Root() ) THEN
@@ -356 +357 @@
 ! RSRH simplify initialisaton for test
       IF( lk_oasis ) THEN
-#if !defined key_spmd
-          CALL mpi_init(nerror)
-#endif
+          IF (.NOT. mpi_pre_initialised) THEN
+              CALL mpi_init(nerror)
+          ENDIF
           CALL oasis_init_comp ( ncomp_id, "toyoce", nerror, .TRUE. )
 !          CALL cpl_init( "toyoce", ilocal_comm )