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

Timestamp:

01/09/14 09:56:11 (10 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/check_conserve.f90 (modified) (9 diffs)

codes/icosagcm/trunk/src/check_conserve.f90

@@ -10 +10 @@
   PUBLIC init_check_conserve, check_conserve 
     REAL(rstd),SAVE:: mtot0,ztot0,etot0,ang0,stot0,rmsv0
+!$OMP THREADPRIVATE(mtot0,ztot0,etot0,ang0,stot0,rmsv0)
     REAL(rstd),SAVE:: etot,ang,stot,rmsv
+!$OMP THREADPRIVATE(etot,ang,stot,rmsv)
     REAL(rstd),SAVE:: ztot
-        
+!$OMP THREADPRIVATE(ztot)       
      
 CONTAINS 
@@ -53 +55 @@
 
     DO ind=1,ndomain 
+      IF (.NOT. assigned_domain(ind)) CYCLE
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
@@ -67 +70 @@
 
     IF (is_mpi_root) THEN 
-       
+!$OMP MASTER       
        IF ( it == 0  ) Then 
           ztot0 = ztot
@@ -87 +90 @@
        WRITE(*,4000)mtot,rmsdpdt,etot,ztot,stot,rmsv,ang
        
-4000   FORMAT(10x,'masse',4x,'rmsdpdt',7x,'energie',2x,'enstrophie'  &
-            ,2x,'entropie',3x,'rmsv',4x,'mt.ang',/,'GLOB  '                &
+4000   FORMAT(10x,'masse',5x,'rmsdpdt',5x,'energie',5x,'enstrophie'  &
+            ,5x,'entropie',5x,'rmsv',5x,'mt.ang',/,'GLOB  '                &
             ,e10.3,e13.6,5e10.3/)     
-       close(134) 
+       close(134)
+!$OMP END MASTER 
     END IF
   END SUBROUTINE check_conserve
@@ -99 +103 @@
   USE mpi_mod
   USE mpipara
+  USE transfert_omp_mod
   USE icosa
   IMPLICIT NONE
@@ -108 +113 @@
     INTEGER :: ind,i,j,ij  
     REAL :: mloc, rmsloc
+    REAL :: mloc_mpi, rmsloc_mpi
 
     mloc=0.0; rmsloc=0.0
     DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)) CYCLE
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
@@ -127 +134 @@
 
     IF (using_mpi) THEN
-      CALL MPI_REDUCE(mloc, mtot, 1, MPI_REAL8, MPI_SUM, 0, comm_icosa, ierr)
-      CALL MPI_REDUCE(rmsloc, rmsdpdt, 1, MPI_REAL8, MPI_SUM, 0, comm_icosa, ierr)
+        CALL reduce_sum_omp(mloc, mloc_mpi)
+        CALL reduce_sum_omp(rmsloc, rmsloc_mpi)
+!$OMP MASTER    
+      CALL MPI_REDUCE(mloc_mpi, mtot, 1, MPI_REAL8, MPI_SUM, 0, comm_icosa, ierr)
+      CALL MPI_REDUCE(rmsloc_mpi, rmsdpdt, 1, MPI_REAL8, MPI_SUM, 0, comm_icosa, ierr)
+!$OMP END MASTER
+    ELSE
+      
     ENDIF
     
@@ -153 +166 @@
 
     DO ind=1,ndomain 
+      IF (.NOT. assigned_domain(ind)) CYCLE
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
@@ -260 +274 @@
 
      DO ind=1,ndomain 
+       IF (.NOT. assigned_domain(ind)) CYCLE
        CALL swap_dimensions(ind)
        CALL swap_geometry(ind)