Changeset 2118 for palm/trunk/SOURCE/poisfft_mod.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/poisfft_mod.f90 (modified) (8 diffs)

palm/trunk/SOURCE/poisfft_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! OpenACC directives and related code removed
 ! 
 ! Former revisions:
@@ -242 +242 @@
        REAL(wp), DIMENSION(1:nz,nys:nyn,nxl:nxr) ::  ar      !<
        REAL(wp), DIMENSION(nys:nyn,nxl:nxr,1:nz) ::  ar_inv  !<
-       !$acc declare create( ar_inv )
 
        REAL(wp), DIMENSION(:,:,:),   ALLOCATABLE ::  ar1      !<
@@ -257 +256 @@
 !
 !--    Two-dimensional Fourier Transformation in x- and y-direction.
-       IF ( pdims(2) == 1  .AND.  pdims(1) > 1  .AND.  num_acc_per_node == 0 ) &
-       THEN
+       IF ( pdims(2) == 1  .AND.  pdims(1) > 1 )  THEN
 
 !
@@ -273 +271 @@
           CALL tr_xy_ffty( ar, ar )
 
-       ELSEIF ( pdims(1) == 1 .AND. pdims(2) > 1 .AND. num_acc_per_node == 0 ) &
-       THEN
+       ELSEIF ( pdims(1) == 1 .AND. pdims(2) > 1 )  THEN
 
 !
@@ -300 +297 @@
 
           CALL cpu_log( log_point_s(4), 'fft_x', 'start' )
-          IF ( fft_method /= 'system-specific' )  THEN
-             !$acc update host( ar )
-          ENDIF
           CALL fft_x( ar, 'forward' )
-          IF ( fft_method /= 'system-specific' )  THEN
-             !$acc update device( ar )
-          ENDIF
           CALL cpu_log( log_point_s(4), 'fft_x', 'pause' )
 
@@ -317 +308 @@
 
           CALL cpu_log( log_point_s(7), 'fft_y', 'start' )
-          IF ( fft_method /= 'system-specific' )  THEN
-             !$acc update host( ar )
-          ENDIF
           CALL fft_y( ar, 'forward', ar_tr = ar,                &
                       nxl_y_bound = nxl_y, nxr_y_bound = nxr_y, &
                       nxl_y_l = nxl_y, nxr_y_l = nxr_y )
-          IF ( fft_method /= 'system-specific' )  THEN
-             !$acc update device( ar )
-          ENDIF
           CALL cpu_log( log_point_s(7), 'fft_y', 'pause' )
 
@@ -350 +335 @@
 
           CALL cpu_log( log_point_s(7), 'fft_y', 'continue' )
-          IF ( fft_method /= 'system-specific' )  THEN
-             !$acc update host( ar )
-          ENDIF
           CALL fft_y( ar, 'backward', ar_tr = ar,               &
                       nxl_y_bound = nxl_y, nxr_y_bound = nxr_y, &
                       nxl_y_l = nxl_y, nxr_y_l = nxr_y )
-          IF ( fft_method /= 'system-specific' )  THEN
-             !$acc update device( ar )
-          ENDIF
           CALL cpu_log( log_point_s(7), 'fft_y', 'stop' )
 
@@ -369 +348 @@
 
           CALL cpu_log( log_point_s(4), 'fft_x', 'continue' )
-          IF ( fft_method /= 'system-specific' )  THEN
-             !$acc update host( ar )
-          ENDIF
           CALL fft_x( ar, 'backward' )
-          IF ( fft_method /= 'system-specific' )  THEN
-             !$acc update device( ar )
-          ENDIF
           CALL cpu_log( log_point_s(4), 'fft_x', 'stop' )