Changeset 1166 for palm/trunk

Timestamp:

May 24, 2013 1:55:44 PM (12 years ago)

Author:

raasch

Message:

small adjustment + bugfix for PGI 13.4 / CUDA 5.0

Location:

palm/trunk/SOURCE

Files:

• cuda_fft_interfaces.f90 (modified) (4 diffs)
• fft_xy.f90 (modified) (3 diffs)

palm/trunk/SOURCE/cuda_fft_interfaces.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! C_DOUBLE/COMPLEX reset to dpk,
+! DEVICE attribut added to idata/odata arguments
 !
 ! Former revisions:
@@ -78 +79 @@
           USE ISO_C_BINDING
 
-          INTEGER(C_INT), value ::  plan
+          INTEGER(C_INT), VALUE ::  plan
 
        END SUBROUTINE CUFFTDESTROY
@@ -90 +91 @@
 
           USE ISO_C_BINDING
+          USE precision_kind
 
-          INTEGER(C_INT)            ::  plan
-          COMPLEX(C_DOUBLE_COMPLEX) ::  idata(:,:,:)
-          REAL(C_DOUBLE)            ::  odata(:,:,:)
+          INTEGER(C_INT), VALUE ::  plan
+          COMPLEX(dpk), DEVICE  ::  idata(:,:,:)
+          REAL(dpk), DEVICE     ::  odata(:,:,:)
 
        END SUBROUTINE CUFFTEXECZ2D
@@ -105 +107 @@
 
           USE ISO_C_BINDING
+          USE precision_kind
 
-          INTEGER(C_INT)            ::  plan
-          REAL(C_DOUBLE)            ::  idata(:,:,:)
-          COMPLEX(C_DOUBLE_COMPLEX) ::  odata(:,:,:)
+          INTEGER(C_INT), VALUE ::  plan
+          REAL(dpk), DEVICE     ::  idata(:,:,:)
+          COMPLEX(dpk), DEVICE  ::  odata(:,:,:)
 
        END SUBROUTINE CUFFTEXECD2Z

palm/trunk/SOURCE/fft_xy.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-!
+! C_DOUBLE/COMPLEX reset to dpk
 !
 ! Former revisions:
@@ -288 +288 @@
 #elif defined( __cuda_fft )
        !$acc declare create( ar_tmp )
-       COMPLEX(C_DOUBLE_COMPLEX), DIMENSION(0:(nx+1)/2,nys_x:nyn_x,nzb_x:nzt_x) ::  ar_tmp
+       COMPLEX(dpk), DIMENSION(0:(nx+1)/2,nys_x:nyn_x,nzb_x:nzt_x) ::  ar_tmp
 #endif
        REAL, DIMENSION(0:nx,nys_x:nyn_x,nzb_x:nzt_x) ::  ar
@@ -799 +799 @@
 #elif defined( __cuda_fft )
        !$acc declare create( ar_tmp )
-       COMPLEX(C_DOUBLE_COMPLEX), DIMENSION(0:(ny+1)/2,nxl_y:nxr_y,nzb_y:nzt_y) ::  ar_tmp
+       COMPLEX(dpk), DIMENSION(0:(ny+1)/2,nxl_y:nxr_y,nzb_y:nzt_y) ::  ar_tmp
 #endif
        REAL, DIMENSION(0:ny,nxl_y:nxr_y,nzb_y:nzt_y) ::  ar