Changeset 3246 for palm/trunk/SOURCE/user_parin.f90

Timestamp:

Sep 13, 2018 3:14:50 PM (6 years ago)

Author:

sward

Message:

Added error handling for wrong input parameters

File:

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

palm/trunk/SOURCE/user_parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added error handling for input namelist via parin_fail_message
+! 
+! 3240 2018-09-12 12:04:40Z Giersch
 ! The check that controls the number of user-defined profiles on the restart file
 ! with the one given for the current run has been removed.
@@ -140 +143 @@
     line = ' '
     DO   WHILE ( INDEX( line, '&user_parameters' ) == 0 )
-       READ ( 11, '(A)', END=10 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read user-defined namelist
-    READ ( 11, user_parameters )
-
-    user_defined_namelist_found = .TRUE.
-
-    GOTO 12
-    
-    
-10  REWIND ( 11 )
-
-    line = ' ' 
-    DO   WHILE ( INDEX( line, '&userpar' ) == 0 )
        READ ( 11, '(A)', END=12 )  line
     ENDDO
@@ -163 +149 @@
 !
 !-- Read user-defined namelist
-    READ ( 11, userpar )
-    
-    
+    READ ( 11, user_parameters, ERR = 10 )
+
+    user_defined_namelist_found = .TRUE.
+
+    GOTO 14
+
+10  BACKSPACE( 11 )
+    READ( 11 ,fmt='(A)') line
+    CALL parin_fail_message ( 'user_parameters', line )
+
+12  REWIND ( 11 )
+
+    line = ' ' 
+    DO   WHILE ( INDEX( line, '&userpar' ) == 0 )
+       READ ( 11, '(A)', END=14 )  line
+    ENDDO
+    BACKSPACE ( 11 )
+
+!
+!-- Read user-defined namelist
+    READ ( 11, userpar, ERR = 13, END = 14 )
+
     message_string = 'namelist userpar is deprecated and will be ' //          &
                      'removed in near future. &Please use namelist ' //        &
                      'user_parameters instead' 
     CALL message( 'user_parin', 'PA0487', 0, 1, 0, 6, 0 )
-       
+
     user_defined_namelist_found = .TRUE.
-    
-    
- 12 CONTINUE
+
+    GOTO 14
+
+13  BACKSPACE( 11 )
+    READ( 11 ,fmt='(A)') line
+    CALL parin_fail_message ( 'userpar', line )
+
+14 CONTINUE
 
 !