Changeset 1747 for palm/trunk/SOURCE/swap_timelevel.f90

Timestamp:

Feb 8, 2016 12:25:53 PM (8 years ago)

Author:

raasch

Message:

openacc adjustments and bugfixes

File:

• palm/trunk/SOURCE/swap_timelevel.f90 (modified) (3 diffs)

palm/trunk/SOURCE/swap_timelevel.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! explicit loops in nopointer case to omit craypointer option of pgi compiler
 ! 
 ! Former revisions:
@@ -94 +94 @@
                neutral, ocean, passive_scalar, precipitation, timestep_count
 
+    USE indices,                                                               &
+        ONLY:  nxlg, nxrg, nyng, nysg, nzb, nzt
     IMPLICIT NONE
+
+    INTEGER ::  i, j, k   !: loop indices
 
 !
@@ -106 +110 @@
 
     !$acc kernels present( pt, pt_p, u, u_p, v, v_p, w, w_p )
-    u  = u_p
-    v  = v_p
-    w  = w_p
-    pt = pt_p
+    !$acc loop independent
+    DO  i = nxlg, nxrg
+       !$acc loop independent
+       DO  j = nysg, nyng
+          !$acc loop independent
+          DO  k = nzb, nzt+1
+             u(k,j,i)  = u_p(k,j,i)
+             v(k,j,i)  = v_p(k,j,i)
+             w(k,j,i)  = w_p(k,j,i)
+             pt(k,j,i) = pt_p(k,j,i)
+          ENDDO
+       ENDDO
+    ENDDO
+!    u  = u_p
+!    v  = v_p
+!    w  = w_p
+!    pt = pt_p
     !$acc end kernels
     IF ( .NOT. constant_diffusion )  THEN
        !$acc kernels present( e, e_p )
-       e = e_p
+       !$acc loop independent
+       DO  i = nxlg, nxrg
+          !$acc loop independent
+          DO  j = nysg, nyng
+             !$acc loop independent
+             DO  k = nzb, nzt+1
+                e(k,j,i) = e_p(k,j,i)
+             ENDDO
+          ENDDO
+       ENDDO
+!       e = e_p
        !$acc end kernels
     ENDIF