Changeset 4237 for palm

Timestamp:

Sep 25, 2019 11:33:42 AM (5 years ago)

Author:

knoop

Message:

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

Location:

palm/trunk/SOURCE

Files:

• disturb_field.f90 (modified) (4 diffs)
• surface_layer_fluxes_mod.f90 (modified) (3 diffs)
• timestep.f90 (modified) (3 diffs)

palm/trunk/SOURCE/disturb_field.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added missing OpenMP directives
+! 
+! 4182 2019-08-22 15:20:23Z scharf
 ! Corrected "Former revisions" section
 ! 
@@ -166 +169 @@
 !-- compiler option -O3
      !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(i, j, k) PRESENT(dist1, dist2)
+     !$OMP PARALLEL DO PRIVATE(i, j, k)
      DO  i = nxl, nxr
         DO  j = nys, nyn
@@ -187 +191 @@
 
     !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(i, j, k) PRESENT(dist1, dist2)
+    !$OMP PARALLEL DO PRIVATE(i, j, k)
     DO  i = nxl, nxr
        DO  j = nys, nyn
@@ -219 +224 @@
 !-- Random perturbation is added to the array to be disturbed.
     !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) PRESENT(field, dist1)
+    !$OMP PARALLEL DO PRIVATE(i, j, k)
     DO  i = nxlg, nxrg
        DO  j = nysg, nyng

palm/trunk/SOURCE/surface_layer_fluxes_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Added missing OpenMP directives
+! 
+! 4186 2019-08-23 16:06:14Z suehring
 ! - To enable limitation of Obukhov length, move it before exit-cycle construct. 
 !   Further, change the limit to 10E-5 in order to get rid-off unrealistic 
@@ -597 +600 @@
        ibit = MERGE( 1, 0, .NOT. downward )
 
+       !$OMP PARALLEL DO PRIVATE(i, j, k, w_lfc)
        !$ACC PARALLEL LOOP PRIVATE(i, j, k, w_lfc) &
        !$ACC PRESENT(surf, u, v)
@@ -902 +906 @@
 !
 !--    Calculate the Obukhov length using Newton iteration
+       !$OMP PARALLEL DO PRIVATE(i, j, z_mo) &
+       !$OMP PRIVATE(ol_old, ol_m, ol_l, ol_u, f, f_d_ol)
        !$ACC PARALLEL LOOP PRIVATE(i, j, z_mo) &
        !$ACC PRIVATE(ol_old, ol_m, ol_l, ol_u, f, f_d_ol) &

palm/trunk/SOURCE/timestep.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added missing OpenMP directives
+! 
+! 4233 2019-09-20 09:55:54Z knoop
 ! OpenACC data update host removed
 ! 
@@ -196 +199 @@
           !$ACC REDUCTION(MIN: dt_u_l, dt_v_l, dt_w_l) &
           !$ACC PRESENT(u, v, w, dzu)
+          !$OMP PARALLEL DO PRIVATE(i,j,k) &
+          !$OMP REDUCTION(MIN: dt_u_l, dt_v_l, dt_w_l)
           DO  i = nxl, nxr
              DO  j = nys, nyn
@@ -222 +227 @@
           !$ACC REDUCTION(MIN: dt_u_l) &
           !$ACC PRESENT(u, v, w, dzu)
+          !$OMP PARALLEL DO PRIVATE(i,j,k) &
+          !$OMP REDUCTION(MIN: dt_u_l)
           DO  i = nxl, nxr
              DO  j = nys, nyn