Changeset 711 for codes/icosagcm/trunk/src/parallel/transfert_mpi.f90

Timestamp:

07/25/18 13:57:35 (6 years ago)

Author:

ymipsl

Message:

Adding halo transfer for scalar field ad vorticity point.
=> Use request "req_z1_scal" with transfer function

YM

File:

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

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

@@ -49 +49 @@
   TYPE(t_request),SAVE,POINTER :: req_e1_scal(:)
   TYPE(t_request),SAVE,POINTER :: req_e1_vect(:)
+  TYPE(t_request),SAVE,POINTER :: req_z1_scal(:)
   
   TYPE(t_request),SAVE,POINTER :: req_i0(:)
@@ -267 +268 @@
     CALL finalize_request(req_e0_vect)
 
+    CALL create_request(field_z,req_z1_scal)
+    DO ind=1,ndomain
+      CALL swap_dimensions(ind)
+      DO i=ii_begin,ii_end
+        CALL request_add_point(ind,i,jj_begin-1,req_z1_scal,vrup)
+        CALL request_add_point(ind,i+1,jj_begin-1,req_z1_scal,vup)
+      ENDDO
+
+      DO j=jj_begin,jj_end
+        CALL request_add_point(ind,ii_end+1,j,req_z1_scal,vlup)
+      ENDDO    
+      DO j=jj_begin,jj_end
+        CALL request_add_point(ind,ii_end+1,j-1,req_z1_scal,vup)
+      ENDDO    
+    
+      DO i=ii_begin,ii_end
+        CALL request_add_point(ind,i,jj_end+1,req_z1_scal,vdown)
+        CALL request_add_point(ind,i-1,jj_end+1,req_z1_scal,vrdown)
+      ENDDO    
+
+      DO j=jj_begin,jj_end
+        CALL request_add_point(ind,ii_begin-1,j,req_z1_scal,vrup)
+      ENDDO   
+      DO j=jj_begin,jj_end
+        CALL request_add_point(ind,ii_begin-1,j,req_z1_scal,vrdown)
+      ENDDO   
+
+    ENDDO
+
+    CALL finalize_request(req_z1_scal)
 
   END SUBROUTINE init_transfert
@@ -420 +451 @@
         IF (.NOT. PRESENT(pos)) STOP 'argument request_add_point non conforme'
 
-        src_domain=domain(ind)%assign_domain(i,j)
+        src_domain=domain(ind)%vertex_assign_domain(pos-1,i,j)
         src_iim=domain_glo(src_domain)%iim
-        src_i=domain(ind)%assign_i(i,j)
-        src_j=domain(ind)%assign_j(i,j)
+        src_i=domain(ind)%vertex_assign_i(pos-1,i,j)
+        src_j=domain(ind)%vertex_assign_j(pos-1,i,j)
         src_n=(src_j-1)*src_iim+src_i
         src_delta=domain(ind)%delta(i,j)
-        
-        src_pos=MOD(pos-1+src_delta+6,6)+1
+        src_pos=domain(ind)%vertex_assign_pos(pos-1,i,j)+1
+
         
         req%target_ind(req%size)=(j-1)*d%iim+i+d%z_pos(pos)