Changeset 3142 for palm/trunk/SOURCE

Timestamp:

Jul 17, 2018 3:27:45 PM (6 years ago)

Author:

suehring

Message:

Bugfix in referencing buildings on orography top; minor bugfix for last LSM commit

Location:

palm/trunk/SOURCE

Files:

• init_grid.f90 (modified) (5 diffs)
• land_surface_model_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/init_grid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in referencing buildings on orography top
+! 
+! 3139 2018-07-17 11:30:10Z Giersch
 ! Bugfix in case of restarts and grid stretching
 ! 
@@ -1522 +1525 @@
              DO  k = nzb, nzt
                 IF ( zu(k) - ocean_offset <= oro_max(nr) )                     &
-                   oro_max_l = zw(k) - ocean_offset
+                   oro_max_l(nr) = zw(k) - ocean_offset
              ENDDO
-             oro_max = oro_max_l
+             oro_max(nr) = oro_max_l(nr)
           ENDDO
        ENDIF
@@ -1532 +1535 @@
           DO  j = nys, nyn
              topo_top_index = 0
+!
+!--          Obtain index in global building_id array
+             IF ( buildings_f%from_file )  THEN
+                IF ( building_id_f%var(j,i) /= building_id_f%fill )  THEN
+!
+!--                Determine index where maximum terrain height occupied by 
+!--                the respective building height is stored.
+                   nr = MINLOC( ABS( build_ids_final -                         &
+                                     building_id_f%var(j,i) ), DIM = 1 )
+                ENDIF
+             ENDIF
              DO  k = nzb, nzt
 !
@@ -1551 +1565 @@
 !--             3D buildings require separate treatment. 
                 IF ( buildings_f%from_file  .AND.  buildings_f%lod == 1 )  THEN
-                   IF ( building_id_f%var(j,i) /= building_id_f%fill )  THEN
-!
-!--                   Determine index where maximum terrain height occupied by 
-!--                   the respective building height is stored.
-                      nr = MINLOC( ABS( build_ids_final -                      &
-                                        building_id_f%var(j,i) ), DIM = 1 )
-        
+                   IF ( building_id_f%var(j,i) /= building_id_f%fill )  THEN       
                       IF ( zu(k) - ocean_offset <=                             &
                            oro_max(nr) + buildings_f%var_2d(j,i) )  THEN
@@ -1576 +1584 @@
              IF ( buildings_f%from_file  .AND.  buildings_f%lod == 2 )  THEN
                 IF ( building_id_f%var(j,i) /= building_id_f%fill )  THEN
-!
-!--                Determine index for maximum-terrain-height array.
-                   nr = MINLOC( ABS( build_ids_final -                         &
-                                     building_id_f%var(j,i) ), DIM = 1 )
 !
 !--                Extend building down to the terrain surface, i.e. fill-up

palm/trunk/SOURCE/land_surface_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Minor bugfix for last commit.
+! 
+! 3138 2018-07-17 08:21:20Z maronga
 ! Bugfix: limit roughness lengths in case of sea surface with constant_roughness
 ! = .F.
@@ -6981 +6984 @@
              ENDIF
              
-             IF ( surf_lsm_h%z0(m) >= surf_lsm_h%z_mo(m) )  THEN
+             IF ( surf_lsm_h%z0q(m) >= surf_lsm_h%z_mo(m) )  THEN
   
                 surf_lsm_h%z0q(m) = 0.9_wp * surf_lsm_h%z_mo(m)