Changeset 724 for palm/tags/release-3.8


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

bugfixes of r722 merged to release 3.8

Location:
palm/tags/release-3.8
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • palm/tags/release-3.8

  • palm/tags/release-3.8/EXAMPLES/dvr

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • palm/tags/release-3.8/SOURCE

  • palm/tags/release-3.8/SOURCE/init_grid.f90

    r710 r724  
    99! -----------------
    1010! $Id$
     11!
     12! 722 2011-04-11 06:21:09Z raasch
     13! Bugfix: bc_lr/ns_cyc replaced by bc_lr/ns, because variables are not yet set
     14!         here
    1115!
    1216! 709 2011-03-30 09:31:40Z raasch
     
    564568       ENDIF
    565569
    566        IF ( bc_lr_cyc )  THEN
     570       IF ( bc_lr == 'cyclic' )  THEN
    567571          IF ( ANY( nzb_local(:,-1) /= nzb_local(:,nx)   )  .OR. &
    568572               ANY( nzb_local(:,0)  /= nzb_local(:,nx+1) ) )  THEN
     
    572576          ENDIF
    573577       ENDIF
    574        IF ( bc_ns_cyc )  THEN
     578       IF ( bc_ns == 'cyclic' )  THEN
    575579          IF ( ANY( nzb_local(-1,:) /= nzb_local(ny,:)   )  .OR. &
    576580               ANY( nzb_local(0,:)  /= nzb_local(ny+1,:) ) )  THEN
  • palm/tags/release-3.8/SOURCE/init_pegrid.f90

    r710 r724  
    1212! -----------------
    1313! $Id$
     14!
     15! 722 2011-04-11 06:21:09Z raasch
     16! Bugfix: bc_lr/ns_cyc/dirrad/raddir replaced by bc_lr/ns, because variables
     17!         are not yet set here; grid_level set to 0
    1418!
    1519! 709 2011-03-30 09:31:40Z raasch
     
    193197!
    194198!-- 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.
     199    IF ( bc_lr /= 'cyclic' )  cyclic(1) = .FALSE.
     200    IF ( bc_ns /= 'cyclic' )  cyclic(2) = .FALSE.
    197201
    198202!
     
    977981    ENDIF
    978982
    979     grid_level = maximum_grid_level
     983!
     984!-- Default level 0 tells exchange_horiz that all ghost planes have to be
     985!-- exchanged. grid_level is adjusted in poismg, where only one ghost plane
     986!-- is required.
     987    grid_level = 0
    980988
    981989#if defined( __parallel )
     
    10671075!-- horizontal boundary conditions.
    10681076    IF ( pleft == MPI_PROC_NULL )  THEN
    1069        IF ( bc_lr_dirrad )  THEN
     1077       IF ( bc_lr == 'dirichlet/radiation' )  THEN
    10701078          inflow_l  = .TRUE.
    1071        ELSEIF ( bc_lr_raddir )  THEN
     1079       ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
    10721080          outflow_l = .TRUE.
    10731081       ENDIF
     
    10751083
    10761084    IF ( pright == MPI_PROC_NULL )  THEN
    1077        IF ( bc_lr_dirrad )  THEN
     1085       IF ( bc_lr == 'dirichlet/radiation' )  THEN
    10781086          outflow_r = .TRUE.
    1079        ELSEIF ( bc_lr_raddir )  THEN
     1087       ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
    10801088          inflow_r  = .TRUE.
    10811089       ENDIF
     
    10831091
    10841092    IF ( psouth == MPI_PROC_NULL )  THEN
    1085        IF ( bc_ns_dirrad )  THEN
     1093       IF ( bc_ns == 'dirichlet/radiation' )  THEN
    10861094          outflow_s = .TRUE.
    1087        ELSEIF ( bc_ns_raddir )  THEN
     1095       ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
    10881096          inflow_s  = .TRUE.
    10891097       ENDIF
     
    10911099
    10921100    IF ( pnorth == MPI_PROC_NULL )  THEN
    1093        IF ( bc_ns_dirrad )  THEN
     1101       IF ( bc_ns == 'dirichlet/radiation' )  THEN
    10941102          inflow_n  = .TRUE.
    1095        ELSEIF ( bc_ns_raddir )  THEN
     1103       ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
    10961104          outflow_n = .TRUE.
    10971105       ENDIF
     
    11231131
    11241132#else
    1125     IF ( bc_lr_dirrad )  THEN
     1133    IF ( bc_lr == 'dirichlet/radiation' )  THEN
    11261134       inflow_l  = .TRUE.
    11271135       outflow_r = .TRUE.
    1128     ELSEIF ( bc_lr_raddir )  THEN
     1136    ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
    11291137       outflow_l = .TRUE.
    11301138       inflow_r  = .TRUE.
    11311139    ENDIF
    11321140
    1133     IF ( bc_ns_dirrad )  THEN
     1141    IF ( bc_ns == 'dirichlet/radiation' )  THEN
    11341142       inflow_n  = .TRUE.
    11351143       outflow_s = .TRUE.
    1136     ELSEIF ( bc_ns_raddir )  THEN
     1144    ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
    11371145       outflow_n = .TRUE.
    11381146       inflow_s  = .TRUE.
  • palm/tags/release-3.8/SOURCE/modules.f90

    r708 r724  
    1010! -----------------
    1111! $Id$
     12!
     13! 722 2011-04-11 06:21:09Z raasch
     14! Bugfix: default value for south_border_pe changed to .F.
    1215!
    1316! 707 2011-03-29 11:39:40Z raasch
     
    12401243    LOGICAL ::  collective_wait = .FALSE., left_border_pe  = .FALSE.,  &
    12411244                north_border_pe = .FALSE., reorder = .TRUE.,           &
    1242                 right_border_pe = .FALSE., south_border_pe = .TRUE.,   &
     1245                right_border_pe = .FALSE., south_border_pe = .FALSE.,  &
    12431246                synchronous_exchange = .FALSE.
    12441247
Note: See TracChangeset for help on using the changeset viewer.