Changeset 4843 for palm/trunk/SOURCE/virtual_measurement_mod.f90

Timestamp:

Jan 15, 2021 3:22:11 PM (4 years ago)

Author:

raasch

Message:

local namelist parameter added to switch off the module although the respective module namelist appears in the namelist file, further copyright updates

File:

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

palm/trunk/SOURCE/virtual_measurement_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! reading of namelist file and actions in case of namelist errors revised so that statement labels
+! and goto statements are not required any more,
+! local namelist parameter added to switch off the module although the respective module namelist
+! appears in the namelist file
+!
+! 4828 2021-01-05 11:21:41Z Giersch
 ! - Add control flags
 !
@@ -415 +421 @@
     LOGICAL ::  global_attribute          = .TRUE.   !< flag indicating a global attribute
     LOGICAL ::  initial_write_coordinates = .FALSE.  !< flag indicating a global attribute
-    LOGICAL ::  use_virtual_measurement   = .FALSE.  !< Namelist parameter
 
     REAL(wp) ::  dt_virtual_measurement   = 0.0_wp  !< sampling interval
@@ -817 +822 @@
  SUBROUTINE vm_parin
 
-    CHARACTER(LEN=80) ::  line   !< dummy string that contains the current line of the parameter file
+    CHARACTER(LEN=100) ::  line  !< dummy string that contains the current line of the parameter file
+
+    INTEGER(iwp) ::  io_status   !< status after reading the namelist file
+
+    LOGICAL ::  switch_off_module = .FALSE.  !< local namelist parameter to switch off the module
+                                             !< although the respective module namelist appears in
+                                             !< the namelist file
 
     NAMELIST /virtual_measurement_parameters/  dt_virtual_measurement,                             &
@@ -826 +837 @@
                                                off_ts,                                             &
                                                off_ts_z,                                           &
-                                               use_virtual_measurement,                            &
+                                               switch_off_module,                                  &
                                                vm_time_start
 
-    line = ' '
-!
-!-- Try to find stg package
-    REWIND ( 11 )
-    line = ' '
-    DO  WHILE ( INDEX( line, '&virtual_measurement_parameters' ) == 0 )
-       READ ( 11, '(A)', END=20 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read namelist
-    READ ( 11, virtual_measurement_parameters, ERR = 10, END = 20 )
-
-!
-!-- Set flag that indicates that the virtual measurement module is switched on
-    IF ( use_virtual_measurement )  virtual_measurement = .TRUE.
-    GOTO 20
-
- 10 BACKSPACE( 11 )
-    READ( 11 , '(A)') line
-    CALL parin_fail_message( 'virtual_measurement_parameters', line )
-
- 20 CONTINUE
+!
+!-- Move to the beginning of the namelist file and try to find and read the namelist.
+    REWIND( 11 )
+    READ( 11, virtual_measurement_parameters, IOSTAT=io_status )
+
+!
+!-- Action depending on the READ status
+    IF ( io_status == 0 )  THEN
+!
+!--    virtual_measurements_parameters namelist was found and read correctly. Enable the
+!--    virtual measurements.
+       IF ( .NOT. switch_off_module )  virtual_measurement = .TRUE.
+
+    ELSEIF ( io_status > 0 )  THEN
+!
+!--    virtual_measurement_parameters namelist was found but contained errors. Print an error
+!--    message including the line that caused the problem.
+       BACKSPACE( 11 )
+       READ( 11 , '(A)' ) line
+       CALL parin_fail_message( 'virtual_measurement_parameters', line )
+
+    ENDIF
 
  END SUBROUTINE vm_parin