Changeset 1675 for palm

Timestamp:

Oct 2, 2015 8:28:59 AM (9 years ago)

Author:

gronemeier

Message:

Bugfix: Definition of topography grid levels

Location:

palm/trunk/SOURCE

Files:

• header.f90 (modified) (3 diffs)
• init_grid.f90 (modified) (4 diffs)

palm/trunk/SOURCE/header.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: Definition of topography grid levels
 ! 
 ! Former revisions:
@@ -758 +758 @@
           blx = INT( building_length_x / dx )
           bly = INT( building_length_y / dy )
-          DO  k = 0, nzt
-             IF  ( building_height .GT. zw(k) ) THEN
-                bh = k+1
-             ENDIF
-          ENDDO
+          bh  = MINLOC( ABS( zw - building_height ), 1 ) - 1
+          IF ( ABS( zw(bh  ) - building_height ) == &
+               ABS( zw(bh+1) - building_height )    )  bh = bh + 1
 
           IF ( building_wall_left == 9999999.9_wp )  THEN
@@ -780 +778 @@
 
        CASE ( 'single_street_canyon' )
-          DO  k = 0, nzt
-             IF  ( canyon_height .GT. zw(k) ) THEN
-                ch = k+1
-             ENDIF
-          ENDDO
+          ch  = MINLOC( ABS( zw - canyon_height ), 1 ) - 1
+          IF ( ABS( zw(ch  ) - canyon_height ) == &
+               ABS( zw(ch+1) - canyon_height )    )  ch = ch + 1
           IF ( canyon_width_x /= 9999999.9_wp )  THEN
 !

palm/trunk/SOURCE/init_grid.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: Definition of topography grid levels
 ! 
 ! Former revisions:
@@ -545 +545 @@
           blx = NINT( building_length_x / dx )
           bly = NINT( building_length_y / dy )
-          bh = 0
-          DO  k = 0, nzt
-             IF  ( building_height .GT. zw(k) ) THEN
-                bh = k+1
-             ENDIF
-          ENDDO
+          bh  = MINLOC( ABS( zw - building_height ), 1 ) - 1
+          IF ( ABS( zw(bh  ) - building_height ) == &
+               ABS( zw(bh+1) - building_height )    )  bh = bh + 1
 
           IF ( building_wall_left == 9999999.9_wp )  THEN
@@ -610 +607 @@
           ENDIF
 
-          ch = 0
-          DO  k = 0, nzt
-             IF  ( canyon_height .GT. zw(k) ) THEN
-                ch = k+1
-             ENDIF
-          ENDDO
+          ch  = MINLOC( ABS( zw - canyon_height ), 1 ) - 1
+          IF ( ABS( zw(ch  ) - canyon_height ) == &
+               ABS( zw(ch+1) - canyon_height )    )  ch = ch + 1
+
           dp_level_ind_b = ch
 !
@@ -689 +684 @@
           DO  i = 0, nx
              DO  j = 0, ny
-                nzb_local(j,i) = 0
-                DO  k = 0, nzt
-                    IF  ( topo_height(j,i) .GT. zw(k) ) THEN
-                        nzb_local(j,i) = k+1
-                    ENDIF
-                ENDDO
+                nzb_local(j,i) = MINLOC( ABS( zw - topo_height(j,i) ), 1 ) - 1
+                IF ( ABS( zw(nzb_local(j,i)  ) - topo_height(j,i) ) == &
+                     ABS( zw(nzb_local(j,i)+1) - topo_height(j,i) )    )  &
+                   nzb_local(j,i) = nzb_local(j,i) + 1
              ENDDO
           ENDDO