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

codes/icosagcm/trunk/src/etat0_heldsz.f90

@@ -8 +8 @@
   TYPE(t_field),POINTER :: f_clat(:) ! FIXME, duplication
 
-  REAL(rstd),ALLOCATABLE :: knewt_t(:),kfrict(:)
-
+  REAL(rstd),ALLOCATABLE,SAVE :: knewt_t(:),kfrict(:)
+!$OMP THREADPRIVATE(knewt_t,kfrict)
   LOGICAL, SAVE :: done=.FALSE.
-
-  REAL(rstd) :: teta0,ttp,delt_y,delt_z,eps
-  REAL(rstd) :: knewt_g, k_f,k_c_a,k_c_s
+!$OMP THREADPRIVATE(done)
+
+  REAL(rstd),SAVE :: teta0,ttp,delt_y,delt_z,eps
+!$OMP THREADPRIVATE(teta0,ttp,delt_y,delt_z,eps)
+
+  REAL(rstd),SAVE :: knewt_g, k_f,k_c_a,k_c_s
+!$OMP THREADPRIVATE(knewt_g, k_f,k_c_a,k_c_s)
 
   PUBLIC :: etat0, held_suarez
@@ -69 +73 @@
     CALL Init_Teq
     DO ind=1,ndomain
+       IF (.NOT. assigned_domain(ind)) CYCLE
        CALL swap_dimensions(ind)
        CALL swap_geometry(ind)
@@ -139 +144 @@
 
        DO ind=1,ndomain
+          IF (.NOT. assigned_domain(ind)) CYCLE
           CALL swap_dimensions(ind)
           CALL swap_geometry(ind)
@@ -230 +236 @@
 
     DO ind=1,ndomain
+       IF (.NOT. assigned_domain(ind)) CYCLE
        CALL swap_dimensions(ind)
        CALL swap_geometry(ind)