Changeset 4294 for palm

Timestamp:

Nov 13, 2019 6:34:16 PM (5 years ago)

Author:

suehring

Message:

init_grid: always set bit 5 and 6 of wall_flags, indicating terrain- and building surfaces in all cases, in order to enable terrain-following output also when no land- or urban-surface model is applied

File:

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

palm/trunk/SOURCE/init_grid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix, always set bit 5 and 6 of wall_flags, indicating terrain- and 
+! building surfaces in all  cases, in order to enable terrain-following output 
+! also when no land- or urban-surface model is applied. 
+! 
+! 4265 2019-10-15 16:16:24Z suehring
 ! Bugfix for last commit, exchange oro_max variable only when it is allocated 
 ! (not necessarily the case when topography is input from ASCII file).
@@ -2300 +2305 @@
 
     USE control_parameters,                                                    &
-        ONLY:  bc_lr_cyc, bc_ns_cyc, constant_flux_layer, land_surface,        &
-               scalar_advec, topography, use_surface_fluxes, use_top_fluxes,   &
-               urban_surface
+        ONLY:  bc_lr_cyc, bc_ns_cyc, constant_flux_layer,                      &
+               scalar_advec, topography, use_surface_fluxes, use_top_fluxes
 
     USE indices,                                                               &
@@ -2569 +2573 @@
 !-- when topography is read from file. In order to run the land-surface model
 !-- also without topography information, set bit 1 explicitely in this case.
-    IF ( land_surface )  THEN
-!
-!--    If no topography is initialized, the land-surface is at k = nzb.
-       IF ( TRIM( topography ) /= 'read_from_file' )  THEN
-          wall_flags_0(nzb,:,:) = IBSET( wall_flags_0(nzb,:,:), 5 )
-       ELSE
-          DO i = nxl, nxr
-             DO j = nys, nyn
-                DO k = nzb, nzt+1
-!         
-!--                Natural terrain grid point
-                   IF ( BTEST( topo(k,j,i), 1 ) )                              &
-                      wall_flags_0(k,j,i) = IBSET( wall_flags_0(k,j,i), 5 )
-                ENDDO
-             ENDDO
-          ENDDO
-       ENDIF
-    ENDIF
-!
-!-- Building grid points.
-    IF ( urban_surface )  THEN
+!-- 
+!-- Natural terrain grid points
+!-- If no topography is initialized, the land-surface is at k = nzb.
+    IF ( TRIM( topography ) /= 'read_from_file' )  THEN
+       wall_flags_0(nzb,:,:) = IBSET( wall_flags_0(nzb,:,:), 5 )
+    ELSE
        DO i = nxl, nxr
           DO j = nys, nyn
              DO k = nzb, nzt+1
-                IF ( BTEST( topo(k,j,i), 2 ) )                                 &
-                   wall_flags_0(k,j,i) = IBSET( wall_flags_0(k,j,i), 6 )
+!         
+!--             Natural terrain grid point
+                IF ( BTEST( topo(k,j,i), 1 ) )                                 &
+                   wall_flags_0(k,j,i) = IBSET( wall_flags_0(k,j,i), 5 )
              ENDDO
           ENDDO
        ENDDO
     ENDIF
+!
+!-- Building grid points.
+    DO i = nxl, nxr
+       DO j = nys, nyn
+          DO k = nzb, nzt+1
+             IF ( BTEST( topo(k,j,i), 2 ) )                                    &
+                wall_flags_0(k,j,i) = IBSET( wall_flags_0(k,j,i), 6 )
+          ENDDO
+       ENDDO
+    ENDDO
 !
 !-- Exchange ghost points for wall flags