Changeset 1557 for palm/trunk/SOURCE/flow_statistics.f90
 Timestamp:
 Mar 5, 2015 4:43:04 PM (9 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

palm/trunk/SOURCE/flow_statistics.f90
r1556 r1557 21 21 ! Current revisions: 22 22 !  23 ! 23 ! Adjustments for monotonic limiter 24 24 ! 25 25 ! Former revisions: … … 143 143 ONLY: average_count_pr, cloud_droplets, cloud_physics, do_sum, & 144 144 dt_3d, g, humidity, icloud_scheme, kappa, large_scale_forcing, & 145 large_scale_subsidence, max_pr_user, message_string, ocean, & 145 large_scale_subsidence, max_pr_user, message_string, & 146 monotonic_adjustment, ocean, & 146 147 passive_scalar, precipitation, simulated_time, & 147 148 use_subsidence_tendencies, use_surface_fluxes, use_top_fluxes, & … … 281 282 ENDIF 282 283 283 IF ( ws_scheme_sca .AND. sr == 0 ) THEN 284 IF ( ws_scheme_sca .AND. .NOT. monotonic_adjustment & 285 .AND. sr == 0 ) THEN 284 286 285 287 DO i = 0, threads_per_task1 … … 802 804 ! but so far there is no other suitable place to calculate) 803 805 IF ( ocean ) THEN 804 IF( .NOT. ws_scheme_sca .OR. sr /= 0 ) THEN 806 IF( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR. & 807 sr /= 0 ) THEN 805 808 pts = 0.5_wp * ( sa(k,j,i)  hom(k,1,23,sr) + & 806 809 sa(k+1,j,i)  hom(k+1,1,23,sr) ) … … 853 856 ENDIF 854 857 ELSE 855 IF( .NOT. ws_scheme_sca .OR. sr /= 0 ) THEN 858 IF( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR. & 859 sr /= 0 ) THEN 856 860 pts = 0.5_wp * ( vpt(k,j,i)  hom(k,1,44,sr) + & 857 861 vpt(k+1,j,i)  hom(k+1,1,44,sr) ) 858 862 sums_l(k,46,tn) = sums_l(k,46,tn) + pts * w(k,j,i) * & 859 863 rmask(j,i,sr) 860 ELSE IF ( ws_scheme_sca .AND. sr == 0 ) THEN 864 ELSE IF ( ws_scheme_sca .AND. .NOT. monotonic_adjustment & 865 .AND. sr == 0 ) THEN 861 866 sums_l(k,46,tn) = ( 1.0_wp + 0.61_wp * & 862 867 hom(k,1,41,sr) ) * & … … 870 875 ! Passive scalar flux 871 876 IF ( passive_scalar .AND. ( .NOT. ws_scheme_sca & 872 .OR. sr /= 0 ) ) THEN877 .OR. monotonic_adjustment .OR. sr /= 0 ) ) THEN 873 878 pts = 0.5_wp * ( q(k,j,i)  hom(k,1,41,sr) + & 874 879 q(k+1,j,i)  hom(k+1,1,41,sr) ) … … 914 919 915 920 ENDIF 916 IF ( .NOT. ws_scheme_sca .OR. sr /= 0 ) THEN921 IF ( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR. sr /= 0 ) THEN 917 922 !$OMP DO 918 923 DO i = nxl, nxr … … 1525 1530 ONLY : average_count_pr, cloud_droplets, cloud_physics, do_sum, & 1526 1531 dt_3d, g, humidity, icloud_scheme, kappa, large_scale_forcing, & 1527 large_scale_subsidence, max_pr_user, message_string, ocean, & 1532 large_scale_subsidence, max_pr_user, message_string, & 1533 monotonic_adjustment, ocean, & 1528 1534 passive_scalar, precipitation, simulated_time, & 1529 1535 use_subsidence_tendencies, use_surface_fluxes, use_top_fluxes, & … … 1663 1669 ENDIF 1664 1670 1665 IF ( ws_scheme_sca .AND. sr == 0 ) THEN1671 IF ( ws_scheme_sca .AND. .NOT. monotonic_adjustment .AND. sr == 0 ) THEN 1666 1672 1667 1673 DO i = 0, threads_per_task1 … … 2486 2492 IF ( ocean ) THEN 2487 2493 2488 IF( .NOT. ws_scheme_sca .OR. sr /= 0 ) THEN2494 IF( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR. sr /= 0 ) THEN 2489 2495 2490 2496 !$acc parallel loop gang present( hom, rflags_invers, rmask, sa, sums_l, w ) create( s1 ) … … 2628 2634 ELSE 2629 2635 2630 IF( .NOT. ws_scheme_sca .OR. sr /= 0 ) THEN2636 IF( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR. sr /= 0 ) THEN 2631 2637 2632 2638 !$acc parallel loop gang present( hom, rflags_invers, rmask, sums_l, vpt, w ) create( s1 ) … … 2660 2666 ! 2661 2667 ! Passive scalar flux 2662 IF ( passive_scalar .AND. ( .NOT. ws_scheme_sca .OR. sr /= 0 ) ) THEN 2668 IF ( passive_scalar .AND. ( .NOT. ws_scheme_sca .OR. monotonic_adjustment & 2669 .OR. sr /= 0 ) ) THEN 2663 2670 2664 2671 !$acc parallel loop gang present( hom, q, rflags_invers, rmask, sums_l, w ) create( s1 ) … … 2714 2721 ENDIF 2715 2722 2716 IF ( .NOT. ws_scheme_sca .OR. sr /= 0 ) THEN2723 IF ( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR. sr /= 0 ) THEN 2717 2724 2718 2725 !$OMP DO
Note: See TracChangeset
for help on using the changeset viewer.