Changeset 4329 for palm/trunk/SOURCE/pres.f90
- Timestamp:
- Dec 10, 2019 3:46:36 PM (5 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/pres.f90 (modified) (23 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/pres.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 ! … … 69 72 ONLY: nbgp, ngp_2dh_outer, nx, nxl, nxlg, nxl_mg, nxr, nxrg, nxr_mg, & 70 73 ny, nys, nysg, nys_mg, nyn, nyng, nyn_mg, nzb, nzt, nzt_mg, & 71 wall_flags_ 074 wall_flags_static_0 72 75 73 76 USE kinds … … 187 190 volume_flow_l(1) = volume_flow_l(1) + u(k,j,i) * dzw(k) & 188 191 * MERGE( 1.0_wp, 0.0_wp, & 189 BTEST( wall_flags_ 0(k,j,i), 1 ) &192 BTEST( wall_flags_static_0(k,j,i), 1 ) & 190 193 ) 191 194 ENDDO … … 206 209 u(k,j,i) = u(k,j,i) + volume_flow_offset(1) & 207 210 * MERGE( 1.0_wp, 0.0_wp, & 208 BTEST( wall_flags_ 0(k,j,i), 1 ) &211 BTEST( wall_flags_static_0(k,j,i), 1 ) & 209 212 ) 210 213 ENDDO … … 232 235 volume_flow_l(2) = volume_flow_l(2) + v(k,j,i) * dzw(k) & 233 236 * MERGE( 1.0_wp, 0.0_wp, & 234 BTEST( wall_flags_ 0(k,j,i), 2 ) &237 BTEST( wall_flags_static_0(k,j,i), 2 ) & 235 238 ) 236 239 ENDDO … … 251 254 v(k,j,i) = v(k,j,i) + volume_flow_offset(2) & 252 255 * MERGE( 1.0_wp, 0.0_wp, & 253 BTEST( wall_flags_ 0(k,j,i), 2 ) &256 BTEST( wall_flags_static_0(k,j,i), 2 ) & 254 257 ) 255 258 ENDDO … … 280 283 DO k = nzb+1, nzt 281 284 w_l_l(k) = w_l_l(k) + w(k,j,i) & 282 * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 3 ) )285 * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 3 ) ) 283 286 ENDDO 284 287 ENDDO … … 297 300 DO k = nzb+1, nzt 298 301 w(k,j,i) = w(k,j,i) - w_l(k) & 299 * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_ 0(k,j,i), 3 ) )302 * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_static_0(k,j,i), 3 ) ) 300 303 ENDDO 301 304 ENDDO … … 344 347 ) * ddt_3d * d_weight_pres & 345 348 * MERGE( 1.0_wp, 0.0_wp, & 346 BTEST( wall_flags_ 0(k,j,i), 0 ) &349 BTEST( wall_flags_static_0(k,j,i), 0 ) & 347 350 ) 348 351 ENDDO … … 352 355 threadsum = threadsum + ABS( d(k,j,i) ) & 353 356 * MERGE( 1.0_wp, 0.0_wp, & 354 BTEST( wall_flags_ 0(k,j,i), 0 ) &357 BTEST( wall_flags_static_0(k,j,i), 0 ) & 355 358 ) 356 359 ENDDO … … 369 372 !$OMP DO SCHEDULE( STATIC ) 370 373 !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) & 371 !$ACC PRESENT(u, v, w, rho_air, rho_air_zw, ddzw, wall_flags_ 0) &374 !$ACC PRESENT(u, v, w, rho_air, rho_air_zw, ddzw, wall_flags_static_0) & 372 375 !$ACC PRESENT(d) 373 376 DO i = nxl, nxr … … 380 383 ) * ddt_3d * d_weight_pres & 381 384 * MERGE( 1.0_wp, 0.0_wp, & 382 BTEST( wall_flags_ 0(k,j,i), 0 ) &385 BTEST( wall_flags_static_0(k,j,i), 0 ) & 383 386 ) 384 387 ENDDO … … 630 633 !$OMP DO 631 634 !$ACC PARALLEL LOOP COLLAPSE(2) PRIVATE(i, j, k) & 632 !$ACC PRESENT(u, v, w, tend, ddzu, wall_flags_ 0)635 !$ACC PRESENT(u, v, w, tend, ddzu, wall_flags_static_0) 633 636 DO i = nxl, nxr 634 637 DO j = nys, nyn … … 639 642 * weight_pres_l & 640 643 * MERGE( 1.0_wp, 0.0_wp, & 641 BTEST( wall_flags_ 0(k,j,i), 3 ) &644 BTEST( wall_flags_static_0(k,j,i), 3 ) & 642 645 ) 643 646 ENDDO … … 648 651 * weight_pres_l & 649 652 * MERGE( 1.0_wp, 0.0_wp, & 650 BTEST( wall_flags_ 0(k,j,i), 1 ) &653 BTEST( wall_flags_static_0(k,j,i), 1 ) & 651 654 ) 652 655 ENDDO … … 657 660 * weight_pres_l & 658 661 * MERGE( 1.0_wp, 0.0_wp, & 659 BTEST( wall_flags_ 0(k,j,i), 2 ) &662 BTEST( wall_flags_static_0(k,j,i), 2 ) & 660 663 ) 661 664 ENDDO … … 688 691 volume_flow_l(1) = volume_flow_l(1) + u(k,j,nxr) * dzw(k) & 689 692 * MERGE( 1.0_wp, 0.0_wp, & 690 BTEST( wall_flags_ 0(k,j,nxr), 1 )&693 BTEST( wall_flags_static_0(k,j,nxr), 1 )& 691 694 ) 692 695 ENDDO … … 707 710 volume_flow_l(2) = volume_flow_l(2) + v(k,nyn,i) * dzw(k) & 708 711 * MERGE( 1.0_wp, 0.0_wp, & 709 BTEST( wall_flags_ 0(k,nyn,i), 2 )&712 BTEST( wall_flags_static_0(k,nyn,i), 2 )& 710 713 ) 711 714 ENDDO … … 738 741 u(k,j,i) = u(k,j,i) + volume_flow_offset(1) & 739 742 * MERGE( 1.0_wp, 0.0_wp, & 740 BTEST( wall_flags_ 0(k,j,i), 1 ) &743 BTEST( wall_flags_static_0(k,j,i), 1 ) & 741 744 ) 742 745 ENDDO … … 744 747 v(k,j,i) = v(k,j,i) + volume_flow_offset(2) & 745 748 * MERGE( 1.0_wp, 0.0_wp, & 746 BTEST( wall_flags_ 0(k,j,i), 2 ) &749 BTEST( wall_flags_static_0(k,j,i), 2 ) & 747 750 ) 748 751 ENDDO … … 788 791 w(k-1,j,i) * rho_air_zw(k-1) ) * ddzw(k) & 789 792 ) * MERGE( 1.0_wp, 0.0_wp, & 790 BTEST( wall_flags_ 0(k,j,i), 0 ) &793 BTEST( wall_flags_static_0(k,j,i), 0 ) & 791 794 ) 792 795 ENDDO … … 799 802 !$OMP DO SCHEDULE( STATIC ) 800 803 !$ACC PARALLEL LOOP COLLAPSE(3) PRIVATE(i, j, k) & 801 !$ACC PRESENT(u, v, w, rho_air, rho_air_zw, ddzw, wall_flags_ 0) &804 !$ACC PRESENT(u, v, w, rho_air, rho_air_zw, ddzw, wall_flags_static_0) & 802 805 !$ACC PRESENT(d) 803 806 DO i = nxl, nxr … … 809 812 w(k-1,j,i) * rho_air_zw(k-1) ) * ddzw(k) & 810 813 ) * MERGE( 1.0_wp, 0.0_wp, & 811 BTEST( wall_flags_ 0(k,j,i), 0 ) &814 BTEST( wall_flags_static_0(k,j,i), 0 ) & 812 815 ) 813 816 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.
