Changeset 4237 for palm


Ignore:
Timestamp:
Sep 25, 2019 11:33:42 AM (4 years ago)
Author:
knoop
Message:

Added missing OpenMP directives within "disturb_field", "surface_layer_fluxes" and "timestep"

Location:
palm/trunk/SOURCE
Files:
3 edited

Legend:

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

    r4182 r4237  
    2525! -----------------
    2626! $Id$
     27! Added missing OpenMP directives
     28!
     29! 4182 2019-08-22 15:20:23Z scharf
    2730! Corrected "Former revisions" section
    2831!
     
    166169!-- compiler option -O3
    167170     !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(i, j, k) PRESENT(dist1, dist2)
     171     !$OMP PARALLEL DO PRIVATE(i, j, k)
    168172     DO  i = nxl, nxr
    169173        DO  j = nys, nyn
     
    187191
    188192    !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(i, j, k) PRESENT(dist1, dist2)
     193    !$OMP PARALLEL DO PRIVATE(i, j, k)
    189194    DO  i = nxl, nxr
    190195       DO  j = nys, nyn
     
    219224!-- Random perturbation is added to the array to be disturbed.
    220225    !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) PRESENT(field, dist1)
     226    !$OMP PARALLEL DO PRIVATE(i, j, k)
    221227    DO  i = nxlg, nxrg
    222228       DO  j = nysg, nyng
  • palm/trunk/SOURCE/surface_layer_fluxes_mod.f90

    r4186 r4237  
    2626! -----------------
    2727! $Id$
     28! Added missing OpenMP directives
     29!
     30! 4186 2019-08-23 16:06:14Z suehring
    2831! - To enable limitation of Obukhov length, move it before exit-cycle construct.
    2932!   Further, change the limit to 10E-5 in order to get rid-off unrealistic
     
    597600       ibit = MERGE( 1, 0, .NOT. downward )
    598601
     602       !$OMP PARALLEL DO PRIVATE(i, j, k, w_lfc)
    599603       !$ACC PARALLEL LOOP PRIVATE(i, j, k, w_lfc) &
    600604       !$ACC PRESENT(surf, u, v)
     
    902906!
    903907!--    Calculate the Obukhov length using Newton iteration
     908       !$OMP PARALLEL DO PRIVATE(i, j, z_mo) &
     909       !$OMP PRIVATE(ol_old, ol_m, ol_l, ol_u, f, f_d_ol)
    904910       !$ACC PARALLEL LOOP PRIVATE(i, j, z_mo) &
    905911       !$ACC PRIVATE(ol_old, ol_m, ol_l, ol_u, f, f_d_ol) &
  • palm/trunk/SOURCE/timestep.f90

    r4233 r4237  
    2525! -----------------
    2626! $Id$
     27! Added missing OpenMP directives
     28!
     29! 4233 2019-09-20 09:55:54Z knoop
    2730! OpenACC data update host removed
    2831!
     
    196199          !$ACC REDUCTION(MIN: dt_u_l, dt_v_l, dt_w_l) &
    197200          !$ACC PRESENT(u, v, w, dzu)
     201          !$OMP PARALLEL DO PRIVATE(i,j,k) &
     202          !$OMP REDUCTION(MIN: dt_u_l, dt_v_l, dt_w_l)
    198203          DO  i = nxl, nxr
    199204             DO  j = nys, nyn
     
    222227          !$ACC REDUCTION(MIN: dt_u_l) &
    223228          !$ACC PRESENT(u, v, w, dzu)
     229          !$OMP PARALLEL DO PRIVATE(i,j,k) &
     230          !$OMP REDUCTION(MIN: dt_u_l)
    224231          DO  i = nxl, nxr
    225232             DO  j = nys, nyn
Note: See TracChangeset for help on using the changeset viewer.