Changeset 3022


Ignore:
Timestamp:
May 18, 2018 11:12:35 AM (3 years ago)
Author:
suehring
Message:

Revise recent bugfix in nested runs at left and south boundary; bugfix in advection of u in case of OpenMP parallelization; bugfix in plant transpiration

Location:
palm/trunk/SOURCE
Files:
4 edited

Legend:

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

    r2731 r3022  
    2525! -----------------
    2626! $Id$
     27! Bugfix in calculation of left-sided fluxes for u-component in OpenMP case.
     28!
     29! 2731 2018-01-09 17:44:02Z suehring
    2730! Enable loop vectorization by splitting the k-loop
    2831!
     
    17431746
    17441747       USE indices,                                                           &
    1745            ONLY:  nxl, nxr, nyn, nys, nzb, nzb_max, nzt, advc_flags_1
     1748           ONLY:  nxl, nxlu, nxr, nyn, nys, nzb, nzb_max, nzt, advc_flags_1
    17461749
    17471750       USE kinds
     
    18491852!
    18501853!--    Compute leftside fluxes for the respective boundary of PE
    1851        IF ( i == i_omp )  THEN
     1854       IF ( i == i_omp  .OR.  i == nxlu )  THEN
    18521855       
    18531856          DO  k = nzb+1, nzb_max
  • palm/trunk/SOURCE/plant_canopy_model_mod.f90

    r3014 r3022  
    2525! -----------------
    2626! $Id$
     27! Bugfix in allocation of transpiration rate
     28!
     29! 3014 2018-05-09 08:42:38Z maronga
    2730! Bugfix: nzb_do and nzt_do were not used for 3d data output
    2831! Added pc_transpiration_rate
     
    894897
    895898          ALLOCATE( cum_lai_hf(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                 &
    896                     pc_heating_rate(nzb:nzt+1,nysg:nyng,nxlg:nxrg),            &
    897                     pc_transpiration_rate(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
     899                    pc_heating_rate(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
    898900!
    899901!--       Piecewise calculation of the cumulative leaf area index by vertical
     
    962964                DO  k = 1, pch_index_ji(j,i)
    963965                   IF ( cum_lai_hf(0,j,i) /= 0.0_wp )  THEN
    964                       pc_heating_rate(k,j,i) = cthf *                             &
    965                                 ( exp(-ext_coef*cum_lai_hf(k,j,i)) -              &
     966                      pc_heating_rate(k,j,i) = cthf *                          &
     967                                ( exp(-ext_coef*cum_lai_hf(k,j,i)) -           &
    966968                                  exp(-ext_coef*cum_lai_hf(k-1,j,i) ) ) / dzw(k)
    967969                   ENDIF
     
    971973
    972974       ENDIF
     975!
     976!--    Allocate transpiration rate
     977       IF ( humidity )                                                         &
     978          ALLOCATE( pc_transpiration_rate(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
    973979
    974980
  • palm/trunk/SOURCE/pmc_interface_mod.f90

    r3021 r3022  
    2525! -----------------
    2626! $Id$
     27! Minor fix - working precision added to real number
     28!
     29! 3021 2018-05-16 08:14:20Z maronga
    2730! Bugfix: variable lcr was defined as INTENT(OUT) instead of INTENT(INOUT)
    2831!
     
    27152718                   more = .TRUE.
    27162719                ELSE
    2717                    lcr(lcorr) = 1.0
     2720                   lcr(lcorr) = 1.0_wp
    27182721                   more = .FALSE.
    27192722                ENDIF
  • palm/trunk/SOURCE/prognostic_equations.f90

    r3021 r3022  
    2525! -----------------
    2626! $Id$
     27! Revise recent bugfix for nesting
     28!
     29! 3021 2018-05-16 08:14:20Z maronga
    2730! Bugfix in IF clause for nesting
    2831!
     
    298301               intermediate_timestep_count_max, large_scale_forcing,           &
    299302               large_scale_subsidence, microphysics_morrison,                  &
    300                microphysics_seifert, microphysics_sat_adjust, nest_bound_s,    &
    301                neutral, nudging,                                               &
     303               microphysics_seifert, microphysics_sat_adjust, neutral, nudging,&
    302304               ocean, outflow_l, outflow_s, passive_scalar, plant_canopy,      &
    303305               prho_reference, prho_reference,                                 &
     
    527529       DO  j = nys, nyn
    528530!
    529 !--       Tendency terms for u-velocity component
    530           IF ( .NOT. outflow_l  .OR.  i > nxl )  THEN
     531!--       Tendency terms for u-velocity component. Please note, in case of
     532!--       non-cyclic boundary conditions the grid point i=0 is excluded from
     533!--       the prognostic equations for the u-component.   
     534          IF ( i >= nxlu )  THEN
    531535
    532536             tend(:,j,i) = 0.0_wp
     
    598602
    599603          ENDIF
    600 
    601 !
    602 !--       Tendency terms for v-velocity component
    603           IF ( (.NOT. outflow_s .AND. .NOT. nest_bound_s ) .OR.  j > nys )  THEN
     604!
     605!--       Tendency terms for v-velocity component. Please note, in case of
     606!--       non-cyclic boundary conditions the grid point j=0 is excluded from
     607!--       the prognostic equations for the v-component. !--       
     608          IF ( j >= nysv )  THEN
    604609
    605610             tend(:,j,i) = 0.0_wp
Note: See TracChangeset for help on using the changeset viewer.