Changeset 151 for codes/icosagcm/trunk/src/geometry.f90

Timestamp:

05/13/13 14:30:31 (11 years ago)

Author:

ymipsl

Message:

Implementation of mixte parallelism MPI/OpenMP into src directory

YM

File:

• codes/icosagcm/trunk/src/geometry.f90 (modified) (8 diffs)

codes/icosagcm/trunk/src/geometry.f90

@@ -91 +91 @@
   IMPLICIT NONE
     INTEGER,INTENT(IN) :: ind
+!$OMP MASTER
     Ai=geom%Ai(ind)
     xyz_i=geom%xyz_i(ind)
@@ -111 +112 @@
     bi=geom%bi(ind)
     fv=geom%fv(ind)
-    
+!$OMP END MASTER
+!$OMP BARRIER    
   END SUBROUTINE swap_geometry
   
@@ -213 +215 @@
           ENDDO
         ENDDO
-!        i=ii_begin ; j=jj_begin ; n=(j-1)*iim+i ; xyz_i(n,:)=domain(ind)%xyz(:,i,j) 
-!        i=ii_begin ; j=jj_end   ; n=(j-1)*iim+i ; xyz_i(n,:)=domain(ind)%xyz(:,i,j)
-!        i=ii_end   ; j=jj_begin ; n=(j-1)*iim+i ;   xyz_i(n,:)=domain(ind)%xyz(:,i,j)
-!        PRINT *,"Pb ?? : " 
-!        PRINT *, xyz_i(n,:), domain(ind)%xyz(:,i,j), norm(xyz_i(n,:)- domain(ind)%xyz(:,i,j))
-!        i=ii_end   ; j=jj_end   ; n=(j-1)*iim+i ; xyz_i(n,:)=domain(ind)%xyz(:,i,j)
         
       ENDDO
 
       IF (check) THEN
-!        sum=sum/(ndomain*ii_nb*jj_nb)
         PRINT *,"it = ",it,"  diff centroid circumcenter ",sum
       ENDIF 
@@ -287 +282 @@
             ne(n,k+1)=d%ne(k,i,j)
           ENDDO
-                  
-!          xyz_i(n,:)=d%xyz(:,i,j) 
-!          xyz_v(n+z_up,:)=d%vertex(:,vup-1,i,j) 
-!          xyz_v(n+z_down,:)=d%vertex(:,vdown-1,i,j) 
 
           vect(:,1)=xyz_v(n+z_rup,:)
@@ -309 +300 @@
           bi(n)=0. 
         
-!          CALL dist_cart(d%xyz(:,i,j),d%neighbour(:,right-1,i,j),de(n+u_right))
-!          CALL dist_cart(d%xyz(:,i,j),d%neighbour(:,lup-1,i,j),de(n+u_lup))
-!          CALL dist_cart(d%xyz(:,i,j),d%neighbour(:,ldown-1,i,j),de(n+u_ldown))
-
           CALL dist_cart(xyz_i(n,:),xyz_i(n+t_right,:),de(n+u_right))
           CALL dist_cart(xyz_i(n,:),xyz_i(n+t_lup,:),de(n+u_lup))
           CALL dist_cart(xyz_i(n,:),xyz_i(n+t_ldown,:),de(n+u_ldown))
           
-!          CALL div_arc_bis(d%xyz(:,i,j),d%neighbour(:,right-1,i,j),0.5,xyz_e(n+u_right,:))
-!          CALL div_arc_bis(d%xyz(:,i,j),d%neighbour(:,lup-1,i,j),0.5,xyz_e(n+u_lup,:))
-!          CALL div_arc_bis(d%xyz(:,i,j),d%neighbour(:,ldown-1,i,j),0.5,xyz_e(n+u_ldown,:))
-
           CALL div_arc_bis(xyz_i(n,:),xyz_i(n+t_right,:),0.5,xyz_e(n+u_right,:))
           CALL div_arc_bis(xyz_i(n,:),xyz_i(n+t_lup,:),0.5,xyz_e(n+u_lup,:))
           CALL div_arc_bis(xyz_i(n,:),xyz_i(n+t_ldown,:),0.5,xyz_e(n+u_ldown,:))
-         
-!          CALL dist_cart(d%vertex(:,vrdown-1,i,j),d%vertex(:,vrup-1,i,j),le(n+u_right))
-!          CALL dist_cart(d%vertex(:,vup-1,i,j),d%vertex(:,vlup-1,i,j),le(n+u_lup))
-!          CALL dist_cart(d%vertex(:,vldown-1,i,j),d%vertex(:,vdown-1,i,j),le(n+u_ldown))
 
           CALL dist_cart(xyz_v(n+z_rdown,:), xyz_v(n+z_rup,:),le(n+u_right))
@@ -335 +314 @@
           Ai(n)=0
           DO k=0,5
-!            CALL surf_triangle(d%xyz(:,i,j),d%neighbour(:,k,i,j),d%neighbour(:,MOD((k+1+6),6),i,j),surf_v(k+1))
-!            CALL surf_triangle(d%xyz(:,i,j),d%vertex(:,MOD((k-1+6),6),i,j),d%vertex(:,k,i,j),surf(k+1))
             CALL surf_triangle(xyz_i(n,:),xyz_i(n+t_pos(k+1),:),xyz_i(n+t_pos(MOD((k+1+6),6)+1),:),surf_v(k+1))
             CALL surf_triangle(xyz_i(n,:),xyz_v(n+z_pos(MOD((k-1+6),6)+1),:),xyz_v(n+z_pos(k+1),:),surf(k+1))
@@ -414 +391 @@
           
           DO k=0,5
-!            CALL surf_triangle(d%xyz(:,i,j),d%vertex(:,k,i,j),d%neighbour(:,k,i,j),S1)
-!            CALL surf_triangle(d%xyz(:,i,j),d%vertex(:,k,i,j),d%neighbour(:,MOD(k+1+6,6),i,j),S2)
             CALL surf_triangle(xyz_i(n,:), xyz_v(n+z_pos(k+1),:), xyz_i(n+t_pos(k+1),:),S1)
             CALL surf_triangle(xyz_i(n,:), xyz_v(n+z_pos(k+1),:), xyz_i(n+t_pos(MOD(k+1+6,6)+1),:),S2)
@@ -516 +491 @@
     CALL transfert_request(geom%centroid,req_i1)
     CALL surf_triangle(d%xyz(:,ii_begin,jj_begin),d%xyz(:,ii_begin,jj_end),d%xyz(:,ii_end,jj_begin),S)
-!    PRINT *,"Surf triangle : ",S*20/(4*Pi)
-  
+ 
   END SUBROUTINE set_geometry