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

LMDZ6/trunk/libf/phylmd/mod_surf_para.F90

@@ -50 +50 @@
   SUBROUTINE Init_surf_para(knon)
   USE mod_phys_lmdz_para
-#ifdef CPP_MPI
-  INCLUDE 'mpif.h'
-#endif
+  USE lmdz_mpi
+
     INTEGER :: knon
     INTEGER :: i,ierr
@@ -88 +87 @@
       
       IF (is_using_mpi) THEN
-#ifdef CPP_MPI
         CALL MPI_ALLGather(knon_mpi,1,MPI_INTEGER,knon_mpi_para,1,MPI_INTEGER,COMM_LMDZ_PHY,ierr)
         CALL MPI_ALLGather(knon_omp_para,omp_size,MPI_INTEGER,knon_glo_para,omp_size,MPI_INTEGER,COMM_LMDZ_PHY,ierr)
-#endif
       ELSE
         knon_mpi_para(:)=knon_mpi
@@ -169 +166 @@
   SUBROUTINE gather_surf_mpi_i(FieldIn,FieldOut)
   USE mod_phys_lmdz_para
-#ifdef CPP_MPI
-  INCLUDE 'mpif.h'
-#endif
+  USE lmdz_mpi
+
     INTEGER :: FieldIn(:)
     INTEGER :: FieldOut(:)
@@ -177 +173 @@
     
     IF (is_using_mpi) THEN
-#ifdef CPP_MPI
       CALL MPI_Gatherv(FieldIn,knon_mpi,MPI_INTEGER,                                &
                        FieldOut,knon_mpi_para,knon_mpi_begin_para(:)-1,MPI_INTEGER, &
                        mpi_master,COMM_LMDZ_PHY,ierr)
-#endif
     ELSE
       FieldOut(:)=FieldIn(:)
@@ -224 +218 @@
   SUBROUTINE gather_surf_mpi_r(FieldIn,FieldOut)
   USE mod_phys_lmdz_para
-#ifdef CPP_MPI
-  INCLUDE 'mpif.h'
-#endif
+  USE lmdz_mpi
+
     REAL :: FieldIn(:)
     REAL :: FieldOut(:)
@@ -232 +225 @@
     
     IF (is_using_mpi) THEN
-#ifdef CPP_MPI
       CALL MPI_Gatherv(FieldIn,knon_mpi,MPI_REAL_LMDZ,                                 &
                        FieldOut,knon_mpi_para,knon_mpi_begin_para(:)-1,MPI_REAL_LMDZ,  &
                        mpi_master,COMM_LMDZ_PHY,ierr)            
-#endif
     ELSE
       FieldOut(:)=FieldIn(:)
@@ -277 +268 @@
   SUBROUTINE scatter_surf_mpi_i(FieldIn,FieldOut)
   USE mod_phys_lmdz_para
-#ifdef CPP_MPI
-  INCLUDE 'mpif.h'
-#endif
+  USE lmdz_mpi
+
     INTEGER :: FieldIn(:)
     INTEGER :: FieldOut(:)
@@ -285 +275 @@
     
     IF (is_using_mpi) THEN
-#ifdef CPP_MPI
       CALL MPI_Scatterv(FieldIn,knon_mpi_para,knon_mpi_begin_para(:)-1,MPI_INTEGER,   &
                         FieldOut,knon_mpi,MPI_INTEGER,                                &
                         mpi_master,COMM_LMDZ_PHY,ierr)
-#endif
     ELSE
       FieldOut(:)=FieldIn(:)
@@ -329 +317 @@
   SUBROUTINE scatter_surf_mpi_r(FieldIn,FieldOut)
   USE mod_phys_lmdz_para
-#ifdef CPP_MPI
-  INCLUDE 'mpif.h'
-#endif
+  USE lmdz_mpi
+
     REAL :: FieldIn(:)
     REAL :: FieldOut(:)
@@ -337 +324 @@
     
     IF (is_using_mpi) THEN
-#ifdef CPP_MPI
       CALL MPI_Scatterv(FieldIn,knon_mpi_para,knon_mpi_begin_para(:)-1,MPI_INTEGER,   &
                         FieldOut,knon_mpi,MPI_INTEGER,                                &
                         mpi_master,COMM_LMDZ_PHY,ierr)
-#endif
     ELSE
       FieldOut(:)=FieldIn(:)