Changeset 2893

Timestamp:

Mar 14, 2018 4:20:52 PM (7 years ago)

Author:

suehring

Message:

Revise informative message concerning filtered topography.

File:

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

palm/trunk/SOURCE/init_grid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Revise informative message concerning filtered topography (1 grid-point 
+! holes). 
+! 
+! 2892 2018-03-14 15:06:29Z suehring
 ! Bugfix, uninitialized array in case of single_building.
 ! 
@@ -1160 +1164 @@
     IMPLICIT NONE
 
+    LOGICAL      ::  filled = .FALSE. !< flag indicating if holes were filled
+
     INTEGER(iwp) ::  i          !< running index along x-direction
-    INTEGER(iwp) ::  it         !< counter for number of iterations
     INTEGER(iwp) ::  j          !< running index along y-direction
     INTEGER(iwp) ::  k          !< running index along z-direction
@@ -1179 +1184 @@
 
     num_hole = 99999
-    it = 0
     DO WHILE ( num_hole > 0 )       
 
@@ -1200 +1204 @@
        ENDIF
 
-       it = it + 1
        num_hole_l = 0
        DO i = nxl, nxr
@@ -1301 +1304 @@
        num_hole = num_hole_l
 #endif    
-
-!
-!--    Create an informative message if any holes were filled.
-       IF ( num_hole > 0 )  THEN
-          WRITE( message_string, * ) num_hole, 'hole(s) resolved by only '//   &
-                                     'one grid point were filled at ', it,     &
-                                     'th iteration '
-          CALL message( 'init_grid', 'PA0430', 0, 0, 0, 6, 0 )
-       ENDIF
-
+       IF ( num_hole > 0  .AND.  .NOT. filled )  filled = .TRUE.
 
     ENDDO
+!
+!-- Create an informative message if any holes were filled.
+    IF ( filled )  THEN
+       WRITE( message_string, * ) 'Topography was filtered, i.e. holes ' //    &
+                                  'resolved by only one grid point '     //    &
+                                  'were filled during initialization.'
+       CALL message( 'init_grid', 'PA0430', 0, 0, 0, 6, 0 )
+    ENDIF
 
     DEALLOCATE( topo_tmp )
@@ -1534 +1536 @@
     INTEGER(iwp) ::  cys           !< index for south canyon wall
     INTEGER(iwp) ::  i             !< index variable along x
-    INTEGER(iwp) ::  it            !< Number of iterations required to fill all problematic holes
     INTEGER(iwp) ::  j             !< index variable along y
     INTEGER(iwp) ::  k             !< index variable along z