Changeset 193 for codes/icosagcm/trunk/src

Timestamp:

06/26/14 17:32:14 (10 years ago)

Author:

ymipsl

Message:

bug fix : MPI_THREAD_SINGLE was not managed, so for not multithreaded mpi stack environment, crash may occur.

YM

Location:

codes/icosagcm/trunk/src

Files:

• mpipara.F90 (modified) (1 diff)
• transfert_mpi.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/mpipara.F90

@@ -71 +71 @@
       IF (mpi_threading_mode > required_mode) mpi_threading_mode=required_mode
 
-      IF (mpi_threading_mode==MPI_THREAD_SINGLE)     PRINT*,'MPI_INIT_THREAD : MPI_SINGLE_THREAD used'
+      IF (mpi_threading_mode==MPI_THREAD_SINGLE) THEN
+         PRINT*,'MPI_INIT_THREAD : MPI_SINGLE_THREAD used : Warning : openMP is not garanted to work'
+      ENDIF
       IF (mpi_threading_mode==MPI_THREAD_FUNNELED)   PRINT*,'MPI_INIT_THREAD : MPI_THREAD_FUNNELED used'
       IF (mpi_threading_mode==MPI_THREAD_SERIALIZED) PRINT*,'MPI_INIT_THREAD : MPI_THREAD_SERIALIZED used'

codes/icosagcm/trunk/src/transfert_mpi.f90

@@ -720 +720 @@
            req%nreq_mpi=req%nreq_mpi+1
            req%nreq_send=req%nreq_send+1
-           IF (mpi_threading_mode==MPI_THREAD_FUNNELED) THEN
+           IF (mpi_threading_mode==MPI_THREAD_FUNNELED .OR. mpi_threading_mode==MPI_THREAD_SINGLE) THEN
              rank_list(nsend)=req%send(isend)%rank
            ELSE
@@ -758 +758 @@
            req%nreq_mpi=req%nreq_mpi+1
            req%nreq_recv=req%nreq_recv+1
-           IF (mpi_threading_mode==MPI_THREAD_FUNNELED) THEN
+           IF (mpi_threading_mode==MPI_THREAD_FUNNELED .OR. mpi_threading_mode==MPI_THREAD_SINGLE) THEN
              rank_list(nrecv)=req%recv(irecv)%rank
            ELSE
@@ -1329 +1329 @@
       ENDIF      
 
-      IF (mpi_threading_mode==MPI_THREAD_FUNNELED) THEN
+      IF (mpi_threading_mode==MPI_THREAD_FUNNELED .OR. mpi_threading_mode==MPI_THREAD_SINGLE) THEN
 !$OMP BARRIER
 !$OMP MASTER