Changeset 4600 for LMDZ6/trunk/libf/phylmd/cpl_mod.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/phylmd/cpl_mod.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/cpl_mod.F90

@@ -1249 +1249 @@
     USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     USE time_phylmdz_mod, ONLY: start_time, itau_phy
-    use config_ocean_skin_m, only: activate_ocean_skin
+    USE config_ocean_skin_m, only: activate_ocean_skin
+    USE lmdz_mpi
+
 ! Some includes
 !    
@@ -1283 +1285 @@
     REAL  :: calving_glo(nb_zone_calving)
     
-#ifdef CPP_MPI
-    INCLUDE 'mpif.h'
     INTEGER, DIMENSION(MPI_STATUS_SIZE)                  :: status
-#endif
 
 ! End definitions
@@ -1357 +1356 @@
         IF (is_parallel) THEN
            IF (.NOT. is_north_pole_dyn) THEN
-#ifdef CPP_MPI
               CALL MPI_RECV(Up,1,MPI_REAL_LMDZ,mpi_rank-1,1234,COMM_LMDZ_PHY,status,error)
               CALL MPI_SEND(tmp_calv(1,1),1,MPI_REAL_LMDZ,mpi_rank-1,1234,COMM_LMDZ_PHY,error)
-#endif
            ENDIF
        
            IF (.NOT. is_south_pole_dyn) THEN
-#ifdef CPP_MPI
               CALL MPI_SEND(tmp_calv(1,jj_nb),1,MPI_REAL_LMDZ,mpi_rank+1,1234,COMM_LMDZ_PHY,error)
               CALL MPI_RECV(down,1,MPI_REAL_LMDZ,mpi_rank+1,1234,COMM_LMDZ_PHY,status,error)
-#endif
            ENDIF
          
@@ -1392 +1387 @@
          ENDDO
          
-#ifdef CPP_MPI
          CALL MPI_ALLREDUCE(calving, calving_glo, nb_zone_calving, MPI_REAL_LMDZ, MPI_SUM, COMM_LMDZ_PHY, error)
-#endif
          
          tab_flds(:,:,ids_calvin) = 0