Changeset 480 for codes/icosagcm/trunk/src

Timestamp:

09/16/16 15:37:45 (8 years ago)

Author:

ymipsl

Message:

Missing synchronisations for OpenMP on vertical levels

YM

File:

• codes/icosagcm/trunk/src/hevi_scheme.f90 (modified) (5 diffs)

codes/icosagcm/trunk/src/hevi_scheme.f90

@@ -54 +54 @@
     USE disvert_mod
     USE caldyn_hevi_mod
+    USE omp_para
+    USE checksum_mod
     LOGICAL :: fluxt_zero(ndomain) ! set to .TRUE. to start accumulating fluxes in time
     INTEGER :: it,j,l, ind
@@ -68 +70 @@
             f_dW_slow(:,j), f_dW_fast(:,j) )
        ! accumulate mass fluxes for transport scheme
+       
        DO ind=1,ndomain
           IF (.NOT. assigned_domain(ind)) CYCLE
@@ -91 +94 @@
              CALL update_3D(cjl(l,j), f_geopot, f_dPhi_fast(:,l))
           END IF
+!$OMP BARRIER       
        END DO
     END DO
@@ -145 +149 @@
   
   SUBROUTINE update_2D(w, f_y, f_dy)
+  USE omp_para
     REAL(rstd) :: w
     TYPE(t_field) :: f_y(:), f_dy(:)
@@ -152 +157 @@
        IF (.NOT. assigned_domain(ind)) CYCLE
        dy=f_dy(ind); y=f_y(ind)
-       CALL compute_update_2D(w,y,dy)
+       IF (is_omp_level_master) CALL compute_update_2D(w,y,dy)
     ENDDO
   END SUBROUTINE update_2D