Changeset 327 for codes/icosagcm/trunk/src/omp_para.F90

Timestamp:

02/09/15 20:18:34 (9 years ago)

Author:

ymipsl

Message:

Merge recent developments from saturn branch onto trunk.

• lmdz generic physics interface
• performance improvment on mix mpi/openmp
• asynchrone and overlaping communication
• best domain distribution between process and threads
• ....

This version is compatible with the actual saturn version and the both branches are considered merged on dynamico component.

YM

File:

• codes/icosagcm/trunk/src/omp_para.F90 (modified) (5 diffs)

codes/icosagcm/trunk/src/omp_para.F90

@@ -68 +68 @@
   IMPLICIT NONE
   LOGICAL, INTENT(IN) :: is_mpi_master
-  INTEGER :: ll_nb,i
+  INTEGER :: ll_nb,i,llb,lle
 
 #ifdef CPP_USING_OMP
@@ -77 +77 @@
 
   IF (using_openmp) THEN    
-!$OMP PARALLEL PRIVATE(ll_nb,i)
+!$OMP PARALLEL PRIVATE(ll_nb,i,llb,lle)
   
 !$OMP MASTER
@@ -123 +123 @@
     IF (omp_level_rank==omp_level_size-1) is_omp_last_level=.TRUE.
     
-    ll_end=0
+    lle=0
+    
     DO i=0,omp_level_rank
-      ll_begin=ll_end+1
+      llb=lle+1
       ll_nb=llm/omp_level_size
       IF (MOD(llm,omp_level_size)>i) ll_nb=ll_nb+1
-      ll_end=ll_begin+ll_nb-1
+      lle=llb+ll_nb-1
     ENDDO
+    ll_begin=llb
+    ll_end=lle
     
     ll_beginp1=ll_begin
@@ -160 +163 @@
 
    ELSE
-     is_master=is_mpi_master
      omp_size=1
      omp_level_size=1
@@ -198 +200 @@
   END SUBROUTINE init_omp_para
 
+  SUBROUTINE distrib_level(size,lbegin,lend)
+  IMPLICIT NONE
+    INTEGER,INTENT(IN)  :: size  
+    INTEGER,INTENT(OUT) :: lbegin  
+    INTEGER,INTENT(OUT) :: lend  
+    INTEGER :: div,rest
+    
+    div=size/omp_level_size
+    rest=MOD(size,omp_level_size)
+    IF (omp_level_rank<rest) THEN
+      lbegin=(div+1)*omp_level_rank+1
+      lend=lbegin+div
+    ELSE
+      lbegin=(div+1)*rest + (omp_level_rank-rest)*div+1
+      lend=lbegin+div-1
+    ENDIF
+  END SUBROUTINE distrib_level
+
 
   SUBROUTINE switch_omp_distrib_level