Changeset 4842 for palm/trunk/SOURCE/dynamics_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/dynamics_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/dynamics_mod.f90

@@ -24 +24 @@
 ! -----------------
 ! $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
 ! Enable 3D data output also with 64-bit precision
 !
@@ -336 +340 @@
 
 
-    CHARACTER (LEN=80)  ::  line  !< dummy string that contains the current line of the parameter file
-
-    NAMELIST /dynamics_parameters/                                                                 &
-       dynamics_module_enabled
-
-
-    line = ' '
-!
-!-- Try to find module-specific namelist
-    REWIND ( 11 )
-    line = ' '
-    DO   WHILE ( INDEX( line, '&dynamics_parameters' ) == 0 )
-       READ ( 11, '(A)', END=12 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!-- Set default module switch to true
+    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 /dynamics_parameters/  dynamics_module_enabled
+
+!
+!-- Set default module switch to true.
     dynamics_module_enabled = .TRUE.
 
-!-- Read user-defined namelist
-    READ ( 11, dynamics_parameters, ERR = 10 )
-
-    GOTO 12
-
-10  BACKSPACE( 11 )
-    READ( 11 , '(A)') line
-    CALL parin_fail_message( 'dynamics_parameters', line )
-
-12  CONTINUE
+!-- Move to the beginning of the namelist file and try to find and read the namelist.
+    REWIND( 11 )
+    READ( 11, dynamics_parameters, IOSTAT=io_status )
+
+!
+!-- Action depending on the READ status
+    IF ( io_status > 0 )  THEN
+!
+!--    dynamics_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( 'dynamics_parameters', line )
+
+    ENDIF
 
  END SUBROUTINE dynamics_parin