Changeset 2073


Ignore:
Timestamp:
Nov 30, 2016 2:34:05 PM (5 years ago)
Author:
raasch
Message:

mostly openmp related bugfixes

Location:
palm/trunk/SOURCE
Files:
5 edited

Legend:

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

    r2038 r2073  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! openmp bugfix: large scale forcing calculations cannot be executed thread
     23! parallel
    2324!
    2425! Former revisions:
     
    12281229
    12291230       ENDIF
     1231       !$OMP END PARALLEL
    12301232
    12311233!
     
    12731275       ENDIF
    12741276
    1275 
     1277       !$OMP PARALLEL PRIVATE( i, j, k, tn )
     1278!$     tn = omp_get_thread_num()
    12761279       IF ( land_surface )  THEN
    12771280          !$OMP DO
  • palm/trunk/SOURCE/header.f90

    r2051 r2073  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! small bugfix concerning output of scalar profiles
    2323!
    2424! Former revisions:
     
    12211221       DO  WHILE ( s_vertical_gradient_level_ind(i) /= -9999 )
    12221222         
    1223           WRITE (coor_chr,'(E8.1,4X)')  s_init(q_vertical_gradient_level_ind(i))
     1223          WRITE (coor_chr,'(E8.1,4X)')  s_init(s_vertical_gradient_level_ind(i))
    12241224          temperatures = TRIM( temperatures ) // '  ' // TRIM( coor_chr )
    12251225
  • palm/trunk/SOURCE/poismg_mod.f90

    r2038 r2073  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! change of openmp directives in restrict
    2323!
    2424! Former revisions:
     
    431431!--    No wall treatment
    432432       !$OMP PARALLEL PRIVATE (i,j,k,ic,jc,kc,km1,kp1)
     433       !$OMP DO SCHEDULE( STATIC )
    433434       DO  ic = nxl_mg(l), nxr_mg(l)
    434435          i = 2*ic
    435           !$OMP DO SCHEDULE( STATIC )
    436436          DO  jc = nys_mg(l), nyn_mg(l)
    437437!
     
    465465             ENDDO
    466466          ENDDO
    467           !$OMP ENDDO nowait
    468467       ENDDO
     468       !$OMP ENDDO
    469469       !$OMP END PARALLEL
    470470
  • palm/trunk/SOURCE/pres.f90

    r2038 r2073  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! openmp bugfix for calculation of new divergence
    2323!
    2424! Former revisions:
     
    809809
    810810       !$OMP PARALLEL PRIVATE (i,j,k) FIRSTPRIVATE(threadsum) REDUCTION(+:localsum)
     811#if defined( __ibm )
    811812       !$OMP DO SCHEDULE( STATIC )
    812 #if defined( __ibm )
    813813       DO  i = nxl, nxr
    814814          DO  j = nys, nyn
     
    825825       ENDDO
    826826#else
     827       !$OMP DO SCHEDULE( STATIC )
    827828       !$acc kernels present( d, ddzw, rflags_s_inner, u, v, w )
    828829       !$acc loop collapse( 3 )
     
    841842!
    842843!--    Compute possible PE-sum of divergences for flow_statistics
     844       !$OMP DO SCHEDULE( STATIC )
    843845       !$acc parallel loop collapse(3) present( d ) reduction(+:threadsum)
    844846       DO  i = nxl, nxr
  • palm/trunk/SOURCE/surface_layer_fluxes_mod.f90

    r2038 r2073  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! openmp bugfix for lookup method
    2323!
    2424! Former revisions:
     
    685685       ELSEIF ( TRIM( most_method ) == 'lookup' )  THEN
    686686
    687           !$OMP PARALLEL DO PRIVATE( k, z_mo )
     687          !$OMP PARALLEL DO PRIVATE( k, z_mo ) FIRSTPRIVATE( l_bnd ) LASTPRIVATE( l_bnd )
    688688          !# WARNING: does not work on GPU so far because of DO  WHILE construct
    689689          !!!!!!$acc kernels loop
Note: See TracChangeset for help on using the changeset viewer.