Changeset 1910 for palm/trunk/SOURCE

Timestamp:

May 26, 2016 6:49:46 AM (8 years ago)

Author:

raasch

Message:

Bugfix: if topography is read from file, Neumann conditions are used for the nzb_local array (instead of cyclic conditions) in case that non-cyclic boundary conditions are used for the run

File:

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

palm/trunk/SOURCE/init_grid.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: if topography is read from file, Neumann conditions are used for the
+! nzb_local array (instead of cyclic conditions) in case that non-cyclic
+! boundary conditions are used for the run
 ! 
 ! Former revisions:
@@ -26 +28 @@
 !
 ! 1902 2016-05-09 11:18:56Z suehring
-! Set topography flags only for multigrid solver, not for multigrid_fast
+! Set topography flags for multigrid solver only (not for multigrid_fast)
 !
 ! 1886 2016-04-21 11:20:47Z suehring
@@ -169 +171 @@
         
     USE control_parameters,                                                    &
-        ONLY:  bc_lr, bc_ns, building_height, building_length_x,               &
+        ONLY:  bc_lr_cyc, bc_ns_cyc, building_height, building_length_x,       &
                building_length_y, building_wall_left, building_wall_south,     &
                canyon_height, canyon_wall_left, canyon_wall_south,             &
@@ -745 +747 @@
 
           DEALLOCATE ( topo_height )
-!
-!--       Add cyclic boundaries (additional layers are for calculating
-!--       flag arrays needed for the multigrid sover)
-          nzb_local(-gls:-1,0:nx)     = nzb_local(ny-gls+1:ny,0:nx)
-          nzb_local(ny+1:ny+gls,0:nx) = nzb_local(0:gls-1,0:nx)
-          nzb_local(:,-gls:-1)        = nzb_local(:,nx-gls+1:nx)
-          nzb_local(:,nx+1:nx+gls)    = nzb_local(:,0:gls-1)
+
+!
+!--       Add cyclic or Neumann boundary conditions (additional layers are for
+!--       calculating flag arrays needed for the multigrid sover)
+          IF ( bc_ns_cyc )  THEN
+             nzb_local(-gls:-1,0:nx)     = nzb_local(ny-gls+1:ny,0:nx)
+             nzb_local(ny+1:ny+gls,0:nx) = nzb_local(0:gls-1,0:nx)
+          ELSE
+             DO  j = -gls, -1
+                nzb_local(j,0:nx)  = nzb_local(0,0:nx)
+             ENDDO
+             DO  j = ny+1, ny+gls
+                 nzb_local(j,0:nx) = nzb_local(ny,0:nx)
+             ENDDO
+          ENDIF
+
+          IF ( bc_lr_cyc )  THEN
+             nzb_local(:,-gls:-1)     = nzb_local(:,nx-gls+1:nx)
+             nzb_local(:,nx+1:nx+gls) = nzb_local(:,0:gls-1)
+          ELSE
+             DO  i = -gls, -1
+                nzb_local(:,i) = nzb_local(:,0)
+             ENDDO
+             DO  i = nx+1, nx+gls
+                nzb_local(:,i) = nzb_local(:,nx)
+             ENDDO
+          ENDIF
 
        CASE DEFAULT
@@ -791 +813 @@
        ENDIF
 
-       IF ( bc_lr == 'cyclic' )  THEN
+       IF ( bc_lr_cyc )  THEN
           IF ( ANY( nzb_local(:,-1) /= nzb_local(:,nx)   )  .OR.               &
                ANY( nzb_local(:,0)  /= nzb_local(:,nx+1) ) )  THEN
@@ -799 +821 @@
           ENDIF
        ENDIF
-       IF ( bc_ns == 'cyclic' )  THEN
+       IF ( bc_ns_cyc )  THEN
           IF ( ANY( nzb_local(-1,:) /= nzb_local(ny,:)   )  .OR.               &
                ANY( nzb_local(0,:)  /= nzb_local(ny+1,:) ) )  THEN