Changeset 2300 for palm/trunk/SOURCE/fft_xy_mod.f90

Timestamp:

Jun 29, 2017 1:31:14 PM (8 years ago)

Author:

raasch

Message:

NEC related code partly removed, host variable partly removed, host specific code completely removed, default values for host, loop_optimization and termination time_needed changed

File:

• palm/trunk/SOURCE/fft_xy_mod.f90 (modified) (9 diffs)

palm/trunk/SOURCE/fft_xy_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! NEC related code partly removed, host replaced by loop_optimization
+! 
+! 2274 2017-06-09 13:27:48Z Giersch
 ! Changed error messages
 ! 
@@ -1538 +1541 @@
        INTEGER(iwp) ::  k     !<
        INTEGER(iwp) ::  siza  !<
+       INTEGER(iwp) ::  sizw  !< required on NEC only
 
        REAL(wp), DIMENSION(0:nx,nz)       ::  ar     !<
@@ -1543 +1547 @@
        REAL(wp), DIMENSION(6*(nx+4),nz+1) ::  work1  !<
        
-#if defined( __nec )
-       INTEGER(iwp) ::  sizw  !<
-       
-       COMPLEX(wp), DIMENSION((nx+4)/2+1,nz+1) ::  work  !<
-#endif
+       COMPLEX(wp), DIMENSION(:,:), ALLOCATABLE ::  work  !< required on NEC only
 
        IF ( fft_method == 'temperton-algorithm' )  THEN
@@ -1591 +1591 @@
 
 #if defined( __nec )
+          ALLOCATE( work((nx+4)/2+1,nz+1) )
           siza = SIZE( ai, 1 )
           sizw = SIZE( work, 1 )
@@ -1645 +1646 @@
           ENDIF
 
+          DEALLOCATE( work )
 #else
           message_string = 'no system-specific fft-call available'
@@ -1680 +1682 @@
        INTEGER(iwp) ::  ny1   !<
        INTEGER(iwp) ::  siza  !<
+       INTEGER(iwp) ::  sizw  !< required on NEC only
 
        REAL(wp), DIMENSION(0:ny1,nz)      ::  ar     !<
@@ -1685 +1688 @@
        REAL(wp), DIMENSION(6*(ny+4),nz+1) ::  work1  !<
        
-#if defined( __nec )
-       INTEGER(iwp) ::  sizw  !<
-       
-       COMPLEX(wp), DIMENSION((ny+4)/2+1,nz+1) ::  work !<
-#endif
+       COMPLEX(wp), DIMENSION(:,:), ALLOCATABLE ::  work !< required on NEC only
+
 
        IF ( fft_method == 'temperton-algorithm' )  THEN
@@ -1733 +1733 @@
 
 #if defined( __nec )
+          ALLOCATE( work((ny+4)/2+1,nz+1) )
           siza = SIZE( ai, 1 )
           sizw = SIZE( work, 1 )
@@ -1787 +1788 @@
           ENDIF
 
+          DEALLOCATE( work )
 #else
           message_string = 'no system-specific fft-call available'