Changeset 4600 for LMDZ6/trunk/libf/dynphy_lonlat

Timestamp:

Jun 30, 2023, 8:18:43 PM (12 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

Location:

LMDZ6/trunk/libf/dynphy_lonlat

Files:

• calfis_loc.F (modified) (9 diffs)
• phylmd/ce0l.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/dynphy_lonlat/calfis_loc.F

@@ -38 +38 @@
       USE IOPHY
 #endif
+      USE lmdz_mpi
+
 #ifdef CPP_PARA
       USE parallel_lmdz,ONLY:omp_chunk,using_mpi,jjb_u,jje_u,jjb_v,jje_v
@@ -117 +119 @@
       include "comgeom2.h"
       include "iniprint.h"
-#ifdef CPP_MPI
-      include 'mpif.h'
-#endif
 c    Arguments :
 c    -----------
@@ -233 +232 @@
       REAL,SAVE,dimension(1:iim,1:llm):: du_send,du_recv,dv_send,dv_recv
       INTEGER :: ierr
-#ifdef CPP_MPI
       INTEGER,dimension(MPI_STATUS_SIZE,4) :: Status
-#else
-      INTEGER,dimension(1,4) :: Status
-#endif
       INTEGER, dimension(4) :: Req
       REAL,ALLOCATABLE,SAVE:: zdufi2(:,:),zdvfi2(:,:)
@@ -873 +868 @@
 
 c$OMP BARRIER
-#ifdef CPP_MPI 
+
 c$OMP MASTER
 !$OMP CRITICAL (MPI)
@@ -882 +877 @@
 !$OMP END CRITICAL (MPI)
 c$OMP END MASTER
-#endif
+
 c$OMP BARRIER
      
@@ -889 +884 @@
       if (MPI_rank<MPI_Size-1) then
 c$OMP BARRIER
-#ifdef CPP_MPI 
+
 c$OMP MASTER      
 !$OMP CRITICAL (MPI)
@@ -898 +893 @@
 !$OMP END CRITICAL (MPI)
 c$OMP END MASTER
-#endif
+
       endif
 
@@ -904 +899 @@
 
 
-#ifdef CPP_MPI 
 c$OMP MASTER    
 !$OMP CRITICAL (MPI)
@@ -916 +910 @@
 !$OMP END CRITICAL (MPI)
 c$OMP END MASTER
-#endif
 
 c$OMP BARRIER     

LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90

@@ -46 +46 @@
   USE comvert_mod, ONLY: pa, preff, pressure_exner
   USE temps_mod, ONLY: calend, day_ini, dt
+  USE lmdz_mpi
 
   IMPLICIT NONE
@@ -55 +56 @@
   include "comgeom2.h"
   include "iniprint.h"
-#ifdef CPP_MPI
-  include 'mpif.h'
-#endif
   
   REAL               :: masque(iip1,jjp1)             !--- CONTINENTAL MASK
@@ -255 +253 @@
   CALL xios_finalize
 #endif
-#ifdef CPP_MPI
   IF (using_mpi) call MPI_FINALIZE(ierr)
-#endif
 #endif