Changeset 128 for palm/trunk/SOURCE

Timestamp:

Oct 26, 2007 1:11:14 PM (17 years ago)

Author:

raasch

Message:

bugfix in poisfft

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (1 diff)
• poisfft.f90 (modified) (3 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -35 +35 @@
 Bugfix: model_string needed a default value (combine_plot_fields)
 
+Bugfix: wavenumber calculation for even nx in routines maketri (poisfft)
 
-advec_particles, check_parameters, combine_plot_fields, init_ocean, production_e
+advec_particles, check_parameters, combine_plot_fields, init_ocean, poisfft, production_e

palm/trunk/SOURCE/poisfft.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Bugfix: wavenumber calculation for even nx in routines maketri
 !
 ! Former revisions:
@@ -343 +343 @@
 #if defined( __parallel )
           DO  i = nxl_z, nxr_z
-             IF ( i >= 0 .AND. i < nnxh )  THEN
+             IF ( i >= 0 .AND. i <= nnxh )  THEN
                 ll(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * i ) / &
-                                          FLOAT( nx+1 ) ) ) / ( dx * dx ) + &
-                        2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / &
-                                          FLOAT( ny+1 ) ) ) / ( dy * dy )
-             ELSEIF ( i == nnxh )  THEN
-                ll(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * ( nx+1-i ) ) / &
                                           FLOAT( nx+1 ) ) ) / ( dx * dx ) + &
                         2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / &
@@ -1413 +1408 @@
 !--       before it is Fourier-transformed
           DO  i = 0, nx
-             IF ( i >= 0 .AND. i < nnxh ) THEN
+             IF ( i >= 0 .AND. i <= nnxh ) THEN
                 l(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * i ) / &
-                                         FLOAT( nx+1 ) ) ) * ddx2 + &
-                       2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / &
-                                         FLOAT( ny+1 ) ) ) * ddy2
-             ELSEIF ( i == nnxh ) THEN
-                l(i) = 2.0 * ( 1.0 - COS( ( 2.0 * pi * ( nx+1-i ) ) / &
                                          FLOAT( nx+1 ) ) ) * ddx2 + &
                        2.0 * ( 1.0 - COS( ( 2.0 * pi * j ) / &