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

codes/icosagcm/trunk/src/dimensions.f90

@@ -1 +1 @@
 MODULE dimensions
 
-    INTEGER :: iim
-    INTEGER :: jjm
-    INTEGER :: ii_begin
-    INTEGER :: jj_begin
-    INTEGER :: ii_end
-    INTEGER :: jj_end
-    INTEGER :: ii_nb
-    INTEGER :: jj_nb
-    INTEGER :: ij_begin
-    INTEGER :: ij_end
-    INTEGER :: ij_begin_ext
-    INTEGER :: ij_end_ext
+    INTEGER,SAVE :: iim
+!$OMP THREADPRIVATE(iim)
+    INTEGER,SAVE :: jjm
+!$OMP THREADPRIVATE(jjm)
+    INTEGER,SAVE :: ii_begin
+!$OMP THREADPRIVATE(ii_begin)
+    INTEGER,SAVE :: jj_begin
+!$OMP THREADPRIVATE(jj_begin)
+    INTEGER,SAVE :: ii_end
+!$OMP THREADPRIVATE(ii_end)
+    INTEGER,SAVE :: jj_end
+!$OMP THREADPRIVATE(jj_end)
+    INTEGER,SAVE :: ii_nb
+!$OMP THREADPRIVATE(ii_nb)
+    INTEGER,SAVE :: jj_nb
+!$OMP THREADPRIVATE(jj_nb)
+    INTEGER,SAVE :: ij_begin
+!$OMP THREADPRIVATE(ij_begin)
+    INTEGER,SAVE :: ij_end
+!$OMP THREADPRIVATE(ij_end)
+    INTEGER,SAVE :: ij_begin_ext
+!$OMP THREADPRIVATE(ij_begin_ext)
+    INTEGER,SAVE :: ij_end_ext
+!$OMP THREADPRIVATE(ij_end_ext)
         
-    INTEGER :: t_right
-    INTEGER :: t_rup
-    INTEGER :: t_lup
-    INTEGER :: t_left
-    INTEGER :: t_ldown
-    INTEGER :: t_rdown
+    INTEGER,SAVE :: t_right
+!$OMP THREADPRIVATE(t_right)
+    INTEGER,SAVE :: t_rup
+!$OMP THREADPRIVATE(t_rup)
+    INTEGER,SAVE :: t_lup
+!$OMP THREADPRIVATE(t_lup)
+    INTEGER,SAVE :: t_left
+!$OMP THREADPRIVATE(t_left)
+    INTEGER,SAVE :: t_ldown
+!$OMP THREADPRIVATE(t_ldown)
+    INTEGER,SAVE :: t_rdown
+!$OMP THREADPRIVATE(t_rdown)
 
-    INTEGER :: u_right
-    INTEGER :: u_rup
-    INTEGER :: u_lup
-    INTEGER :: u_left
-    INTEGER :: u_ldown
-    INTEGER :: u_rdown
+    INTEGER,SAVE :: u_right
+!$OMP THREADPRIVATE(u_right)
+    INTEGER,SAVE :: u_rup
+!$OMP THREADPRIVATE(u_rup)
+    INTEGER,SAVE :: u_lup
+!$OMP THREADPRIVATE(u_lup)
+    INTEGER,SAVE :: u_left
+!$OMP THREADPRIVATE(u_left)
+    INTEGER,SAVE :: u_ldown
+!$OMP THREADPRIVATE(u_ldown)
+    INTEGER,SAVE :: u_rdown
+!$OMP THREADPRIVATE(u_rdown)
 
-    INTEGER :: z_rup
-    INTEGER :: z_up
-    INTEGER :: z_lup
-    INTEGER :: z_ldown
-    INTEGER :: z_down
-    INTEGER :: z_rdown
+    INTEGER,SAVE :: z_rup
+!$OMP THREADPRIVATE(z_rup)
+    INTEGER,SAVE :: z_up
+!$OMP THREADPRIVATE(z_up)
+    INTEGER,SAVE :: z_lup
+!$OMP THREADPRIVATE(z_lup)
+    INTEGER,SAVE :: z_ldown
+!$OMP THREADPRIVATE(z_ldown)
+    INTEGER,SAVE :: z_down
+!$OMP THREADPRIVATE(z_down)
+    INTEGER,SAVE :: z_rdown
+!$OMP THREADPRIVATE(z_rdown)
 
-    INTEGER :: t_pos(6)
-    INTEGER :: u_pos(6)
-    INTEGER :: z_pos(6)
+    INTEGER,SAVE :: t_pos(6)
+!$OMP THREADPRIVATE(t_pos)
+    INTEGER,SAVE :: u_pos(6)
+!$OMP THREADPRIVATE(u_pos)
+    INTEGER,SAVE :: z_pos(6)
+!$OMP THREADPRIVATE(z_pos)
         
 CONTAINS
@@ -48 +81 @@
     TYPE(t_domain),POINTER :: d
     
-    
-!$OMP MASTER
     d=>domain(ind)
      
@@ -91 +122 @@
      z_pos(:)=d%z_pos(:)
 
-!$OMP END MASTER     
-!$OMP BARRIER
    END SUBROUTINE swap_dimensions