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

Timestamp:

Jan 14, 2021 10:42:28 AM (4 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/surface_data_output_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/surface_data_output_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
+!
+! 4828 2021-01-05 11:21:41Z Giersch
 ! Bugfix: correct the down-ward surf_lsm index in the routine surface_data_output_collect_2d
 !
@@ -4205 +4209 @@
     IMPLICIT NONE
 
-    CHARACTER (LEN=80) ::  line  !< dummy string that contains the current line of the parameter file
-
-
-    NAMELIST /surface_data_output_parameters/ averaging_interval_surf, data_output_surf,           &
-                                              dt_dosurf, dt_dosurf_av, skip_time_dosurf,           &
-                                              skip_time_dosurf_av, to_netcdf, to_vtk
-
-    line = ' '
-
-!
-!-- Try to find the namelist
-    REWIND ( 11 )
-    line = ' '
-    DO WHILE ( INDEX( line, '&surface_data_output_parameters' ) == 0 )
-       READ ( 11, '(A)', END=14 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read namelist
-    READ ( 11, surface_data_output_parameters, ERR = 10 )
-!
-!-- Set flag that indicates that surface data output is switched on
-    surface_output = .TRUE.
-    GOTO 14
-
- 10 BACKSPACE( 11 )
-    READ( 11 , '(A)') line
-    CALL parin_fail_message( 'surface_data_output_parameters', line )
-
- 14 CONTINUE
-
+    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 /surface_data_output_parameters/  averaging_interval_surf,                            &
+                                               data_output_surf,                                   &
+                                               dt_dosurf,                                          &
+                                               dt_dosurf_av,                                       &
+                                               skip_time_dosurf,                                   &
+                                               skip_time_dosurf_av,                                &
+                                               to_netcdf,                                          &
+                                               to_vtk
+
+!
+!-- Move to the beginning of the namelist file and try to find and read the namelist.
+    REWIND( 11 )
+    READ( 11, surface_data_output_parameters, IOSTAT=io_status )
+!
+!-- Action depending on the READ status
+    IF ( io_status == 0 )  THEN
+!
+!--    surface_data_output_parameters namelist was found and read correctly. Set flag that indicates
+!--    that surface data output is switched on.
+       surface_output = .TRUE.
+
+    ELSEIF ( io_status > 0 )  THEN
+!
+!--    surface_data_output_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( 'surface_data_output_parameters', line )
+
+    ENDIF
 
  END SUBROUTINE surface_data_output_parin