Ignore:
Timestamp:
Aug 9, 2012 8:28:32 AM (9 years ago)
Author:
fricke
Message:

merge fricke branch back into trunk

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk

  • palm/trunk/SOURCE

  • palm/trunk/SOURCE/init_pegrid.f90

    r810 r978  
    44! Current revisions:
    55! -----------------
     6! dirichlet/neumann and neumann/dirichlet added
     7! nxlu and nysv are also calculated for inflow boundary
    68!
    79! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!!
     
    11081110!-- horizontal boundary conditions.
    11091111    IF ( pleft == MPI_PROC_NULL )  THEN
    1110        IF ( bc_lr == 'dirichlet/radiation' )  THEN
     1112       IF ( bc_lr == 'dirichlet/radiation' .OR. bc_lr == 'dirichlet/neumann' )  THEN
    11111113          inflow_l  = .TRUE.
    1112        ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
     1114       ELSEIF ( bc_lr == 'radiation/dirichlet' .OR. bc_lr == 'neumann/dirichlet' )  THEN
    11131115          outflow_l = .TRUE.
    11141116       ENDIF
     
    11161118
    11171119    IF ( pright == MPI_PROC_NULL )  THEN
    1118        IF ( bc_lr == 'dirichlet/radiation' )  THEN
     1120       IF ( bc_lr == 'dirichlet/radiation' .OR. bc_lr == 'dirichlet/neumann' )  THEN
    11191121          outflow_r = .TRUE.
    1120        ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
     1122       ELSEIF ( bc_lr == 'radiation/dirichlet' .OR. bc_lr == 'neumann/dirichlet' )  THEN
    11211123          inflow_r  = .TRUE.
    11221124       ENDIF
     
    11241126
    11251127    IF ( psouth == MPI_PROC_NULL )  THEN
    1126        IF ( bc_ns == 'dirichlet/radiation' )  THEN
     1128       IF ( bc_ns == 'dirichlet/radiation' .OR. bc_ns == 'dirichlet/neumann' )  THEN
    11271129          outflow_s = .TRUE.
    1128        ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
     1130       ELSEIF ( bc_ns == 'radiation/dirichlet' .OR. bc_ns == 'neumann/dirichlet' )  THEN
    11291131          inflow_s  = .TRUE.
    11301132       ENDIF
     
    11321134
    11331135    IF ( pnorth == MPI_PROC_NULL )  THEN
    1134        IF ( bc_ns == 'dirichlet/radiation' )  THEN
     1136       IF ( bc_ns == 'dirichlet/radiation' .OR. bc_ns == 'dirichlet/neumann' )  THEN
    11351137          inflow_n  = .TRUE.
    1136        ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
     1138       ELSEIF ( bc_ns == 'radiation/dirichlet' .OR. bc_ns == 'neumann/dirichlet' )  THEN
    11371139          outflow_n = .TRUE.
    11381140       ENDIF
     
    11641166
    11651167#elif ! defined ( __parallel )
    1166     IF ( bc_lr == 'dirichlet/radiation' )  THEN
     1168    IF ( bc_lr == 'dirichlet/radiation' .OR. bc_lr == 'dirichlet/neumann' )  THEN
    11671169       inflow_l  = .TRUE.
    11681170       outflow_r = .TRUE.
    1169     ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
     1171    ELSEIF ( bc_lr == 'radiation/dirichlet' .OR. bc_lr == 'neumann/dirichlet' )  THEN
    11701172       outflow_l = .TRUE.
    11711173       inflow_r  = .TRUE.
    11721174    ENDIF
    11731175
    1174     IF ( bc_ns == 'dirichlet/radiation' )  THEN
     1176    IF ( bc_ns == 'dirichlet/radiation' .OR. bc_ns == 'dirichlet/neumann' )  THEN
    11751177       inflow_n  = .TRUE.
    11761178       outflow_s = .TRUE.
    1177     ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
     1179    ELSEIF ( bc_ns == 'radiation/dirichlet' .OR. bc_ns == 'neumann/dirichlet' )  THEN
    11781180       outflow_n = .TRUE.
    11791181       inflow_s  = .TRUE.
     
    11821184
    11831185!
    1184 !-- At the outflow, u or v, respectively, have to be calculated for one more
    1185 !-- grid point.
    1186     IF ( outflow_l )  THEN
     1186!-- At the inflow or outflow, u or v, respectively, have to be calculated for
     1187!-- one more grid point.
     1188    IF ( inflow_l .OR. outflow_l )  THEN
    11871189       nxlu = nxl + 1
    11881190    ELSE
    11891191       nxlu = nxl
    11901192    ENDIF
    1191     IF ( outflow_s )  THEN
     1193    IF ( inflow_s .OR. outflow_s )  THEN
    11921194       nysv = nys + 1
    11931195    ELSE
Note: See TracChangeset for help on using the changeset viewer.