Changeset 4600 for LMDZ6/trunk/libf/phy_common/mod_phys_lmdz_mpi_data.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/phy_common/mod_phys_lmdz_mpi_data.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phy_common/mod_phys_lmdz_mpi_data.F90

@@ -3 +3 @@
 !
 MODULE mod_phys_lmdz_mpi_data
-  
+  USE lmdz_mpi 
+
   INTEGER,SAVE :: ii_begin
   INTEGER,SAVE :: ii_end
@@ -47 +48 @@
   
   SUBROUTINE init_phys_lmdz_mpi_data(nbp, nbp_lon, nbp_lat, nbp_lev, grid_type, nvertex, communicator)
-
+  USE lmdz_mpi
   IMPLICIT NONE
-#ifdef CPP_MPI
-    INCLUDE 'mpif.h'
-#endif
     INTEGER,INTENT(IN) :: nbp
     INTEGER,INTENT(IN) :: nbp_lon
@@ -65 +63 @@
     INTEGER :: i
     
-#ifdef CPP_MPI
-    is_using_mpi=.TRUE.
-#else
-    is_using_mpi=.FALSE.
-#endif
-    
     if ((nbp_lon.eq.1).and.(nbp_lat.eq.1)) then ! running 1D column model
        klon_glo=1
@@ -82 +74 @@
 
     IF (is_using_mpi) THEN    
-#ifdef CPP_MPI
       MPI_REAL_LMDZ=MPI_REAL8
       CALL MPI_COMM_SIZE(COMM_LMDZ_PHY,mpi_size,ierr)    
       CALL MPI_COMM_RANK(COMM_LMDZ_PHY,mpi_rank,ierr)
-#endif
     ELSE
       mpi_size=1
@@ -95 +85 @@
 
     IF (is_using_mpi) THEN    
-#ifdef CPP_MPI
-    CALL MPI_ALLGATHER(nbp,1,MPI_INTEGER,distrib,1,MPI_INTEGER,COMM_LMDZ_PHY,ierr)
-#endif
+      CALL MPI_ALLGATHER(nbp,1,MPI_INTEGER,distrib,1,MPI_INTEGER,COMM_LMDZ_PHY,ierr)
     ELSE
      distrib(:)=nbp