Changeset 4842 for palm/trunk/SOURCE/ocean_mod.f90

Timestamp:

Jan 14, 2021 10:42:28 AM (4 years ago)

Author:

raasch

Message:

reading of namelist file and actions in case of namelist errors revised so that statement labels and goto statements are not required any more, deprecated namelists removed

File:

• palm/trunk/SOURCE/ocean_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/ocean_mod.f90

@@ -24 +24 @@
 ! -----------------
 ! $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
+!
+! 4828 2021-01-05 11:21:41Z Giersch
 ! file re-formatted to follow the PALM coding standard
 !
@@ -572 +576 @@
     IMPLICIT NONE
 
-    CHARACTER (LEN=80) ::  line  !< dummy string that contains the current line of the parameter file
-
-
-    NAMELIST /ocean_parameters/  bc_sa_t, bottom_salinityflux, salinity, sa_surface,               &
-                                 sa_vertical_gradient, sa_vertical_gradient_level,                 &
-                                 stokes_waveheight, stokes_wavelength, surface_cooling_spinup_time,&
-                                 top_salinityflux, wall_salinityflux, wave_breaking
-
-!
-!-- Try to find the namelist
-    REWIND ( 11 )
-    line = ' '
-    DO WHILE ( INDEX( line, '&ocean_parameters' ) == 0 )
-       READ ( 11, '(A)', END=12 )  line
-    ENDDO
-    BACKSPACE ( 11 )
-
-!
-!-- Read namelist
-    READ ( 11, ocean_parameters, ERR = 10 )
-!
-!-- Set switch that enables PALM's ocean mode
-    ocean_mode = .TRUE.
-
-    GOTO 12
-
- 10 BACKSPACE( 11 )
-    READ( 11 , '(A)') line
-    CALL parin_fail_message( 'ocean_parameters', line )
-
- 12 CONTINUE
+    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
+
+
+    NAMELIST /ocean_parameters/  bc_sa_t,                                                          &
+                                 bottom_salinityflux,                                              &
+                                 salinity,                                                         &
+                                 sa_surface,                                                       &
+                                 sa_vertical_gradient,                                             &
+                                 sa_vertical_gradient_level,                                       &
+                                 stokes_waveheight,                                                &
+                                 stokes_wavelength,                                                &
+                                 surface_cooling_spinup_time,                                      &
+                                 top_salinityflux,                                                 &
+                                 wall_salinityflux,                                                &
+                                 wave_breaking
+
+!
+!-- Move to the beginning of the namelist file and try to find and read the namelist called
+!-- ocean_parameters.
+    REWIND( 11 )
+    READ( 11, ocean_parameters, IOSTAT=io_status )
+
+!
+!-- Action depending on the READ status
+    IF ( io_status == 0 )  THEN
+!
+!--    ocean_parameters namelist was found and read correctly. Set switch that enables PALM's ocean
+!--    mode.
+       ocean_mode = .TRUE.
+
+    ELSEIF ( io_status > 0 )  THEN
+!
+!--    ocean_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( 'ocean_parameters', line )
+
+    ENDIF
 
  END SUBROUTINE ocean_parin
+
 
 !--------------------------------------------------------------------------------------------------!