Changeset 478 for codes/icosagcm/trunk/src/transfert_mpi.f90

Timestamp:

09/16/16 15:33:42 (8 years ago)

Author:

ymipsl

Message:

MPI transfer :

thread_serialized and thread_multiple is now working correctly when omp_level_size > 1

YM

File:

• codes/icosagcm/trunk/src/transfert_mpi.f90 (modified) (7 diffs)

codes/icosagcm/trunk/src/transfert_mpi.f90

@@ -1121 +1121 @@
     INTEGER :: offset,msize,rank
     INTEGER :: lbegin, lend
+    INTEGER :: max_req
 
 !    CALL trace_start("send_message_mpi")
@@ -1226 +1227 @@
       
       ELSE  IF (field(1)%ndim==3) THEN
-      
+        max_req=0
+        DO ind=1,ndomain
+          req=>message%request(ind)
+          IF (req%nsend>max_req) max_req=req%nsend
+        ENDDO
+              
         DO ind=1,ndomain
           IF (.NOT. assigned_domain(ind) ) CYCLE
@@ -1256 +1262 @@
               CALL trace_end("copy_to_buffer")
 
+              IF (mpi_threading_mode==MPI_THREAD_SERIALIZED.OR.mpi_threading_mode==MPI_THREAD_MULTIPLE .AND. omp_level_size>1) THEN
+                !$OMP BARRIER
+              ENDIF
+              
               IF (is_omp_level_master) THEN
                 IF (mpi_threading_mode==MPI_THREAD_SERIALIZED) THEN
@@ -1267 +1277 @@
                 ENDIF
               ENDIF
+            ELSE
+              IF (mpi_threading_mode==MPI_THREAD_SERIALIZED.OR.mpi_threading_mode==MPI_THREAD_MULTIPLE .AND. omp_level_size>1) THEN
+                !$OMP BARRIER
+              ENDIF
             ENDIF
           ENDDO
+
+          IF (mpi_threading_mode==MPI_THREAD_SERIALIZED.OR.mpi_threading_mode==MPI_THREAD_MULTIPLE .AND. omp_level_size>1) THEN
+            DO isend=req%nsend+1,max_req
+              !$OMP BARRIER
+            ENDDO
+          ENDIF
+
         ENDDO
          
@@ -1317 +1338 @@
 
       ELSE  IF (field(1)%ndim==4) THEN
+
+        max_req=0
+        DO ind=1,ndomain
+          req=>message%request(ind)
+          IF (req%nsend>max_req) max_req=req%nsend
+        ENDDO
     
         DO ind=1,ndomain
@@ -1349 +1376 @@
               ENDDO
               CALL trace_end("copy_to_buffer")
+
+              IF (mpi_threading_mode==MPI_THREAD_SERIALIZED.OR.mpi_threading_mode==MPI_THREAD_MULTIPLE .AND. omp_level_size>1) THEN
+                !$OMP BARRIER
+              ENDIF
 
               IF (is_omp_level_master) THEN
@@ -1361 +1392 @@
                 ENDIF
               ENDIF
-
+            ELSE
+              IF (mpi_threading_mode==MPI_THREAD_SERIALIZED.OR.mpi_threading_mode==MPI_THREAD_MULTIPLE .AND. omp_level_size>1) THEN
+                !$OMP BARRIER
+              ENDIF
             ENDIF
           ENDDO
+          
+          IF (mpi_threading_mode==MPI_THREAD_SERIALIZED.OR.mpi_threading_mode==MPI_THREAD_MULTIPLE .AND. omp_level_size>1) THEN
+            DO isend=req%nsend+1,max_req
+              !$OMP BARRIER
+            ENDDO
+          ENDIF
+
         ENDDO