Changeset 2073

Timestamp:

Nov 30, 2016 2:34:05 PM (8 years ago)

Author:

raasch

Message:

mostly openmp related bugfixes

Location:

palm/trunk/SOURCE

Files:

• flow_statistics.f90 (modified) (3 diffs)
• header.f90 (modified) (2 diffs)
• poismg_mod.f90 (modified) (3 diffs)
• pres.f90 (modified) (4 diffs)
• surface_layer_fluxes_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/flow_statistics.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! openmp bugfix: large scale forcing calculations cannot be executed thread
+! parallel
 ! 
 ! Former revisions:
@@ -1228 +1229 @@
 
        ENDIF
+       !$OMP END PARALLEL
 
 !
@@ -1273 +1275 @@
        ENDIF
 
-
+       !$OMP PARALLEL PRIVATE( i, j, k, tn )
+!$     tn = omp_get_thread_num()
        IF ( land_surface )  THEN
           !$OMP DO

palm/trunk/SOURCE/header.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! small bugfix concerning output of scalar profiles
 ! 
 ! Former revisions:
@@ -1221 +1221 @@
        DO  WHILE ( s_vertical_gradient_level_ind(i) /= -9999 )
           
-          WRITE (coor_chr,'(E8.1,4X)')  s_init(q_vertical_gradient_level_ind(i))
+          WRITE (coor_chr,'(E8.1,4X)')  s_init(s_vertical_gradient_level_ind(i))
           temperatures = TRIM( temperatures ) // '  ' // TRIM( coor_chr )
 

palm/trunk/SOURCE/poismg_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! change of openmp directives in restrict
 ! 
 ! Former revisions:
@@ -431 +431 @@
 !--    No wall treatment
        !$OMP PARALLEL PRIVATE (i,j,k,ic,jc,kc,km1,kp1)
+       !$OMP DO SCHEDULE( STATIC )
        DO  ic = nxl_mg(l), nxr_mg(l)
           i = 2*ic
-          !$OMP DO SCHEDULE( STATIC )
           DO  jc = nys_mg(l), nyn_mg(l)
 !
@@ -465 +465 @@
              ENDDO
           ENDDO
-          !$OMP ENDDO nowait
        ENDDO
+       !$OMP ENDDO
        !$OMP END PARALLEL
 

palm/trunk/SOURCE/pres.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! openmp bugfix for calculation of new divergence
 ! 
 ! Former revisions:
@@ -809 +809 @@
 
        !$OMP PARALLEL PRIVATE (i,j,k) FIRSTPRIVATE(threadsum) REDUCTION(+:localsum)
+#if defined( __ibm )
        !$OMP DO SCHEDULE( STATIC )
-#if defined( __ibm )
        DO  i = nxl, nxr
           DO  j = nys, nyn
@@ -825 +825 @@
        ENDDO
 #else
+       !$OMP DO SCHEDULE( STATIC )
        !$acc kernels present( d, ddzw, rflags_s_inner, u, v, w )
        !$acc loop collapse( 3 )
@@ -841 +842 @@
 !
 !--    Compute possible PE-sum of divergences for flow_statistics
+       !$OMP DO SCHEDULE( STATIC )
        !$acc parallel loop collapse(3) present( d ) reduction(+:threadsum)
        DO  i = nxl, nxr

palm/trunk/SOURCE/surface_layer_fluxes_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! openmp bugfix for lookup method
 ! 
 ! Former revisions:
@@ -685 +685 @@
        ELSEIF ( TRIM( most_method ) == 'lookup' )  THEN
 
-          !$OMP PARALLEL DO PRIVATE( k, z_mo )
+          !$OMP PARALLEL DO PRIVATE( k, z_mo ) FIRSTPRIVATE( l_bnd ) LASTPRIVATE( l_bnd )
           !# WARNING: does not work on GPU so far because of DO  WHILE construct
           !!!!!!$acc kernels loop