Changeset 1511 for palm/trunk

Timestamp:

Dec 16, 2014 3:54:16 PM (9 years ago)

Author:

suehring

Message:

Bugfix concerning spectra normalization

File:

• palm/trunk/SOURCE/calc_spectra.f90 (modified) (5 diffs)

palm/trunk/SOURCE/calc_spectra.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix concerning spectra normalization
 ! 
 ! Former revisions:
@@ -324 +324 @@
     INTEGER(iwp) ::  pr        !:
 
-    REAL(wp) ::  fac          !:
     REAL(wp) ::  exponent     !:
     REAL(wp) ::  sum_spec_dum !: wavenumber-integrated spectrum
@@ -406 +405 @@
 !
 !--    Sum of spectra for later averaging (see routine data_output_spectra)
-!--    Temperton fft results need to be normalized
-       IF ( fft_method == 'temperton-algorithm' )  THEN
-          fac = nx + 1.0_wp
-       ELSE
-          fac = 1.0_wp
-       ENDIF
        DO  i = 1, nx/2
           DO k = 1, n
-             spectrum_x(i,k,m) = spectrum_x(i,k,m) + sums_spectra(i,k) * fac 
+             spectrum_x(i,k,m) = spectrum_x(i,k,m) + sums_spectra(i,k)
           ENDDO
        ENDDO
@@ -467 +460 @@
     INTEGER(iwp) ::  pr        !:
 
-    REAL(wp) ::  fac      !:
     REAL(wp) ::  exponent !:
     REAL(wp) ::  sum_spec_dum !: wavenumber-integrated spectrum
@@ -551 +543 @@
 !
 !--    Sum of spectra for later averaging (see routine data_output_spectra)
-!--    Temperton fft results need to be normalized
-       IF ( fft_method == 'temperton-algorithm' )  THEN
-          fac = ny + 1.0_wp
-       ELSE
-          fac = 1.0_wp
-       ENDIF
        DO  j = 1, ny/2
           DO k = 1, n
-             spectrum_y(j,k,m) = spectrum_y(j,k,m) + sums_spectra(j,k) * fac
+             spectrum_y(j,k,m) = spectrum_y(j,k,m) + sums_spectra(j,k)
           ENDDO
        ENDDO