Changeset 2310 for palm/trunk/SOURCE

Timestamp:

Jul 11, 2017 9:37:02 AM (7 years ago)

Author:

gronemeier

Message:

bugfix: re-arranged call for error messages for ENVPAR file

File:

• palm/trunk/SOURCE/parin.f90 (modified) (4 diffs)

palm/trunk/SOURCE/parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: re-arranged call for error messages for ENVPAR file
+! 
+! 2304 2017-07-04 14:35:55Z suehring
 ! Bugfix, enable restarts for child domain.
 ! 
@@ -348 +351 @@
     IMPLICIT NONE
 
-    INTEGER(iwp) ::  i   !<
+    INTEGER(iwp) ::  i      !<
+    INTEGER(iwp) ::  ioerr  !< error flag for open/read/write
 
 
@@ -446 +450 @@
 !-- generated by mrun)
     CALL location_message( 'reading environment parameters from ENVPAR', .FALSE. )
-    OPEN ( 90, FILE='ENVPAR', STATUS='OLD', FORM='FORMATTED', ERR=30 )
-    READ ( 90, envpar, ERR=31, END=32 )
-    CLOSE ( 90 )
+
+    OPEN ( 90, FILE='ENVPAR', STATUS='OLD', FORM='FORMATTED', IOSTAT=ioerr )
+
+    IF ( ioerr /= 0 )  THEN
+       message_string = 'local file ENVPAR not found' //                       &
+                        '&some variables for steering may not be properly set'
+       CALL message( 'parin', 'PA0276', 0, 1, 0, 6, 0 )
+    ELSE
+       READ ( 90, envpar, IOSTAT=ioerr )
+       IF ( ioerr < 0 )  THEN
+          message_string = 'no envpar-NAMELIST found in local file '  //       &
+                           'ENVPAR&some variables for steering may '  //       &
+                           'not be properly set'
+          CALL message( 'parin', 'PA0278', 0, 1, 0, 6, 0 )
+       ELSEIF ( ioerr > 0 )  THEN
+          message_string = 'errors in local file ENVPAR' //                    &
+                           '&some variables for steering may not be properly set'
+          CALL message( 'parin', 'PA0277', 0, 1, 0, 6, 0 )
+       ENDIF
+       CLOSE ( 90 )
+    ENDIF
+
     CALL location_message( 'finished', .TRUE. )
 
@@ -686 +709 @@
     CALL location_message( 'finished', .TRUE. )
 
-    RETURN
-
- 30 message_string = 'local file ENVPAR not found' //                          &
-                     '&some variables for steering may not be properly set'
-    CALL message( 'parin', 'PA0276', 0, 1, 0, 6, 0 )
-    RETURN
-
- 31 message_string = 'errors in local file ENVPAR' //                          &
-                     '&some variables for steering may not be properly set'
-    CALL message( 'parin', 'PA0277', 0, 1, 0, 6, 0 )
-    RETURN
-
- 32 message_string = 'no envpar-NAMELIST found in local file ENVPAR'  //       &
-                     '&some variables for steering may not be properly set'
-    CALL message( 'parin', 'PA0278', 0, 1, 0, 6, 0 )
-
  END SUBROUTINE parin