Changeset 4600 for LMDZ6/trunk/libf/dyn3dmem/mod_const_mpi.F90

Timestamp:

Jun 30, 2023, 8:18:43 PM (11 months ago)

Author:

yann meurdesoif

Message:

Suppress CPP_MPI key usage in source code. MPI wrappers is used to supress missing symbol if the mpi library is not linked

YM

File:

• LMDZ6/trunk/libf/dyn3dmem/mod_const_mpi.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/dyn3dmem/mod_const_mpi.F90

@@ -11 +11 @@
 
   SUBROUTINE Init_const_mpi
+    USE lmdz_mpi
+
 #ifdef CPP_IOIPSL
     USE IOIPSL, ONLY: getin
@@ -25 +27 @@
 #endif
     IMPLICIT NONE
-#ifdef CPP_MPI
-    INCLUDE 'mpif.h'
-#endif
 
     INTEGER             :: ierr
@@ -52 +51 @@
 !$OMP END MASTER
 #endif
-#ifdef CPP_MPI
       MPI_REAL_LMDZ=MPI_REAL8
-#endif
     ELSE
       CALL init_mpi
@@ -62 +59 @@
   
   SUBROUTINE Init_mpi
+    USE lmdz_mpi
+
 #ifdef CPP_XIOS
     USE wxios, only: wxios_init
 #endif
   IMPLICIT NONE
-#ifdef CPP_MPI
-     INCLUDE 'mpif.h'
-#endif
     INTEGER             :: ierr
     INTEGER             :: thread_required
     INTEGER             :: thread_provided
 
-#ifdef CPP_MPI
 !$OMP MASTER
       thread_required=MPI_THREAD_SERIALIZED
@@ -92 +87 @@
 #endif
 !$OMP END MASTER
-#else
-#ifdef CPP_XIOS
-!$OMP MASTER
-      CALL wxios_init("LMDZ")
-!$OMP END MASTER
-#endif
-#endif
 
-   END SUBROUTINE Init_mpi
+END SUBROUTINE Init_mpi
     
 END MODULE mod_const_mpi