Changeset 3962 for palm/trunk/SOURCE/pmc_child_mod.f90

Timestamp:

May 8, 2019 7:40:33 PM (5 years ago)

Author:

suehring

Message:

Bugfixes in initial settings of child and parent communication patterns

File:

• palm/trunk/SOURCE/pmc_child_mod.f90 (modified) (9 diffs)

palm/trunk/SOURCE/pmc_child_mod.f90

@@ -22 +22 @@
 ! ------------------
 ! 
-!
+! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Bugfixes in initial settings of child and parent communication patterns. 
+!
+! 3945 2019-05-02 11:29:27Z raasch
 !
 ! 3932 2019-04-24 17:31:34Z suehring
@@ -583 +586 @@
 !--                                    recv -> parent to child transfer
 !--                                    send -> child to parent transfer
-    INTEGER(iwp) ::  arlen    !<
-    INTEGER(iwp) ::  myindex  !<
-    INTEGER(iwp) ::  i        !<
-    INTEGER(iwp) ::  ierr     !<
-    INTEGER(iwp) ::  istat    !<
-    INTEGER(iwp) ::  j        !<
-    INTEGER(iwp) ::  rcount   !<
-    INTEGER(iwp) ::  tag      !<
+    INTEGER(iwp) ::  arlen        !<
+    INTEGER(iwp) ::  myindex      !<
+    INTEGER(iwp) ::  i            !<
+    INTEGER(iwp) ::  ierr         !<
+    INTEGER(iwp) ::  istat        !<
+    INTEGER(iwp) ::  j            !<
+    INTEGER(iwp) ::  lo_nr_arrays !<
+    INTEGER(iwp) ::  rcount       !<
+    INTEGER(iwp) ::  tag          !<
+    INTEGER(iwp) ::  total_npes   !<
 
     INTEGER(iwp), PARAMETER ::  noindex = -1  !<
@@ -596 +601 @@
     INTEGER(idp)                   ::  bufsize  !< size of MPI data window
     INTEGER(KIND=MPI_ADDRESS_KIND) ::  winsize  !<
+    
+    INTEGER(iwp), DIMENSION(:,:), ALLOCATABLE ::  myindex_s
+    INTEGER(iwp), DIMENSION(:,:), ALLOCATABLE ::  myindex_r
 
     INTEGER(iwp),DIMENSION(1024) ::  req  !<
@@ -606 +614 @@
     Type(C_PTR)             ::  base_ptr  !<
 
+  
+    CALL MPI_COMM_SIZE (me%intra_comm, total_npes, ierr)
+
+    lo_nr_arrays = me%pes(1)%nr_arrays
+
+    ALLOCATE(myindex_s(lo_nr_arrays,0:total_npes-1))
+    ALLOCATE(myindex_r(lo_nr_arrays,0:total_npes-1))
+
+    myindex_s = 0
+
+!
+!-- Receive indices from child
+    CALL MPI_ALLTOALL( myindex_s, lo_nr_arrays, MPI_INTEGER,                   &
+                       myindex_r, lo_nr_arrays, MPI_INTEGER,                   &
+                       me%intra_comm, ierr )
 
     myindex = 0
@@ -614 +637 @@
     DO  i = 1, me%inter_npes
        ape => me%pes(i)
-       tag = 200
        DO  j = 1, ape%nr_arrays
           ar => ape%array_list(j)
-!
-!--       Receive index from child
-          tag = tag + 1
-          CALL MPI_RECV( myindex, 1, MPI_INTEGER, i-1, tag, me%inter_comm,     &
-                         MPI_STATUS_IGNORE, ierr )
-          ar%recvindex = myindex
+          ar%recvindex = myindex_r(j,i-1)
 !
 !--       Determine max, because child buffer is allocated only once
@@ -637 +654 @@
        ENDDO
     ENDDO
+
 !
 !-- Create RMA (one sided communication) data buffer.
@@ -657 +675 @@
     rcount  = 0
     bufsize = 8
+
+    myindex_s = 0
+    myindex_r = 0
 
     DO  i = 1, me%inter_npes
@@ -668 +689 @@
              arlen = ape%nrele*ar%a_dim(1)
           ENDIF
-          tag    = tag + 1
-          rcount = rcount + 1
+
           IF ( ape%nrele > 0 )  THEN
-             CALL MPI_ISEND( myindex, 1, MPI_INTEGER, i-1, tag, me%inter_comm, &
-                             req(rcount), ierr )
              ar%sendindex = myindex
           ELSE
-             CALL MPI_ISEND( noindex, 1, MPI_INTEGER, i-1, tag, me%inter_comm, &
-                             req(rcount), ierr )
              ar%sendindex = noindex
           ENDIF
-!
-!--       Maximum of 1024 pending requests
-!         1024 is an arbitrary value just to make sure the number of pending 
-!         requests is getting too large. It is possible that this value has to 
-!         be adjusted in case of running the model on large number of cores. 
-
-          IF ( rcount == 1024 )  THEN
-             CALL MPI_WAITALL( rcount, req, MPI_STATUSES_IGNORE, ierr )
-             rcount = 0
-          ENDIF
+
+          myindex_s(j,i-1) = ar%sendindex
 
           IF ( ape%nrele > 0 )  THEN
@@ -698 +706 @@
        ENDDO
 
-       IF ( rcount > 0 )  THEN
-          CALL MPI_WAITALL( rcount, req, MPI_STATUSES_IGNORE, ierr )
-       ENDIF
-
-    ENDDO
+    ENDDO
+!
+!-- Send indices to parent
+
+    CALL MPI_ALLTOALL( myindex_s, lo_nr_arrays, MPI_INTEGER,                   &
+                       myindex_r, lo_nr_arrays, MPI_INTEGER,                   &
+                       me%intra_comm, ierr)
+
+    DEALLOCATE( myindex_s )
+    DEALLOCATE( myindex_r )
+
 !
 !-- Create RMA (one sided communication) window for data buffer child to parent