Changeset 1905

Timestamp:

Nov 20, 2013, 2:08:45 PM (11 years ago)

Author:

acozic

Message:

Make some correction in omp synchro and barrier for coupled model with Orchidee
These modifications doesn't impact LMDZ without orchidee.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• mod_phys_lmdz_omp_transfert.F90 (modified) (1 diff)
• mod_synchro_omp.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/mod_phys_lmdz_omp_transfert.F90

@@ -48 +48 @@
 
 
-  PUBLIC bcast_omp,scatter_omp,gather_omp,reduce_sum_omp
+  PUBLIC bcast_omp,scatter_omp,gather_omp,reduce_sum_omp, omp_barrier
 
 CONTAINS
 
+  SUBROUTINE omp_barrier
+  IMPLICIT NONE
+
+!$OMP BARRIER
+
+  END SUBROUTINE omp_barrier
+  
   SUBROUTINE check_buffer_i(buff_size)
   IMPLICIT NONE

LMDZ5/trunk/libf/phylmd/mod_synchro_omp.F90

@@ -1 +1 @@
 MODULE mod_synchro_omp
 
-  LOGICAL,SAVE,ALLOCATABLE :: flag_omp(:)
-  
+    INTEGER,SAVE :: exit_omp  
+
 CONTAINS
 
@@ -8 +8 @@
   USE mod_phys_lmdz_para 
   IMPLICIT NONE
-    
-    IF (is_omp_root) THEN
-      ALLOCATE(flag_omp(0:omp_size-1))
-      flag_omp(:)=.FALSE.
-    ENDIF
-!$OMP BARRIER
+
+  CALL omp_barrier
+!$OMP MASTER
+  exit_omp=0
+!$OMP END MASTER    
+  CALL omp_barrier
 
   END SUBROUTINE Init_Synchro_omp
   
-  SUBROUTINE Synchro_omp
+  SUBROUTINE Synchro_omp  
   USE mod_phys_lmdz_para
   IMPLICIT NONE
+  LOGICAL :: out
   
-    flag_omp(omp_rank)=.TRUE.
+    out=.FALSE.
 !$OMP BARRIER
-    DO WHILE (.NOT. ALL(flag_omp))
+!$OMP BARRIER
+!$OMP ATOMIC  
+    exit_omp=exit_omp+1
+!$OMP BARRIER
+!$OMP BARRIER
+    IF (exit_omp==omp_size) THEN
+      out=.TRUE.
+    ENDIF
+    
+    DO WHILE (.NOT. out)
+!$OMP BARRIER
+      IF (exit_omp==omp_size) out=.TRUE.
 !$OMP BARRIER
     ENDDO
-!$OMP BARRIER        
-    flag_omp(omp_rank)=.FALSE.
+
+!$OMP BARRIER
+!$OMP MASTER
+    exit_omp=0
+!$OMP END MASTER
 !$OMP BARRIER
 
-   END SUBROUTINE Synchro_omp
+    IF (exit_omp/=0) THEN
+      STOP 'synchro_omp'
+    ENDIF
+
+  END SUBROUTINE Synchro_omp
+
 
 END MODULE mod_synchro_omp