Changeset 2932 for palm/trunk/SOURCE/spectra_mod.f90

Timestamp:

Mar 26, 2018 9:39:22 AM (6 years ago)

Author:

maronga

Message:

renamed all Fortran NAMELISTS

File:

• palm/trunk/SOURCE/spectra_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/spectra_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! renamed spectra_par to spectra_parameters
+! 
+! 2841 2018-02-27 15:02:57Z knoop
 ! Bugfix: wrong placement of include 'mpif.h' corrected
 ! 
@@ -195 +198 @@
 
        USE control_parameters,                                                 &
-           ONLY:  dt_data_output
+           ONLY:  dt_data_output, message_string
 
        IMPLICIT NONE
@@ -206 +209 @@
                                spectra_direction
 
-
+       NAMELIST /spectra_parameters/                                           &
+                               averaging_interval_sp, comp_spectra_level,      &
+                               data_output_sp, dt_dosp, skip_time_dosp,        &
+                               spectra_direction
 !
 !--    Position the namelist-file at the beginning (it was already opened in
@@ -217 +223 @@
        REWIND ( 11 )
        line = ' '
-       DO   WHILE ( INDEX( line, '&spectra_par' ) == 0 )
+       DO   WHILE ( INDEX( line, '&spectra_parameters' ) == 0 )
           READ ( 11, '(A)', END=10 )  line
        ENDDO
@@ -224 +230 @@
 !
 !--    Read namelist
-       READ ( 11, spectra_par )
+       READ ( 11, spectra_parameters )
 
 !
@@ -235 +241 @@
        calculate_spectra = .TRUE.
 
- 10    CONTINUE
+       GOTO 12
+!
+!--    Try to find the old namelist
+ 10    REWIND ( 11 )
+       line = ' '
+       DO   WHILE ( INDEX( line, '&spectra_par' ) == 0 )
+          READ ( 11, '(A)', END=12 )  line
+       ENDDO
+       BACKSPACE ( 11 )
+
+!
+!--    Read namelist
+       READ ( 11, spectra_par )
+
+       
+       message_string = 'namelist spectra_par is deprecated and will be ' // &
+                     'removed in near future. Please &use namelist ' //      &
+                     'spectra_parameters instead'
+       CALL message( 'spectra_parin', 'PA0487', 0, 1, 0, 6, 0 )
+!
+!--    Default setting of dt_dosp here (instead of check_parameters), because
+!--    its current value is needed in init_pegrid
+       IF ( dt_dosp == 9999999.9_wp )  dt_dosp = dt_data_output
+
+!
+!--    Set general switch that spectra shall be calculated
+       calculate_spectra = .TRUE.
+       
+       
+ 12    CONTINUE
 
     END SUBROUTINE spectra_parin