Changeset 722 for palm

Timestamp:

Apr 11, 2011 6:21:09 AM (14 years ago)

Author:

raasch

Message:

bugfixes for r707 concerning multigrid method for non-cyclic boundary conditions

Location:

palm/trunk/SOURCE

Files:

• init_grid.f90 (modified) (3 diffs)
• init_pegrid.f90 (modified) (8 diffs)
• modules.f90 (modified) (2 diffs)

palm/trunk/SOURCE/init_grid.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: bc_lr/ns_cyc replaced by bc_lr/ns, because variables are not yet set
+!         here
 !
 ! Former revisions:
@@ -564 +565 @@
        ENDIF
 
-       IF ( bc_lr_cyc )  THEN
+       IF ( bc_lr == 'cyclic' )  THEN
           IF ( ANY( nzb_local(:,-1) /= nzb_local(:,nx)   )  .OR. &
                ANY( nzb_local(:,0)  /= nzb_local(:,nx+1) ) )  THEN
@@ -572 +573 @@
           ENDIF
        ENDIF
-       IF ( bc_ns_cyc )  THEN
+       IF ( bc_ns == 'cyclic' )  THEN
           IF ( ANY( nzb_local(-1,:) /= nzb_local(ny,:)   )  .OR. &
                ANY( nzb_local(0,:)  /= nzb_local(ny+1,:) ) )  THEN

palm/trunk/SOURCE/init_pegrid.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: bc_lr/ns_cyc/dirrad/raddir replaced by bc_lr/ns, because variables
+!         are not yet set here; grid_level set to 0
 ! 
 ! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!!
@@ -193 +194 @@
 !
 !-- If necessary, set horizontal boundary conditions to non-cyclic
-    IF ( .NOT. bc_lr_cyc )  cyclic(1) = .FALSE.
-    IF ( .NOT. bc_ns_cyc )  cyclic(2) = .FALSE.
+    IF ( bc_lr /= 'cyclic' )  cyclic(1) = .FALSE.
+    IF ( bc_ns /= 'cyclic' )  cyclic(2) = .FALSE.
 
 !
@@ -977 +978 @@
     ENDIF
 
-    grid_level = maximum_grid_level
+!
+!-- Default level 0 tells exchange_horiz that all ghost planes have to be
+!-- exchanged. grid_level is adjusted in poismg, where only one ghost plane
+!-- is required.
+    grid_level = 0
 
 #if defined( __parallel )
@@ -1067 +1072 @@
 !-- horizontal boundary conditions.
     IF ( pleft == MPI_PROC_NULL )  THEN
-       IF ( bc_lr_dirrad )  THEN
+       IF ( bc_lr == 'dirichlet/radiation' )  THEN
           inflow_l  = .TRUE.
-       ELSEIF ( bc_lr_raddir )  THEN
+       ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
           outflow_l = .TRUE.
        ENDIF
@@ -1075 +1080 @@
 
     IF ( pright == MPI_PROC_NULL )  THEN
-       IF ( bc_lr_dirrad )  THEN
+       IF ( bc_lr == 'dirichlet/radiation' )  THEN
           outflow_r = .TRUE.
-       ELSEIF ( bc_lr_raddir )  THEN
+       ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
           inflow_r  = .TRUE.
        ENDIF
@@ -1083 +1088 @@
 
     IF ( psouth == MPI_PROC_NULL )  THEN
-       IF ( bc_ns_dirrad )  THEN
+       IF ( bc_ns == 'dirichlet/radiation' )  THEN
           outflow_s = .TRUE.
-       ELSEIF ( bc_ns_raddir )  THEN
+       ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
           inflow_s  = .TRUE.
        ENDIF
@@ -1091 +1096 @@
 
     IF ( pnorth == MPI_PROC_NULL )  THEN
-       IF ( bc_ns_dirrad )  THEN
+       IF ( bc_ns == 'dirichlet/radiation' )  THEN
           inflow_n  = .TRUE.
-       ELSEIF ( bc_ns_raddir )  THEN
+       ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
           outflow_n = .TRUE.
        ENDIF
@@ -1123 +1128 @@
 
 #else
-    IF ( bc_lr_dirrad )  THEN
+    IF ( bc_lr == 'dirichlet/radiation' )  THEN
        inflow_l  = .TRUE.
        outflow_r = .TRUE.
-    ELSEIF ( bc_lr_raddir )  THEN
+    ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
        outflow_l = .TRUE.
        inflow_r  = .TRUE.
     ENDIF
 
-    IF ( bc_ns_dirrad )  THEN
+    IF ( bc_ns == 'dirichlet/radiation' )  THEN
        inflow_n  = .TRUE.
        outflow_s = .TRUE.
-    ELSEIF ( bc_ns_raddir )  THEN
+    ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
        outflow_n = .TRUE.
        inflow_s  = .TRUE.

palm/trunk/SOURCE/modules.f90

@@ -5 +5 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: default value for south_border_pe changed to .F.
 !
 ! Former revisions:
@@ -1240 +1240 @@
     LOGICAL ::  collective_wait = .FALSE., left_border_pe  = .FALSE.,  &
                 north_border_pe = .FALSE., reorder = .TRUE.,           &
-                right_border_pe = .FALSE., south_border_pe = .TRUE.,   &
+                right_border_pe = .FALSE., south_border_pe = .FALSE.,  &
                 synchronous_exchange = .FALSE.