Changeset 4287 for palm/trunk

Timestamp:

Nov 1, 2019 2:50:20 PM (5 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; this revision also removes a previous bug which appeared when the namelist has been commented out in the namelist file

File:

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

palm/trunk/SOURCE/user_module.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; this revision also removes a previous bug
+! which appeared when the namelist has been commented out in the namelist file
+! 
+! 4182 2019-08-22 15:20:23Z scharf
 ! Corrected "Former revisions" section
 ! 
@@ -211 +216 @@
  SUBROUTINE user_parin
 
-
-    CHARACTER (LEN=80) ::  line   !< 
-
-    INTEGER(iwp) ::  i                 !< 
+    CHARACTER (LEN=80) ::  line        !< string containing the last line read from namelist file
+
+    INTEGER(iwp) ::  i                 !<
+    INTEGER(iwp) ::  io_status         !< status after reading the namelist file
     INTEGER(iwp) ::  j                 !< 
 
 
-    NAMELIST /user_parameters/  &
-       user_module_enabled, &
-       data_output_pr_user, &
-       data_output_user, &
-       region, &
-       data_output_masks_user
+    NAMELIST /user_parameters/                                                                     &
+       data_output_masks_user,                                                                     &
+       data_output_pr_user,                                                                        &
+       data_output_user,                                                                           &
+       region
 
 !
@@ -240 +244 @@
 !
 !-- Position the namelist-file at the beginning (it was already opened in
-!-- parin), search for user-defined namelist-group ("userpar", but any other
-!-- name can be choosed) and position the file at this line.
+!-- parin), and try to read (find) a namelist named "user_parameters".
     REWIND ( 11 )
-
-    line = ' '
-    DO WHILE ( INDEX( line, '&user_parameters' ) == 0 )
-       READ ( 11, '(A)', END=12 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!-- Set default module switch to true
-    user_module_enabled = .TRUE.
-
-!-- Read user-defined namelist
-    READ ( 11, user_parameters, ERR = 10 )
-
-    GOTO 12
-
-10  BACKSPACE( 11 )
-    READ( 11 , '(A)') line
-    CALL parin_fail_message( 'user_parameters', line )
-
-12  CONTINUE
+    READ( 11, user_parameters, IOSTAT=io_status )
+
+!
+!-- Actions depending on the READ status
+    IF ( io_status == 0 )  THEN
+!
+!--    User namelist found and correctly read. Set default module switch to true. This activates
+!--    calls of the user-interface subroutines.
+       user_module_enabled = .TRUE.
+
+    ELSEIF ( io_status > 0 )  THEN
+!
+!--    User namelist was found, but contained errors. Print an error message containing the line
+!--    that caused the problem
+       BACKSPACE( 11 )
+       READ( 11 , '(A)') line
+       CALL parin_fail_message( 'user_parameters', line )
+
+    ENDIF
 
 !