Changeset 2128

Timestamp:

Jan 23, 2017 3:00:03 PM (8 years ago)

Author:

suehring

Message:

Bugfix in topography in case of ocean simulations

File:

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

palm/trunk/SOURCE/init_grid.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix in setting topography from file in case of ocean simulations
 ! 
 ! Former revisions:
@@ -750 +750 @@
           DO  i = nxl, nxr
              DO  j = nys, nyn
-                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
+                IF ( .NOT. ocean )  THEN
+                   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
+                ELSE
+                   nzb_local(j,i) = MINLOC( ABS( zw - zw(0)                    &
+                                                    - topo_height(j,i) ), 1 ) - 1
+                   IF ( ABS( zw(nzb_local(j,i)  ) - zw(0)                      &
+                                                  - topo_height(j,i) )  ==     &
+                        ABS( zw(nzb_local(j,i)+1) - zw(0)                      &
+                                                  - topo_height(j,i) )    )    &
+                      nzb_local(j,i) = nzb_local(j,i) + 1
+                ENDIF
+
              ENDDO
           ENDDO