Changeset 21 for codes/icosagcm/trunk/src/transfert.f90

Timestamp:

07/18/12 11:15:39 (12 years ago)

Author:

ymipsl

Message:

correction for compiling with gfortran (line too long)
improvement for splitting domain
Call twice transfert request for field u is no longer necessary

YM

File:

• codes/icosagcm/trunk/src/transfert.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/transfert.f90

@@ -227 +227 @@
       ELSE IF (req%type_field==field_u) THEN
         IF (.NOT. PRESENT(pos)) STOP 'argument request_add_point non conforme'
-        
-        src_domain=domain(ind)%assign_domain(i,j)
+
+        src_domain=domain(ind)%edge_assign_domain(pos-1,i,j)
         src_iim=domain(src_domain)%iim
-        src_i=domain(ind)%assign_i(i,j)
-        src_j=domain(ind)%assign_j(i,j)
+        src_i=domain(ind)%edge_assign_i(pos-1,i,j)
+        src_j=domain(ind)%edge_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=MOD(pos-1+src_delta+6,6)+1
+        src_pos=domain(ind)%edge_assign_pos(pos-1,i,j)+1
+                
         req%target_ind(req%size)=(j-1)*d%iim+i+d%u_pos(pos)
         req%src_domain(req%size)=src_domain
         req%src_ind(req%size)=src_n+domain(src_domain)%u_pos(src_pos)
 
-        req%target_i(req%size)=i
-        req%target_j(req%size)=j
-        req%src_i(req%size)=domain(ind)%assign_i(i,j)
-        req%src_j(req%size)=domain(ind)%assign_j(i,j)
-        
-!        PRINT *,ind,i,j,"src_delta",src_delta
+!        req%target_i(req%size)=i
+!        req%target_j(req%size)=j
+!        req%src_i(req%size)=domain(ind)%assign_i(i,j)
+!        req%src_j(req%size)=domain(ind)%assign_j(i,j)
+        
+!        PRINT *,"1--->",ind,i,j,pos
+!        PRINT *,"2--->",src_domain,src_i,src_j,src_pos
 
       ELSE IF (req%type_field==field_z) THEN