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

Timestamp:

01/09/14 09:56:11 (11 years ago)

Author:

ymipsl

Message:

Add new openMP parallelism based on distribution of domains on threads. There is no more limitation of number of threads by MPI process.

YM

File:

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

codes/icosagcm/trunk/src/geometry.f90

@@ -25 +25 @@
   END TYPE t_geometry    
 
-  TYPE(t_geometry),TARGET :: geom
+  TYPE(t_geometry),SAVE,TARGET :: geom
+
   
   REAL(rstd),POINTER :: Ai(:)          ! area of a cell
+!$OMP THREADPRIVATE(Ai)
   REAL(rstd),POINTER :: xyz_i(:,:)     ! coordinate of the center of the cell (voronoi)
+!$OMP THREADPRIVATE(xyz_i)
   REAL(rstd),POINTER :: centroid(:,:)  ! coordinate of the centroid of the cell
+!$OMP THREADPRIVATE(centroid)
   REAL(rstd),POINTER :: xyz_e(:,:)     ! coordinate of a wind point on the cell on a edge
+!$OMP THREADPRIVATE(xyz_e)
   REAL(rstd),POINTER :: ep_e(:,:)      ! perpendicular unit vector of a edge (outsider)
+!$OMP THREADPRIVATE(ep_e)
   REAL(rstd),POINTER :: et_e(:,:)      ! tangeantial unit vector of a edge
+!$OMP THREADPRIVATE(et_e)
   REAL(rstd),POINTER :: elon_i(:,:)    ! unit longitude vector on the center 
+!$OMP THREADPRIVATE(elon_i)
   REAL(rstd),POINTER :: elat_i(:,:)    ! unit latitude vector on the center 
+!$OMP THREADPRIVATE(elat_i)
   REAL(rstd),POINTER :: elon_e(:,:)    ! unit longitude vector on a wind point 
+!$OMP THREADPRIVATE(elon_e)
   REAL(rstd),POINTER :: elat_e(:,:)    ! unit latitude vector on a wind point
+!$OMP THREADPRIVATE(elat_e)
   REAL(rstd),POINTER :: xyz_v(:,:)     ! coordinate of a vertex (center of the dual mesh)
+!$OMP THREADPRIVATE(xyz_v)
   REAL(rstd),POINTER :: Av(:)          ! area of dual mesk cell
+!$OMP THREADPRIVATE(Av)
   REAL(rstd),POINTER :: de(:)          ! distance from a neighbour == lenght of an edge of the dual mesh
+!$OMP THREADPRIVATE(de)
   REAL(rstd),POINTER :: le(:)          ! lenght of a edge
+!$OMP THREADPRIVATE(le)
   REAL(rstd),POINTER :: Riv(:,:)       ! weight
+!$OMP THREADPRIVATE(Riv)
   REAL(rstd),POINTER :: Riv2(:,:)      ! weight
+!$OMP THREADPRIVATE(Riv2)
   INTEGER,POINTER    :: ne(:,:)        ! convention for the way on the normal wind on an edge 
+!$OMP THREADPRIVATE(ne)
   REAL(rstd),POINTER :: Wee(:,:,:)     ! weight
+!$OMP THREADPRIVATE(Wee)
   REAL(rstd),POINTER :: bi(:)          ! orographie
+!$OMP THREADPRIVATE(bi)
   REAL(rstd),POINTER :: fv(:)          ! coriolis (evaluted on a vertex)
+!$OMP THREADPRIVATE(fv)
      
 
@@ -91 +112 @@
   IMPLICIT NONE
     INTEGER,INTENT(IN) :: ind
-!$OMP MASTER
+!!$OMP MASTER
     Ai=geom%Ai(ind)
     xyz_i=geom%xyz_i(ind)
@@ -112 +133 @@
     bi=geom%bi(ind)
     fv=geom%fv(ind)
-!$OMP END MASTER
-!$OMP BARRIER    
+!!$OMP END MASTER
+!!$OMP BARRIER    
   END SUBROUTINE swap_geometry
 
@@ -127 +148 @@
     REAL(rstd) :: vect(3,6)
     REAL(rstd) :: centr(3)
-
     INTEGER :: ind,i,j,n,k
-
-    CALL transfert_request(geom%xyz_i,req_i1)
+    TYPE(t_message),SAVE :: message
+    LOGICAL, SAVE :: first=.TRUE.
+!$OMP THREADPRIVATE(first)    
+    
+    IF (first) THEN
+      CALL init_message(geom%xyz_i, req_i1 ,message)
+      first=.FALSE.
+    ENDIF
+    
+    CALL transfert_message(geom%xyz_i,message)
+        
+    
+!    CALL transfert_request(geom%xyz_i,req_i1)
 
     DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)) CYCLE
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
@@ -157 +189 @@
   USE transfert_mod
   USE vector
-  USE ioipsl
+  USE getin_mod
   IMPLICIT NONE
     INTEGER :: nb_it=0
@@ -172 +204 @@
     
     DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)) CYCLE
       d=>domain(ind)
       CALL swap_dimensions(ind)
@@ -186 +219 @@
 
     DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)) CYCLE
       d=>domain(ind)
       CALL swap_dimensions(ind)
@@ -215 +249 @@
       sum=0
       DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)) CYCLE
         CALL swap_dimensions(ind)
         CALL swap_geometry(ind)
@@ -253 +288 @@
   USE dimensions
   USE transfert_mod
-  USE ioipsl
+  USE getin_mod
   IMPLICIT NONE
 
@@ -273 +308 @@
  
     DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)) CYCLE
       d=>domain(ind)
       CALL swap_dimensions(ind)
@@ -489 +525 @@
                  
     ENDDO
+
     CALL transfert_request(geom%Ai,req_i1)
     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)