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

Timestamp:

Jan 14, 2021 10:42:28 AM (3 years ago)

Author:

raasch

Message:

reading of namelist file and actions in case of namelist errors revised so that statement labels and goto statements are not required any more, deprecated namelists removed

File:

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

palm/trunk/SOURCE/spectra_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! reading of namelist file and actions in case of namelist errors revised so that statement labels
+! and goto statements are not required any more,
+! deprecated namelist removed
+!
+! 4828 2021-01-05 11:21:41Z Giersch
 ! support for MPI Fortran77 interface (mpif.h) removed
 !
@@ -146 +151 @@
 
     USE control_parameters,                                                                        &
-        ONLY:  dt_data_output,                                                                     &
-               message_string
+        ONLY:  dt_data_output
 
     IMPLICIT NONE
 
-    CHARACTER (LEN=80) ::  line  !< dummy string that contains the current line of the parameter file
-
-    NAMELIST /spectra_par/  averaging_interval_sp,                                                 &
-                            comp_spectra_level,                                                    &
-                            data_output_sp,                                                        &
-                            dt_dosp,                                                               &
-                            skip_time_dosp,                                                        &
-                            spectra_direction
+    CHARACTER(LEN=100) ::  line  !< dummy string that contains the current line of the parameter file
+
+    INTEGER(iwp) ::  io_status   !< status after reading the namelist file
+
 
     NAMELIST /spectra_parameters/                                                                  &
@@ -168 +168 @@
                             spectra_direction
 !
-!-- Position the namelist-file at the beginning (it was already opened in parin), search for the
-!-- namelist-group of the package and position the file at this line.
-    line = ' '
-
-!
-!-- Try to find the spectra package
-    REWIND ( 11 )
-    line = ' '
-    DO WHILE ( INDEX( line, '&spectra_parameters' ) == 0 )
-       READ ( 11, '(A)', END=12 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read namelist
-    READ ( 11, spectra_parameters, ERR = 10 )
-
-!
-!-- 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.
-
-    GOTO 14
-
- 10 BACKSPACE( 11 )
-    READ( 11 , '(A)') line
-    CALL parin_fail_message( 'spectra_parameters', line )
-!
-!-- Try to find the old namelist
- 12 REWIND ( 11 )
-    line = ' '
-    DO WHILE ( INDEX( line, '&spectra_par' ) == 0 )
-       READ ( 11, '(A)', END=14 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read namelist
-    READ ( 11, spectra_par, ERR = 13, END = 14 )
-
-
-    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.
-
-    GOTO 14
-
- 13 BACKSPACE( 11 )
-    READ( 11 , '(A)') line
-    CALL parin_fail_message( 'spectra_par', line )
-
-
- 14 CONTINUE
+!-- Position the namelist-file at the beginning (it was already opened in parin), and try to read
+!-- the namelist.
+    REWIND( 11 )
+    READ( 11, spectra_parameters, IOSTAT=io_status )
+
+!
+!-- Action depending on the READ status
+    IF ( io_status == 0 )  THEN
+!
+!--    spectra_parameters namelist was found and read correctly.
+!--    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.
+
+    ELSEIF ( io_status > 0 )  THEN
+!
+!--    spectra_parameters namelist was found but contained errors. Print an error message including
+!--    the line that caused the problem.
+       BACKSPACE( 11 )
+       READ( 11 , '(A)' ) line
+       CALL parin_fail_message( 'spectra_parameters', line )
+
+    ENDIF
 
  END SUBROUTINE spectra_parin