Changeset 722


Ignore:
Timestamp:
Apr 11, 2011 6:21:09 AM (10 years ago)
Author:
raasch
Message:

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

Location:
palm/trunk/SOURCE
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/init_grid.f90

    r710 r722  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: bc_lr/ns_cyc replaced by bc_lr/ns, because variables are not yet set
     7!         here
    78!
    89! Former revisions:
     
    564565       ENDIF
    565566
    566        IF ( bc_lr_cyc )  THEN
     567       IF ( bc_lr == 'cyclic' )  THEN
    567568          IF ( ANY( nzb_local(:,-1) /= nzb_local(:,nx)   )  .OR. &
    568569               ANY( nzb_local(:,0)  /= nzb_local(:,nx+1) ) )  THEN
     
    572573          ENDIF
    573574       ENDIF
    574        IF ( bc_ns_cyc )  THEN
     575       IF ( bc_ns == 'cyclic' )  THEN
    575576          IF ( ANY( nzb_local(-1,:) /= nzb_local(ny,:)   )  .OR. &
    576577               ANY( nzb_local(0,:)  /= nzb_local(ny+1,:) ) )  THEN
  • palm/trunk/SOURCE/init_pegrid.f90

    r710 r722  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: bc_lr/ns_cyc/dirrad/raddir replaced by bc_lr/ns, because variables
     7!         are not yet set here; grid_level set to 0
    78!
    89! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!!
     
    193194!
    194195!-- If necessary, set horizontal boundary conditions to non-cyclic
    195     IF ( .NOT. bc_lr_cyc )  cyclic(1) = .FALSE.
    196     IF ( .NOT. bc_ns_cyc )  cyclic(2) = .FALSE.
     196    IF ( bc_lr /= 'cyclic' )  cyclic(1) = .FALSE.
     197    IF ( bc_ns /= 'cyclic' )  cyclic(2) = .FALSE.
    197198
    198199!
     
    977978    ENDIF
    978979
    979     grid_level = maximum_grid_level
     980!
     981!-- Default level 0 tells exchange_horiz that all ghost planes have to be
     982!-- exchanged. grid_level is adjusted in poismg, where only one ghost plane
     983!-- is required.
     984    grid_level = 0
    980985
    981986#if defined( __parallel )
     
    10671072!-- horizontal boundary conditions.
    10681073    IF ( pleft == MPI_PROC_NULL )  THEN
    1069        IF ( bc_lr_dirrad )  THEN
     1074       IF ( bc_lr == 'dirichlet/radiation' )  THEN
    10701075          inflow_l  = .TRUE.
    1071        ELSEIF ( bc_lr_raddir )  THEN
     1076       ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
    10721077          outflow_l = .TRUE.
    10731078       ENDIF
     
    10751080
    10761081    IF ( pright == MPI_PROC_NULL )  THEN
    1077        IF ( bc_lr_dirrad )  THEN
     1082       IF ( bc_lr == 'dirichlet/radiation' )  THEN
    10781083          outflow_r = .TRUE.
    1079        ELSEIF ( bc_lr_raddir )  THEN
     1084       ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
    10801085          inflow_r  = .TRUE.
    10811086       ENDIF
     
    10831088
    10841089    IF ( psouth == MPI_PROC_NULL )  THEN
    1085        IF ( bc_ns_dirrad )  THEN
     1090       IF ( bc_ns == 'dirichlet/radiation' )  THEN
    10861091          outflow_s = .TRUE.
    1087        ELSEIF ( bc_ns_raddir )  THEN
     1092       ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
    10881093          inflow_s  = .TRUE.
    10891094       ENDIF
     
    10911096
    10921097    IF ( pnorth == MPI_PROC_NULL )  THEN
    1093        IF ( bc_ns_dirrad )  THEN
     1098       IF ( bc_ns == 'dirichlet/radiation' )  THEN
    10941099          inflow_n  = .TRUE.
    1095        ELSEIF ( bc_ns_raddir )  THEN
     1100       ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
    10961101          outflow_n = .TRUE.
    10971102       ENDIF
     
    11231128
    11241129#else
    1125     IF ( bc_lr_dirrad )  THEN
     1130    IF ( bc_lr == 'dirichlet/radiation' )  THEN
    11261131       inflow_l  = .TRUE.
    11271132       outflow_r = .TRUE.
    1128     ELSEIF ( bc_lr_raddir )  THEN
     1133    ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
    11291134       outflow_l = .TRUE.
    11301135       inflow_r  = .TRUE.
    11311136    ENDIF
    11321137
    1133     IF ( bc_ns_dirrad )  THEN
     1138    IF ( bc_ns == 'dirichlet/radiation' )  THEN
    11341139       inflow_n  = .TRUE.
    11351140       outflow_s = .TRUE.
    1136     ELSEIF ( bc_ns_raddir )  THEN
     1141    ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
    11371142       outflow_n = .TRUE.
    11381143       inflow_s  = .TRUE.
  • palm/trunk/SOURCE/modules.f90

    r708 r722  
    55! Current revisions:
    66! -----------------
    7 !
     7! Bugfix: default value for south_border_pe changed to .F.
    88!
    99! Former revisions:
     
    12401240    LOGICAL ::  collective_wait = .FALSE., left_border_pe  = .FALSE.,  &
    12411241                north_border_pe = .FALSE., reorder = .TRUE.,           &
    1242                 right_border_pe = .FALSE., south_border_pe = .TRUE.,   &
     1242                right_border_pe = .FALSE., south_border_pe = .FALSE.,  &
    12431243                synchronous_exchange = .FALSE.
    12441244
Note: See TracChangeset for help on using the changeset viewer.