Changeset 1815 for palm/trunk/SOURCE/flow_statistics.f90

Timestamp:

Apr 6, 2016 1:49:59 PM (8 years ago)

Author:

raasch

Message:

cpp-switches removed + cpp-bugfixes + zero-settings for velocities inside topography re-activated

File:

• palm/trunk/SOURCE/flow_statistics.f90 (modified) (5 diffs)

palm/trunk/SOURCE/flow_statistics.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-!
+! cpp-directives for intel openmp bug removed
 !
 ! Former revisions:
@@ -358 +358 @@
 
        !$OMP PARALLEL PRIVATE( i, j, k, tn )
-#if defined( __intel_openmp_bug )
-       tn = omp_get_thread_num()
-#else
 !$     tn = omp_get_thread_num()
-#endif
 
        !$OMP DO
@@ -561 +557 @@
 !--          are zero at the walls and inside buildings.
        tn = 0
-#if defined( __intel_openmp_bug )
-       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, &
-       !$OMP                    tn, ust, ust2, u2, vst, vst2, v2, w2 )
-       tn = omp_get_thread_num()
-#else
-       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2, w2 )
+       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper,             &
+       !$OMP                   sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2,  &
+       !$OMP                   w2 )
 !$     tn = omp_get_thread_num()
-#endif
+
        !$OMP DO
        DO  i = nxl, nxr
@@ -1841 +1834 @@
 
        !$OMP PARALLEL PRIVATE( i, j, k, tn )
-#if defined( __intel_openmp_bug )
-       tn = omp_get_thread_num()
-#else
 !$     tn = omp_get_thread_num()
-#endif
 
        !$acc update device( sums_l )
@@ -2117 +2106 @@
 !--          are zero at the walls and inside buildings.
        tn = 0
-#if defined( __intel_openmp_bug )
-       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, &
-       !$OMP                    tn, ust, ust2, u2, vst, vst2, v2, w2 )
-       tn = omp_get_thread_num()
-#else
-       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2, w2 )
+       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper,             &
+       !$OMP                   sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2,  &
+       !$OMP                   w2 )
 !$     tn = omp_get_thread_num()
-#endif
+
        !$OMP DO
        !$acc parallel loop gang present( e, hom, kh, km, p, pt, w, rflags_invers, rmask, sums_l ) create( s1, s2, s3, s4, s5, s6, s7 )