Changeset 2118 for palm/trunk/SOURCE/diffusivities.f90

Timestamp:

Jan 17, 2017 4:38:49 PM (7 years ago)

Author:

raasch

Message:

all OpenACC directives and related parts removed from the code

File:

• palm/trunk/SOURCE/diffusivities.f90 (modified) (7 diffs)

palm/trunk/SOURCE/diffusivities.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! OpenACC directives removed
 ! 
 ! Former revisions:
@@ -130 +130 @@
 
 !
-!-- Data declerations for accelerators
-    !$acc data present( dd2zu, e, km, kh, l_grid, l_wall, nzb_s_inner, var )
-    !$acc kernels
-
-!
 !-- Introduce an optional minimum tke
     IF ( e_min > 0.0_wp )  THEN
        !$OMP DO
-       !$acc loop
        DO  i = nxlg, nxrg
           DO  j = nysg, nyng
-             !$acc loop vector( 32 )
              DO  k = 1, nzt
                 IF ( k > nzb_s_inner(j,i) )  THEN
@@ -152 +145 @@
 
     !$OMP DO
-    !$acc loop
     DO  i = nxlg, nxrg
        DO  j = nysg, nyng
-          !$acc loop vector( 32 )
           DO  k = 1, nzt
 
@@ -191 +182 @@
                 kh(k,j,i) = ( 1.0_wp + 2.0_wp * l / ll ) * km(k,j,i)
 
-#if ! defined( __openacc )
-!
-!++             Statistics still have to be realized for accelerators
+!
 !--             Summation for averaged profile (cf. flow_statistics)
                 DO  sr = 0, statistic_regions
                    sums_l_l(k,sr,tn) = sums_l_l(k,sr,tn) + l * rmask(j,i,sr)
                 ENDDO
-#endif
+
              ENDIF
 
@@ -205 +194 @@
     ENDDO
 
-#if ! defined( __openacc )
-!
-!++ Statistics still have to be realized for accelerators
     sums_l_l(nzt+1,:,tn) = sums_l_l(nzt,:,tn)   ! quasi boundary-condition for
-                                                  ! data output
-#endif
-    !$OMP END PARALLEL
+                                                ! data output
+!$OMP END PARALLEL
 
 !
@@ -219 +204 @@
 !-- values of the diffusivities are not needed
     !$OMP PARALLEL DO
-    !$acc loop
     DO  i = nxlg, nxrg
        DO  j = nysg, nyng
@@ -249 +233 @@
     ENDIF
 
-    !$acc end kernels
-    !$acc end data
-
  END SUBROUTINE diffusivities