Changeset 186 for codes/icosagcm/trunk/src/domain.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/domain.f90 (modified) (2 diffs)

codes/icosagcm/trunk/src/domain.f90

@@ -58 +58 @@
   END TYPE t_domain
 
+  INTEGER,SAVE :: ndomain
+  INTEGER,SAVE :: ndomain_glo
+
   TYPE(t_domain),SAVE,ALLOCATABLE,TARGET :: domain(:)
-  INTEGER :: ndomain
   TYPE(t_domain),SAVE,ALLOCATABLE,TARGET :: domain_glo(:)
-  INTEGER :: ndomain_glo
-
-  INTEGER,ALLOCATABLE,SAVE :: domglo_rank(:)
-  INTEGER,ALLOCATABLE,SAVE :: domglo_loc_ind(:)
-  INTEGER,ALLOCATABLE,SAVE :: domloc_glo_ind(:)
-  
+
+  INTEGER,ALLOCATABLE,SAVE :: domglo_rank(:)  ! size : ndomain_glo : mpi rank assigned to a domain 
+  INTEGER,ALLOCATABLE,SAVE :: domglo_loc_ind(:) ! size : ndomain_glo : corresponding local indice for a global domain indice
+  INTEGER,ALLOCATABLE,SAVE :: domloc_glo_ind(:) ! size : ndomain : corresponding global indice for a local domain indice
+
+  LOGICAL, ALLOCATABLE, SAVE :: assigned_domain(:) ! size : ndomain : is an omp task is assigned to this domain
+!$OMP THREADPRIVATE(assigned_domain)
+    
 CONTAINS
 
@@ -423 +427 @@
       ENDIF
     ENDDO
+
+!$OMP PARALLEL
+    CALL assign_domain_omp
+!$OMP END PARALLEL
+        
     
   END SUBROUTINE  assign_domain      
-    
+   
+  SUBROUTINE assign_domain_omp
+  USE omp_para
+  USE mpipara
+  IMPLICIT NONE
+    INTEGER :: nb_domain
+    INTEGER :: rank, ind, i
+
+    ALLOCATE(assigned_domain(ndomain))
+    
+    ind=0
+    DO rank=0,omp_size-1
+      nb_domain=ndomain/omp_size
+      IF ( rank < MOD(ndomain,omp_size) ) nb_domain=nb_domain+1
+    
+      DO i=1,nb_domain
+       ind=ind+1
+       IF (rank==omp_rank) THEN 
+         assigned_domain(ind)=.TRUE.
+         PRINT *,"Rank ",mpi_rank," task ",rank," local domain : ",ind," global domain ",domloc_glo_ind(ind)
+       ELSE
+         assigned_domain(ind)=.FALSE.
+       ENDIF  
+      ENDDO
+    
+    ENDDO
+    
+  END SUBROUTINE assign_domain_omp
+    
+
           
   SUBROUTINE compute_domain