Changeset 1860

Timestamp:

Sep 5, 2013, 12:52:02 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Implement in dyn3dpar the modifications that were made in the dyn3dmem dynamics (r1858-1859) about setting size of omp_chunk.
EM

Location:

LMDZ5/trunk/libf/dyn3dpar

Files:

• conf_gcm.F (modified) (3 diffs)
• parallel_lmdz.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F

@@ -16 +16 @@
       use mod_filtre_fft, ONLY : use_filtre_fft
       use mod_hallo, ONLY : use_mpi_alloc
-      USE parallel_lmdz, ONLY : omp_chunk
       USE infotrac, ONLY : type_trac
       use assert_m, only: assert
@@ -906 +905 @@
       use_mpi_alloc=.FALSE.
       CALL getin('use_mpi_alloc',use_mpi_alloc)
-
-!Config  Key  = omp_chunk
-!Config  Desc = taille des blocs openmp
-!Config  Def  = 1
-!Config  Help = defini la taille des packets d'it�ration openmp
-!Config         distribu�e � chaque t�che lors de l'entr�e dans une
-!Config         boucle parall�lis�e
-  
-      omp_chunk=1
-      CALL getin('omp_chunk',omp_chunk)
 
 !Config key = ok_strato
@@ -1004 +993 @@
       write(lunout,*)' use_filtre_fft = ', use_filtre_fft
       write(lunout,*)' use_mpi_alloc = ', use_mpi_alloc
-      write(lunout,*)' omp_chunk = ', omp_chunk
       write(lunout,*)' ok_strato = ', ok_strato
       write(lunout,*)' ok_gradsfile = ', ok_gradsfile

LMDZ5/trunk/libf/dyn3dpar/parallel_lmdz.F90

@@ -4 +4 @@
   MODULE parallel_lmdz
   USE mod_const_mpi
+#ifdef CPP_IOIPSL
+      use IOIPSL, only: getin
+#else
+! if not using IOIPSL, we still need to use (a local version of) getin
+      use ioipsl_getincom, only: getin
+#endif    
     
     LOGICAL,SAVE :: using_mpi=.TRUE.
@@ -155 +161 @@
         omp_size=OMP_GET_NUM_THREADS()
 !$OMP END MASTER
+!$OMP BARRIER
         omp_rank=OMP_GET_THREAD_NUM()    
+
+!Config  Key  = omp_chunk
+!Config  Desc = taille des blocs openmp
+!Config  Def  = 1
+!Config  Help = defini la taille des packets d'it�ration openmp
+!Config         distribue a chaque tache lors de l'entree dans une
+!Config         boucle parallelisee
+
+!$OMP MASTER
+      omp_chunk=(llm+1)/omp_size
+      IF (MOD(llm+1,omp_size)/=0) omp_chunk=omp_chunk+1
+      CALL getin('omp_chunk',omp_chunk)
+!$OMP END MASTER
+!$OMP BARRIER        
 #else    
         omp_size=1