Changeset 818 for palm/trunk/SOURCE/init_grid.f90

Timestamp:

Feb 8, 2012 4:11:23 PM (13 years ago)

Author:

maronga

Message:

bugfix: namelist file check now possible for topography and re-enabled. mrungui update (-z option)

File:

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

palm/trunk/SOURCE/init_grid.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! Bugfix: topo_height is only required if topography is used. It is thus now
+! allocated in the topography branch
 !
 ! Former revisions:
@@ -38 +39 @@
 !
 ! 555 2010-09-07 07:32:53Z raasch
-! Bugfix: default setting of nzb_local for flat topographie
+! Bugfix: default setting of nzb_local for flat topography
 !
 ! 274 2009-03-26 15:11:21Z heinze
@@ -100 +101 @@
     REAL    ::  dx_l, dy_l, dz_stretched
 
-    REAL, DIMENSION(0:ny,0:nx)          ::  topo_height
+    REAL, DIMENSION(:,:), ALLOCATABLE   ::  topo_height
 
     REAL, DIMENSION(:,:,:), ALLOCATABLE ::  distance
@@ -331 +332 @@
     ALLOCATE( l_wall(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
 
+
     nzb_s_inner = nzb;  nzb_s_outer = nzb
     nzb_u_inner = nzb;  nzb_u_outer = nzb
@@ -517 +519 @@
        CASE ( 'read_from_file' )
 
+          ALLOCATE ( topo_height(0:ny,0:nx) )
+
           DO  ii = 0, io_blocks-1
              IF ( ii == io_group )  THEN
@@ -552 +556 @@
              ENDDO
           ENDDO
+
+          DEALLOCATE ( topo_height )
 !
 !--       Add cyclic boundaries (additional layers are for calculating