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

palm/trunk/SOURCE/plant_canopy_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Added error handling for input namelist via parin_fail_message
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -1021 +1024 @@
                                   leaf_scalar_exch_coeff,                      &
                                   leaf_surface_conc, pch_index
-                                  
+
        line = ' '
-       
+
 !
 !--    Try to find radiation model package
@@ -1029 +1032 @@
        line = ' '
        DO   WHILE ( INDEX( line, '&plant_canopy_parameters' ) == 0 )
-          READ ( 11, '(A)', END=10 )  line
-       ENDDO
-       BACKSPACE ( 11 )
-
-!
-!--    Read user-defined namelist
-       READ ( 11, plant_canopy_parameters )
-
-!
-!--    Set flag that indicates that the radiation model is switched on
-       plant_canopy = .TRUE.
-       
-       GOTO 12
-!
-!--    Try to find old namelist
- 10    REWIND ( 11 )
-       line = ' '
-       DO   WHILE ( INDEX( line, '&canopy_par' ) == 0 )
           READ ( 11, '(A)', END=12 )  line
        ENDDO
@@ -1053 +1038 @@
 !
 !--    Read user-defined namelist
-       READ ( 11, canopy_par )
+       READ ( 11, plant_canopy_parameters, ERR = 10 )
+
+!
+!--    Set flag that indicates that the radiation model is switched on
+       plant_canopy = .TRUE.
+
+       GOTO 14
+
+ 10    BACKSPACE( 11 )
+       READ( 11 ,fmt='(A)') line
+       CALL parin_fail_message ( 'plant_canopy_parameters', line )
+!
+!--    Try to find old namelist
+ 12    REWIND ( 11 )
+       line = ' '
+       DO   WHILE ( INDEX( line, '&canopy_par' ) == 0 )
+          READ ( 11, '(A)', END=14 )  line
+       ENDDO
+       BACKSPACE ( 11 )
+
+!
+!--    Read user-defined namelist
+       READ ( 11, canopy_par, ERR = 13, END = 14 )
 
        message_string = 'namelist canopy_par is deprecated and will be ' // &
@@ -1059 +1066 @@
                      'plant_canopy_parameters instead'
        CALL message( 'pcm_parin', 'PA0487', 0, 1, 0, 6, 0 )
-       
+
 !
 !--    Set flag that indicates that the radiation model is switched on
        plant_canopy = .TRUE.
 
- 12    CONTINUE
-       
+       GOTO 14
+
+ 13    BACKSPACE( 11 )
+       READ( 11 ,fmt='(A)') line
+       CALL parin_fail_message ( 'canopy_par', line )
+
+ 14    CONTINUE
+
 
     END SUBROUTINE pcm_parin