Changeset 4329 for palm/trunk/SOURCE/flow_statistics.f90
- Timestamp:
- Dec 10, 2019 3:46:36 PM (4 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/flow_statistics.f90 (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/flow_statistics.f90
r4182 r4329 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Renamed wall_flags_0 to wall_flags_static_0 28 ! 29 ! 4182 2019-08-22 15:20:23Z scharf 27 30 ! Corrected "Former revisions" section 28 31 ! … … 92 95 ONLY: ngp_2dh, ngp_2dh_s_inner, ngp_3d, ngp_3d_inner, ngp_sums, & 93 96 ngp_sums_ls, nxl, nxr, nyn, nys, nzb, nzt, topo_min_level, & 94 wall_flags_ 097 wall_flags_static_0 95 98 96 99 USE kinds … … 254 257 !$OMP DO 255 258 !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k, flag) & 256 !$ACC PRESENT(wall_flags_ 0, u, v, pt, rmask, sums_l)259 !$ACC PRESENT(wall_flags_static_0, u, v, pt, rmask, sums_l) 257 260 DO i = nxl, nxr 258 261 DO j = nys, nyn 259 262 DO k = nzb, nzt+1 260 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 22 ) )263 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 22 ) ) 261 264 !$ACC ATOMIC 262 265 sums_l(k,1,tn) = sums_l(k,1,tn) + u(k,j,i) * rmask(j,i,sr) & … … 283 286 * rmask(j,i,sr) & 284 287 * MERGE( 1.0_wp, 0.0_wp, & 285 BTEST( wall_flags_ 0(k,j,i), 22 ) )288 BTEST( wall_flags_static_0(k,j,i), 22 ) ) 286 289 ENDDO 287 290 ENDDO … … 298 301 DO j = nys, nyn 299 302 DO k = nzb, nzt+1 300 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 22 ) )303 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 22 ) ) 301 304 sums_l(k,44,tn) = sums_l(k,44,tn) + & 302 305 vpt(k,j,i) * rmask(j,i,sr) * flag … … 311 314 DO j = nys, nyn 312 315 DO k = nzb, nzt+1 313 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 22 ) )316 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 22 ) ) 314 317 sums_l(k,42,tn) = sums_l(k,42,tn) + & 315 318 ( q(k,j,i) - ql(k,j,i) ) * rmask(j,i,sr) & … … 335 338 * rmask(j,i,sr) & 336 339 * MERGE( 1.0_wp, 0.0_wp, & 337 BTEST( wall_flags_ 0(k,j,i), 22 ) )340 BTEST( wall_flags_static_0(k,j,i), 22 ) ) 338 341 ENDDO 339 342 ENDDO … … 476 479 !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(i, j, k, m) & 477 480 !$ACC PRIVATE(sums_l_etot, flag) & 478 !$ACC PRESENT(wall_flags_ 0, rmask, momentumflux_output_conversion) &481 !$ACC PRESENT(wall_flags_static_0, rmask, momentumflux_output_conversion) & 479 482 !$ACC PRESENT(hom(:,1,4,sr)) & 480 483 !$ACC PRESENT(e, u, v, w, km, kh, p, pt) & … … 485 488 sums_l_etot = 0.0_wp 486 489 DO k = nzb, nzt+1 487 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 22 ) )490 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 22 ) ) 488 491 ! 489 492 !-- Prognostic and diagnostic variables … … 653 656 DO j = nys, nyn 654 657 DO k = nzb, nzt+1 655 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 22 ) )658 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 22 ) ) 656 659 657 660 u2 = u(k,j,i)**2 … … 685 688 !$OMP DO 686 689 !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k, flag, w2, ust2, vst2) & 687 !$ACC PRESENT(wall_flags_ 0, u, v, w, rmask, hom(:,1,1:2,sr)) &690 !$ACC PRESENT(wall_flags_static_0, u, v, w, rmask, hom(:,1,1:2,sr)) & 688 691 !$ACC PRESENT(sums_l) 689 692 DO i = nxl, nxr 690 693 DO j = nys, nyn 691 694 DO k = nzb, nzt+1 692 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 22 ) )695 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 22 ) ) 693 696 694 697 w2 = w(k,j,i)**2 … … 714 717 !$ACC PRIVATE(ki, flag, ust, vst, pts) & 715 718 !$ACC PRESENT(kh, km, u, v, w, pt) & 716 !$ACC PRESENT(wall_flags_ 0, rmask, ddzu, rho_air_zw, hom(:,1,1:4,sr)) &719 !$ACC PRESENT(wall_flags_static_0, rmask, ddzu, rho_air_zw, hom(:,1,1:4,sr)) & 717 720 !$ACC PRESENT(heatflux_output_conversion, momentumflux_output_conversion) & 718 721 !$ACC PRESENT(surf_def_h(0:2), surf_lsm_h, surf_usm_h) & … … 732 735 DO k = nzb, nzt 733 736 flag = MERGE( 1.0_wp, 0.0_wp, & 734 BTEST( wall_flags_ 0(k,j,i), 23 ) ) * &737 BTEST( wall_flags_static_0(k,j,i), 23 ) ) * & 735 738 MERGE( 1.0_wp, 0.0_wp, & 736 BTEST( wall_flags_ 0(k,j,i), 9 ) )739 BTEST( wall_flags_static_0(k,j,i), 9 ) ) 737 740 ! 738 741 !-- Momentum flux w"u" … … 1206 1209 !-- rearranged according to the staggered grid. 1207 1210 DO k = nzb, nzt 1208 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 22 ) )1211 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 22 ) ) 1209 1212 ust = 0.5_wp * ( u(k,j,i) - hom(k,1,1,sr) + & 1210 1213 u(k+1,j,i) - hom(k+1,1,1,sr) ) … … 1395 1398 !-- fluxes, which are added further below. 1396 1399 flag = MERGE( 1.0_wp, 0.0_wp, & 1397 BTEST( wall_flags_ 0(k,j,i), 23 ) ) * &1400 BTEST( wall_flags_static_0(k,j,i), 23 ) ) * & 1398 1401 MERGE( 1.0_wp, 0.0_wp, & 1399 BTEST( wall_flags_ 0(k,j,i), 9 ) )1402 BTEST( wall_flags_static_0(k,j,i), 9 ) ) 1400 1403 1401 1404 ust = 0.5_wp * ( u(k,j,i) - hom(k,1,1,sr) + & … … 1430 1433 DO k = nzb, nzt 1431 1434 flag = MERGE( 1.0_wp, 0.0_wp, & 1432 BTEST( wall_flags_ 0(k,j,i), 23 ) ) * &1435 BTEST( wall_flags_static_0(k,j,i), 23 ) ) * & 1433 1436 MERGE( 1.0_wp, 0.0_wp, & 1434 BTEST( wall_flags_ 0(k,j,i), 9 ) )1437 BTEST( wall_flags_static_0(k,j,i), 9 ) ) 1435 1438 ! 1436 1439 !-- Vertical heat flux … … 1481 1484 DO j = nys, nyn 1482 1485 DO k = nzb+1, nzt 1483 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 0 ) )1486 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 0 ) ) 1484 1487 1485 1488 sums_ll(k,1) = sums_ll(k,1) + 0.5_wp * w(k,j,i) * ( & … … 1523 1526 DO k = nzb+1, nzt 1524 1527 1525 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 0 ) )1528 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 0 ) ) 1526 1529 1527 1530 sums_l(k,57,tn) = sums_l(k,57,tn) - 0.5_wp * ( & … … 1552 1555 DO j = nys, nyn 1553 1556 DO k = nzb+1, nzt 1554 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 0 ) )1557 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 0 ) ) 1555 1558 ! 1556 1559 !-- Subgrid horizontal heat fluxes u"pt", v"pt" … … 1650 1653 DO j = nys, nyn 1651 1654 DO k = nzb+1, nzt+1 1652 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 0 ) )1655 flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 0 ) ) 1653 1656 1654 1657 sums_l(k,100,tn) = sums_l(k,100,tn) + rad_lw_in(k,j,i) &
Note: See TracChangeset
for help on using the changeset viewer.
