Changeset 3246 for palm/trunk/SOURCE/wind_turbine_model_mod.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/wind_turbine_model_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/wind_turbine_model_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Added error handling for input namelist via parin_fail_message
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -535 +538 @@
        line = ' '
        DO  WHILE ( INDEX( line, '&wind_turbine_parameters' ) == 0 )
-          READ ( 11, '(A)', END=10 )  line
-       ENDDO
-       BACKSPACE ( 11 )
-
-!
-!--    Read user-defined namelist
-       READ ( 11, wind_turbine_parameters, IOSTAT=ierrn )
-
-       IF ( ierrn < 0 )  THEN
-          message_string = 'no wind_turbine_parameters-NAMELIST found: '  //    &
-                           'End of file has reached'
-          CALL message( 'wtm_parin', 'PA0460', 1, 2, 0, 6, 0 )
-       ELSEIF ( ierrn > 0 ) THEN
-          message_string = 'errors in wind_turbine_parameters-NAMELIST: '  //   &
-                           'some variables for steering may not be properly set'
-          CALL message( 'wtm_parin', 'PA0466', 1, 2, 0, 6, 0 )               
-       ENDIF
-       
-!
-!--    Set flag that indicates that the wind turbine model is switched on
-       wind_turbine = .TRUE.
-       
-       GOTO 12
-
-!
-!--    Try to find wind turbine model package
- 10    REWIND ( 11 )
-       line = ' '
-       DO  WHILE ( INDEX( line, '&wind_turbine_par' ) == 0 )
           READ ( 11, '(A)', END=12 )  line
        ENDDO
@@ -570 +544 @@
 !
 !--    Read user-defined namelist
-       READ ( 11, wind_turbine_par, IOSTAT=ierrn )
-
-       IF ( ierrn < 0 )  THEN
-          message_string = 'no wind_turbine_par-NAMELIST found: '  //          &
-                           'End of file has reached'
-          CALL message( 'wtm_parin', 'PA0460', 1, 2, 0, 6, 0 )
-       ELSEIF ( ierrn > 0 ) THEN
-          message_string = 'errors in wind_turbine_par-NAMELIST: '  //         &
-                           'some variables for steering may not be properly set'
-          CALL message( 'wtm_parin', 'PA0466', 1, 2, 0, 6, 0 )               
-       ENDIF
+       READ ( 11, wind_turbine_parameters, ERR = 10 )
+!
+!--    Set flag that indicates that the wind turbine model is switched on
+       wind_turbine = .TRUE.
+       
+       GOTO 14
+
+ 10    BACKSPACE( 11 )
+       READ( 11 ,fmt='(A)') line
+       CALL parin_fail_message ( 'wind_turbine_parameters', line )
+
+!
+!--    Try to find wind turbine model package
+ 12    REWIND ( 11 )
+       line = ' '
+       DO  WHILE ( INDEX( line, '&wind_turbine_par' ) == 0 )
+          READ ( 11, '(A)', END=14 )  line
+       ENDDO
+       BACKSPACE ( 11 )
+
+!
+!--    Read user-defined namelist
+       READ ( 11, wind_turbine_par, ERR = 13, END = 14 )
       
        message_string = 'namelist wind_tubrine_par is deprecated and will ' // &
@@ -591 +577 @@
        wind_turbine = .TRUE.
 
- 12    CONTINUE   ! TBD Change from continue, mit ierrn machen
+       GOTO 14
+
+ 13    BACKSPACE( 11 )
+       READ( 11 ,fmt='(A)') line
+       CALL parin_fail_message ( 'wind_turbine_par', line )
+
+ 14    CONTINUE   ! TBD Change from continue, mit ierrn machen