Changeset 998 for codes/icosagcm/trunk/src

Timestamp:

01/10/20 12:20:51 (4 years ago)

Author:

adurocher

Message:

transfert_mpi : Added 'npoints' in submessages

message_*%npoints is used instead of size(message_*) : PGI wasn't able to understand how many gangs should be used

File:

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

codes/icosagcm/trunk/src/parallel/transfert_mpi.f90

@@ -13 +13 @@
   type t_local_submessage
     integer :: src_ind_loc, dest_ind_loc ! index of local and remote domain
+    integer :: npoints ! Number of cells to transfer (dim12)
     integer, allocatable :: displ_src(:) ! List of indexes to copy from domain src_ind_loc
     integer, allocatable :: displ_dest(:) ! List of indexes to copy to domain dest_ind_loc
@@ -21 +22 @@
   type t_submessage
     integer :: ind_loc, remote_ind_glo ! index of local and remote domain
+    integer :: npoints ! Number of cells to transfer (dim12)
     integer, allocatable :: displs(:) ! List of indexes to copy from field to buffer for each level
     integer, allocatable :: sign(:) ! Sign change to be applied for vector requests
@@ -145 +147 @@
             submessage_local%src_ind_loc = ind_loc
             submessage_local%dest_ind_loc = domglo_loc_ind(remote_ind_glo)
+            submessage_local%npoints = submessage_out%npoints
             submessage_local%displ_src = submessage_out%displs
             submessage_local%displ_dest = submessage_in%displs
@@ -202 +205 @@
       submessage%ind_loc = ind_loc
       submessage%remote_ind_glo = remote_ind_glo
+      submessage%npoints = points%npoints
       allocate( submessage%buff( points%npoints, dim3, dim4 ) )
       allocate( submessage%displs( points%npoints ) )
@@ -406 +410 @@
           do d3 = d3_begin, d3_end
             !$acc loop
-             do k = 1, size(message%message_out(i)%displs)
+             do k = 1, message%message_out(i)%npoints
               message%message_out(i)%buff(k,d3,d4) = message%field(message%message_out(i)%ind_loc)%rval4d(message%message_out(i)%displs(k),d3, d4)
             end do
@@ -423 +427 @@
             ! Cannot collapse because size(displ_dest) varies with i
             !$acc loop vector
-            do k = 1, size(message%message_local(i)%displ_dest)
+            do k = 1, message%message_local(i)%npoints
               message%field(message%message_local(i)%dest_ind_loc)%rval4d(message%message_local(i)%displ_dest(k),d3,d4) = &
                 message%message_local(i)%sign(k)*message%field(message%message_local(i)%src_ind_loc)%rval4d(message%message_local(i)%displ_src(k),d3,d4)
@@ -504 +508 @@
           do d3 = d3_begin, d3_end
             !$acc loop
-            do k = 1, size(message%message_in(i)%displs)
+            do k = 1, message%message_in(i)%npoints
               message%field(message%message_in(i)%ind_loc)%rval4d(message%message_in(i)%displs(k),d3,d4) = message%message_in(i)%sign(k)*message%message_in(i)%buff(k,d3,d4)
             end do