Changeset 4356 for palm/trunk/SOURCE/init_grid.f90

Timestamp:

Dec 20, 2019 5:09:33 PM (4 years ago)

Author:

suehring

Message:

Bugfix in message calls for local checks; error messages in init_grid slightly revised; bugfix in time_integration (uninitialized emission time index); read_restart_data (change from J.Resler): use dynamic array allocation rather than automatic arrays to avoid problems with stack memory

File:

• palm/trunk/SOURCE/init_grid.f90 (modified) (3 diffs)

palm/trunk/SOURCE/init_grid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Revise error messages for generic tunnel setup.
+! 
+! 4346 2019-12-18 11:55:56Z motisi
 ! Introduction of wall_flags_total_0, which currently sets bits based on static
 ! topography information used in wall_flags_static_0
@@ -2073 +2076 @@
           ENDIF
 !
-!--       Tunnel axis along y
+!--       Check for too small tunnel width in x- and y-direction
+          IF ( tunnel_width_x /= 9999999.9_wp  .AND.                           &   
+               tunnel_width_x - 2.0_wp * td <= 2.0_wp * dx )  THEN
+             message_string = 'tunnel_width_x too small'
+             CALL message( 'init_grid', 'PA0175', 1, 2, 0, 6, 0 )
+          ENDIF
+          IF ( tunnel_width_y /= 9999999.9_wp  .AND.                           &
+               tunnel_width_y - 2.0_wp * td <= 2.0_wp * dy )  THEN
+             message_string = 'tunnel_width_y too small'
+             CALL message( 'init_grid', 'PA0455', 1, 2, 0, 6, 0 )
+          ENDIF
+!
+!--       Check for too large tunnel width. 
+!--       Tunnel axis along y.
           IF ( tunnel_width_x /= 9999999.9_wp )  THEN
              IF ( tunnel_width_x > ( nx + 1 ) * dx )  THEN
-                message_string = 'Tunnel width too large'
+                message_string = 'tunnel_width_x too large'
                 CALL message( 'init_grid', 'PA0282', 1, 2, 0, 6, 0 )
              ENDIF
@@ -2092 +2108 @@
              tye_in  = tye_out
           ENDIF
-          IF ( tunnel_width_x /= 9999999.9_wp  .AND.                           &   
-               tunnel_width_x - 2.0_wp * td <= 2.0_wp * dx )                   &
-          THEN
-             message_string = 'Tunnel width too small'
-             CALL message( 'init_grid', 'PA0175', 1, 2, 0, 6, 0 )
-          ENDIF
-          IF ( tunnel_width_y /= 9999999.9_wp  .AND.                           &
-               tunnel_width_y - 2.0_wp * td <= 2.0_wp * dy )                   &
-          THEN
-             message_string = 'Tunnel width too small'
-             CALL message( 'init_grid', 'PA0455', 1, 2, 0, 6, 0 )
-          ENDIF
-!
-!--       Tunnel axis along x
+!
+!--       Tunnel axis along x.
           IF ( tunnel_width_y /= 9999999.9_wp )  THEN
              IF ( tunnel_width_y > ( ny + 1 ) * dy )  THEN
-                message_string = 'Tunnel width too large'
+                message_string = 'tunnel_width_y too large'
                 CALL message( 'init_grid', 'PA0456', 1, 2, 0, 6, 0 )
              ENDIF