Changeset 4328 for palm/trunk
 Timestamp:
 Dec 9, 2019 6:53:04 PM (4 years ago)
 Location:
 palm/trunk/SOURCE
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

palm/trunk/SOURCE/advec_ws.f90
r4327 r4328 25 25 !  26 26 ! $Id$ 27 ! Minor formatting adjustments 28 ! 29 ! 4327 20191206 14:48:31Z Giersch 27 30 ! Setting of advection flags for vertical fluxes of w revised, air density for 28 31 ! vertical flux calculation of w at k=1 is considered now … … 2088 2091 ) 2089 2092 2090 diss_l_u(k,j,tn) =  ABS( u_comp_l ) * (&2093 diss_l_u(k,j,tn) =  ABS( u_comp_l ) * ( & 2091 2094 ( 10.0_wp * ibit2 * adv_mom_5 & 2092 2095 + 3.0_wp * ibit1 * adv_mom_3 & … … 2101 2104 ) * & 2102 2105 ( u(k,j,i+2)  u(k,j,i3) ) & 2103 2106 ) 2104 2107 2105 2108 ENDDO … … 2387 2390  ( u(k,j,i) + u(k,j,i1) ) & 2388 2391 * ( & 2389 REAL( IBITS(advc_flags_m(k,j,i1),0,1), KIND = wp )&2392 REAL( IBITS(advc_flags_m(k,j,i1),0,1), KIND = wp ) & 2390 2393 + REAL( IBITS(advc_flags_m(k,j,i1),1,1), KIND = wp ) & 2391 2394 + REAL( IBITS(advc_flags_m(k,j,i1),2,1), KIND = wp ) & … … 2591 2594 ) 2592 2595 2593 diss_l_v(k,j,tn) =  ABS( u_comp(k) ) * (&2596 diss_l_v(k,j,tn) =  ABS( u_comp(k) ) * ( & 2594 2597 ( 10.0_wp * ibit11 * adv_mom_5 & 2595 2598 + 3.0_wp * ibit10 * adv_mom_3 & … … 2604 2607 ) * & 2605 2608 ( v(k,j,i+2)  v(k,j,i3) ) & 2606 2609 ) 2607 2610 2608 2611 ENDDO … … 2935 2938 ibit11 = REAL( IBITS(advc_flags_m(k,j,i),11,1), KIND = wp ) 2936 2939 ibit10 = REAL( IBITS(advc_flags_m(k,j,i),10,1), KIND = wp ) 2937 ibit9 = REAL( IBITS(advc_flags_m(k,j,i),9,1), KIND = wp )2940 ibit9 = REAL( IBITS(advc_flags_m(k,j,i),9,1), KIND = wp ) 2938 2941 2939 2942 ibit14 = REAL( IBITS(advc_flags_m(k,j,i),14,1), KIND = wp ) … … 3213 3216 ) 3214 3217 3215 diss_l_w(k,j,tn) =  ABS( u_comp(k) ) * (&3218 diss_l_w(k,j,tn) =  ABS( u_comp(k) ) * ( & 3216 3219 ( 10.0_wp * ibit20 * adv_mom_5 & 3217 3220 + 3.0_wp * ibit19 * adv_mom_3 & … … 3226 3229 ) * & 3227 3230 ( w(k,j,i+2)  w(k,j,i3) ) & 3228 3231 ) 3229 3232 3230 3233 ENDDO 
palm/trunk/SOURCE/init_grid.f90
r4314 r4328 25 25 !  26 26 ! $Id$ 27 ! Minor change in nzb_max computation. Commentation added. 28 ! 29 ! 4314 20191129 10:29:20Z suehring 27 30 ! Set additional topography flag 4 to mark topography grid points emerged 28 31 ! from the filtering process. … … 612 615 ! Determine the maximum level of topography. It is used for 613 616 ! steering the degradation of order of the applied advection scheme, 614 ! as well in the lpm. 617 ! as well in the lpm. 615 618 k_top = 0 616 619 DO i = nxl, nxr … … 622 625 ENDDO 623 626 #if defined( __parallel ) 624 CALL MPI_ALLREDUCE( k_top + 1, nzb_max, 1, MPI_INTEGER, & !is +1 really necessary here?627 CALL MPI_ALLREDUCE( k_top, nzb_max, 1, MPI_INTEGER, & 625 628 MPI_MAX, comm2d, ierr ) 626 629 #else 627 nzb_max = k_top + 1630 nzb_max = k_top 628 631 #endif 629 ! 630 ! If topography extents up to the model top, limit nzb_max to nzt. 631 nzb_max = MIN( nzb_max, nzt ) 632 ! 633 ! Increment nzb_max by 1 in order to allow for proper diverengence correction. 634 ! Further, in case topography extents up to the model top, limit to nzt. 635 nzb_max = MIN( nzb_max+1, nzt ) 632 636 ! 633 637 ! Determine minimum index of topography. Usually, this will be nzb. In case
Note: See TracChangeset
for help on using the changeset viewer.