Ignore:
Timestamp:
Apr 6, 2016 1:49:59 PM (5 years ago)
Author:
raasch
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/flow_statistics.f90

    r1784 r1815  
    1919! Current revisions:
    2020! -----------------
    21 !
     21! cpp-directives for intel openmp bug removed
    2222!
    2323! Former revisions:
     
    358358
    359359       !$OMP PARALLEL PRIVATE( i, j, k, tn )
    360 #if defined( __intel_openmp_bug )
    361        tn = omp_get_thread_num()
    362 #else
    363360!$     tn = omp_get_thread_num()
    364 #endif
    365361
    366362       !$OMP DO
     
    561557!--          are zero at the walls and inside buildings.
    562558       tn = 0
    563 #if defined( __intel_openmp_bug )
    564        !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, &
    565        !$OMP                    tn, ust, ust2, u2, vst, vst2, v2, w2 )
    566        tn = omp_get_thread_num()
    567 #else
    568        !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2, w2 )
     559       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper,             &
     560       !$OMP                   sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2,  &
     561       !$OMP                   w2 )
    569562!$     tn = omp_get_thread_num()
    570 #endif
     563
    571564       !$OMP DO
    572565       DO  i = nxl, nxr
     
    18411834
    18421835       !$OMP PARALLEL PRIVATE( i, j, k, tn )
    1843 #if defined( __intel_openmp_bug )
    1844        tn = omp_get_thread_num()
    1845 #else
    18461836!$     tn = omp_get_thread_num()
    1847 #endif
    18481837
    18491838       !$acc update device( sums_l )
     
    21172106!--          are zero at the walls and inside buildings.
    21182107       tn = 0
    2119 #if defined( __intel_openmp_bug )
    2120        !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, &
    2121        !$OMP                    tn, ust, ust2, u2, vst, vst2, v2, w2 )
    2122        tn = omp_get_thread_num()
    2123 #else
    2124        !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper, sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2, w2 )
     2108       !$OMP PARALLEL PRIVATE( i, j, k, pts, sums_ll, sums_l_eper,             &
     2109       !$OMP                   sums_l_etot, tn, ust, ust2, u2, vst, vst2, v2,  &
     2110       !$OMP                   w2 )
    21252111!$     tn = omp_get_thread_num()
    2126 #endif
     2112
    21272113       !$OMP DO
    21282114       !$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 )
Note: See TracChangeset for help on using the changeset viewer.