Changeset 4389

Timestamp:

Jan 29, 2020 8:22:42 AM (5 years ago)

Author:

raasch

Message:

Error messages refined for reading ASCII topo file, also reading of topo file revised so that statement labels and goto statements are not required any more

File:

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

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Error messages refined for reading ASCII topo file, also reading of topo file revised so that
+! statement labels and goto statements are not required any more
+! 
+! 4388 2020-01-28 16:36:55Z raasch
 ! bugfix for error messages while reading ASCII topo file
 ! 
@@ -2509 +2513 @@
        INTEGER(iwp) ::  ii            !< running index for IO blocks
        INTEGER(iwp) ::  id_topo       !< NetCDF id of topograhy input file
+       INTEGER(iwp) ::  io_status     !< status after reading the ascii topo file
        INTEGER(iwp) ::  j             !< running index along y-direction
        INTEGER(iwp) ::  num_vars      !< number of variables in netcdf input file
@@ -2685 +2690 @@
 
                 OPEN( 90, FILE='TOPOGRAPHY_DATA'//TRIM( coupling_char ),       &
-                      STATUS='OLD', FORM='FORMATTED', ERR=10 )
+                      STATUS='OLD', FORM='FORMATTED', IOSTAT=io_status )
+
+                IF ( io_status > 0 )  THEN
+                   message_string = 'file TOPOGRAPHY_DATA'//                      &
+                                    TRIM( coupling_char )// ' does not exist'
+                   CALL message( 'netcdf_data_input_mod', 'PA0208', 1, 2, 0, 6, 0 )
+                ENDIF
+
 !
 !--             Read topography PE-wise. Rows are read from nyn to nys, columns
@@ -2699 +2711 @@
                 ALLOCATE ( buildings_f%var_2d(nys:nyn,nxl:nxr) )
                 DO  j = nyn, nys, -1
-                   READ( 90, *, ERR=11, END=11 )                               &
+
+                   READ( 90, *, IOSTAT=io_status )                               &
                                    ( dum, i = 0, nxl-1 ),                      &
                                    ( buildings_f%var_2d(j,i), i = nxl, nxr )
+
+                   IF ( io_status > 0 )  THEN
+                      WRITE( message_string, '(A,1X,I5,1X,A)' ) 'error reading line', ny-j+1,      &
+                                                   'of file TOPOGRAPHY_DATA'//TRIM( coupling_char )
+                      CALL message( 'netcdf_data_input_mod', 'PA0209', 2, 2, myid, 6, 0 )
+                   ELSEIF ( io_status < 0 )  THEN
+                      WRITE( message_string, '(A,1X,I5)' ) 'end of line or file detected for '// &
+                                  'file TOPOGRAPHY_DATA'//TRIM( coupling_char )//' at line', ny-j+1
+                      CALL message( 'netcdf_data_input_mod', 'PA0704', 2, 2, myid, 6, 0 )
+                   ENDIF
+
                 ENDDO
 
-                GOTO 12
-
- 10             message_string = 'file TOPOGRAPHY_DATA'//                      &
-                                 TRIM( coupling_char )// ' does not exist'
-                CALL message( 'netcdf_data_input_mod', 'PA0208', 1, 2, myid, 6, 0 )
-
- 11             message_string = 'errors in file TOPOGRAPHY_DATA'//            &
-                                 TRIM( coupling_char )
-                CALL message( 'netcdf_data_input_mod', 'PA0209', 2, 2, myid, 6, 0 )
-
- 12             CLOSE( 90 )
+                CLOSE( 90 )
                 buildings_f%from_file = .TRUE.