Changeset 4370 for palm/trunk/SOURCE/transpose.f90

Timestamp:

Jan 10, 2020 2:00:44 PM (4 years ago)

Author:

raasch

Message:

bugfixes for previous commit: unused variables removed, Temperton-fft usage on GPU, openacc porting of vector version of Obukhov length calculation, collective read switched off on NEC to avoid hanging; some vector directives added in prognostic equations to force vectorization on Intel19 compiler, configuration files for NEC Aurora added

File:

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

palm/trunk/SOURCE/transpose.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! vector array renamed
+! 
+! 4366 2020-01-09 08:12:43Z raasch
 ! modifications for NEC vectorization
 ! 
@@ -270 +273 @@
 
     USE fft_xy,                                                                &
-        ONLY:  f_vec, temperton_fft_vec
+        ONLY:  f_vec_x, temperton_fft_vec
 
     USE indices,                                                               &
@@ -307 +310 @@
 !
 !--    Reorder input array for transposition. Data from the vectorized Temperton-fft is stored in
-!--    different array format (f_vec).
+!--    different array format (f_vec_x).
        IF ( temperton_fft_vec )  THEN
 
@@ -316 +319 @@
                    DO  j = nys_x, nyn_x
                       mm = j-nys_x+1+(k-nzb_x)*(nyn_x-nys_x+1)
-                      work(j,i-xs+1,k,l) = f_vec(mm,i)
+                      work(j,i-xs+1,k,l) = f_vec_x(mm,i)
                    ENDDO
                 ENDDO
@@ -862 +865 @@
 
     USE fft_xy,                                                                &
-        ONLY:  f_vec, temperton_fft_vec
+        ONLY:  f_vec_x, temperton_fft_vec
 
     USE indices,                                                               &
@@ -944 +947 @@
 !
 !--    Reorder transposed array.
-!--    Data for the vectorized Temperton-fft is stored in different array format (f_vec) which saves
-!--    additional data copy in fft_x.
+!--    Data for the vectorized Temperton-fft is stored in different array format (f_vec_x) which
+!--    saves additional data copy in fft_x.
        IF ( temperton_fft_vec )  THEN
 
@@ -954 +957 @@
                    DO  j = nys_x, nyn_x
                       mm = j-nys_x+1+(k-nzb_x)*(nyn_x-nys_x+1)
-                      f_vec(mm,i) = work(j,i-xs+1,k,l)
+                      f_vec_x(mm,i) = work(j,i-xs+1,k,l)
                    ENDDO
                 ENDDO