Changeset 4727 for LMDZ6/branches/LMDZ_ECRad/libf/phylmd/cpl_mod.F90

Timestamp:

Oct 19, 2023, 4:02:57 PM (8 months ago)

Author:

idelkadi

Message:

Merged trunk changes -r4488:4726 LMDZ_ECRad branch

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

• . (modified) (1 prop)
• libf/phylmd/cpl_mod.F90 (modified) (7 diffs)

LMDZ6/branches/LMDZ_ECRad/libf/phylmd/cpl_mod.F90

@@ -377 +377 @@
             0,zjulian,dtime,nhoridcs,nidcs) 
 ! no vertical axis
-       DO jf=1,maxrecv
+       DO jf=1,maxrecv_phys
          IF (inforecv(i)%action) THEN
              CALL histdef(nidcs,inforecv(i)%name ,inforecv(i)%name , &
@@ -433 +433 @@
     CHARACTER(len = 80)                     :: abort_message
     REAL, DIMENSION(klon)                   :: read_sic1D
-    REAL, DIMENSION(nbp_lon,jj_nb,maxrecv)      :: tab_read_flds
+    REAL, DIMENSION(nbp_lon,jj_nb,maxrecv_phys)      :: tab_read_flds
     REAL, DIMENSION(klon,nbsrf)             :: pctsrf_old
     REAL, DIMENSION(klon_mpi)               :: rlon_mpi, rlat_mpi
@@ -462 +462 @@
           ndexcs(:) = 0
           itau_w = itau_phy + itime + start_time * day_step_phy
-          DO i = 1, maxrecv
+          DO i = 1, maxrecv_phys
             IF (inforecv(i)%action) THEN
                 CALL histwrite(nidcs,inforecv(i)%name,itau_w,tab_read_flds(:,:,i),nbp_lon*(nbp_lat),ndexcs)
@@ -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