Changeset 3849 for palm/trunk/SOURCE/disturb_field.f90

Timestamp:

Apr 1, 2019 4:35:16 PM (5 years ago)

Author:

knoop

Message:

Bugfix: added proper OpenACC support to disturb_field

File:

• palm/trunk/SOURCE/disturb_field.f90 (modified) (6 diffs)

palm/trunk/SOURCE/disturb_field.f90

@@ -134 +134 @@
 !-- to store the disturbance
     ALLOCATE( dist2(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
+!$ACC DATA CREATE(dist2(nzb:nzt+1,nysg:nyng,nxlg:nxrg))
+
+!
+!-- dist1 is initialized on the host (see below) and then updated on the device.
     dist1 = 0.0_wp
+    !$ACC KERNELS PRESENT(dist2)
     dist2 = 0.0_wp
+    !$ACC END KERNELS
 
 !
@@ -188 +194 @@
 
 !
+!-- Update dist1 on the device, this is expected by exchange_horiz!
+    !$ACC UPDATE DEVICE(dist1(nzb:nzt+1,nysg:nyng,nxlg:nxrg))
+
+!
 !-- Exchange of ghost points for the random perturbation
 
@@ -197 +207 @@
 !-- Loop has been splitted to make runs reproducible on HLRN systems using
 !-- compiler option -O3
+     !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(i, j, k) PRESENT(dist1, dist2)
      DO  i = nxl, nxr
         DO  j = nys, nyn
@@ -217 +228 @@
     CALL exchange_horiz( dist2, nbgp )
 
+    !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(i, j, k) PRESENT(dist1, dist2)
     DO  i = nxl, nxr
        DO  j = nys, nyn
@@ -248 +260 @@
 !
 !-- Random perturbation is added to the array to be disturbed.
+    !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) PRESENT(field, dist1)
     DO  i = nxlg, nxrg
        DO  j = nysg, nyng
@@ -256 +269 @@
     ENDDO
 
+!$ACC END DATA
+
 !
 !-- Deallocate the temporary array