Changeset 3855 for palm/trunk

Timestamp:

Apr 3, 2019 10:00:59 AM (6 years ago)

Author:

suehring

Message:

In projection of non-building 3D objects onto numerical grid remove dependency on building_type

Location:

palm/trunk/SOURCE

Files:

• init_grid.f90 (modified) (2 diffs)
• netcdf_data_input_mod.f90 (modified) (1 diff)
• virtual_measurement_mod.f90 (modified) (1 diff)

palm/trunk/SOURCE/init_grid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! In projection of non-building 3D objects onto numerical grid remove 
+! dependency on building_type
+! 
+! 3763 2019-02-25 17:33:49Z suehring
 ! Replace work-around for ghost point exchange of 1-byte arrays with specific 
 ! routine as already done in other routines
@@ -1606 +1610 @@
 !--                exclusively by building type 7, terrain shape should be
 !--                maintained. 
-                   IF ( building_type_f%var(j,i) /= 7 )  THEN
-                      DO k = topo_top_index + 1, nzt + 1      
-                         IF ( zw(k) - ocean_offset <= oro_max(nr) )  THEN
-                            topo_3d(k,j,i) = IBCLR( topo_3d(k,j,i), 0 )
-                            topo_3d(k,j,i) = IBSET( topo_3d(k,j,i), 2 )
-                         ENDIF
-                      ENDDO        
-!
-!--                   After surface irregularities are smoothen, determine lower
-!--                   start index where building starts. 
-                      DO  k = nzb, nzt
-                         IF ( zw(k) - ocean_offset <= oro_max(nr) )            &
-                            topo_top_index = k
-                      ENDDO
+                   IF ( building_type_f%from_file )  THEN
+                      IF ( building_type_f%var(j,i) /= 7 )  THEN
+                         DO k = topo_top_index + 1, nzt + 1      
+                            IF ( zw(k) - ocean_offset <= oro_max(nr) )  THEN
+                               topo_3d(k,j,i) = IBCLR( topo_3d(k,j,i), 0 )
+                               topo_3d(k,j,i) = IBSET( topo_3d(k,j,i), 2 )
+                            ENDIF
+                         ENDDO        
+!                     
+!--                      After surface irregularities are smoothen, determine 
+!--                      lower start index where building starts. 
+                         DO  k = nzb, nzt
+                            IF ( zw(k) - ocean_offset <= oro_max(nr) )         &
+                               topo_top_index = k
+                         ENDDO
+                      ENDIF
                    ENDIF
 !

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! Typo removed
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Typo removed
+! 
+! 3854 2019-04-02 16:59:33Z suehring
 ! Bugfix in one of the checks. Typo removed.
 ! 

palm/trunk/SOURCE/virtual_measurement_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! Remove print statement
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Remove print statement
+! 
+! 3854 2019-04-02 16:59:33Z suehring
 ! renamed nvar to nmeas, replaced USE chem_modules by USE chem_gasphase_mod and
 ! nspec by nvar