Changeset 295 for codes/icosagcm/trunk/src/advect_tracer.f90

Timestamp:

10/31/14 14:52:01 (10 years ago)

Author:

ymipsl

Message:

Merging OpenMP parallisme mode : by subdomain and on vertical level.
This feature is actually experimental but may be retro-compatible with the last method based only on subdomain

YM

File:

• codes/icosagcm/trunk/src/advect_tracer.f90 (modified) (9 diffs)

codes/icosagcm/trunk/src/advect_tracer.f90

@@ -26 +26 @@
   SUBROUTINE init_advect_tracer
     USE advect_mod
+    USE omp_para
     REAL(rstd),POINTER :: tangent(:,:)
     REAL(rstd),POINTER :: normal(:,:)
@@ -48 +49 @@
        tangent=f_tangent(ind)
        sqrt_leng=f_sqrt_leng(ind)
-       CALL init_advect(normal,tangent,sqrt_leng)
+       IF (is_omp_level_master) CALL init_advect(normal,tangent,sqrt_leng)
     END DO
 
@@ -238 +239 @@
 
 !--> flush dzqw, adzqw
-!!$OMP BARRIER
+!$OMP BARRIER
 
     ! minmod-limited slope of q
@@ -258 +259 @@
 
     ! 0 slope in top and bottom layers
-    IF (omp_first) THEN
+    IF (is_omp_first_level) THEN
       DO ij=ijb,ije
            dzq(ij,1)=0.
@@ -264 +265 @@
     ENDIF
       
-    IF (omp_last) THEN
+    IF (is_omp_last_level) THEN
       DO ij=ijb,ije
           dzq(ij,llm)=0.
@@ -271 +272 @@
 
 !---> flush dzq
-!!$OMP BARRIER  
+!$OMP BARRIER  
 
     ! sigw = fraction of mass that leaves level l/l+1
@@ -290 +291 @@
     END DO
     ! wq = 0 at top and bottom
-    IF (omp_first) THEN
+    IF (is_omp_first_level) THEN
        DO ij=ijb,ije
             wq(ij,1)=0.
@@ -296 +297 @@
     ENDIF
     
-    IF (omp_last) THEN
+    IF (is_omp_last_level) THEN
       DO ij=ijb,ije
             wq(ij,llm+1)=0.
@@ -303 +304 @@
 
 ! --> flush wq
-!!$OMP BARRIER
+!$OMP BARRIER