Changeset 1567 for palm/trunk/SOURCE/flow_statistics.f90

Timestamp:

Mar 10, 2015 5:57:55 PM (9 years ago)

Author:

suehring

Message:

Bugfixes in monotonic limter.

File:

• palm/trunk/SOURCE/flow_statistics.f90 (modified) (13 diffs)

palm/trunk/SOURCE/flow_statistics.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-! 
+! Reverse modifications made for monotonic limiter.
 ! 
 ! Former revisions:
@@ -146 +146 @@
         ONLY:   average_count_pr, cloud_droplets, cloud_physics, do_sum,       &
                 dt_3d, g, humidity, icloud_scheme, kappa, large_scale_forcing, &
-                large_scale_subsidence, max_pr_user, message_string,           &
-                monotonic_adjustment, ocean,                                   &
+                large_scale_subsidence, max_pr_user, message_string, ocean,    &
                 passive_scalar, precipitation, simulated_time,                 &
                 use_subsidence_tendencies, use_surface_fluxes, use_top_fluxes, &
@@ -285 +284 @@
        ENDIF
 
-       IF ( ws_scheme_sca .AND. .NOT. monotonic_adjustment                    &
-           .AND. sr == 0 )  THEN
+       IF ( ws_scheme_sca .AND. sr == 0 )  THEN
 
           DO  i = 0, threads_per_task-1
@@ -807 +805 @@
 !--             but so far there is no other suitable place to calculate)
                 IF ( ocean )  THEN
-                   IF( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR.      &
-                             sr /= 0 )  THEN
+                   IF( .NOT. ws_scheme_sca .OR. sr /= 0 )  THEN
                       pts = 0.5_wp * ( sa(k,j,i)   - hom(k,1,23,sr) +          &
                                        sa(k+1,j,i) - hom(k+1,1,23,sr) )
@@ -859 +856 @@
                       ENDIF
                    ELSE
-                      IF( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR.   &
-                                sr /= 0 )  THEN
+                      IF( .NOT. ws_scheme_sca .OR. sr /= 0 )  THEN
                          pts = 0.5_wp * ( vpt(k,j,i)   - hom(k,1,44,sr) +      &
                                           vpt(k+1,j,i) - hom(k+1,1,44,sr) )
                          sums_l(k,46,tn) = sums_l(k,46,tn) + pts * w(k,j,i) *  &
                                                              rmask(j,i,sr)
-                      ELSE IF ( ws_scheme_sca .AND. .NOT. monotonic_adjustment &
-                                .AND. sr == 0 )  THEN
+                      ELSE IF ( ws_scheme_sca .AND. sr == 0 )  THEN
                          sums_l(k,46,tn) = ( 1.0_wp + 0.61_wp *                & 
                                              hom(k,1,41,sr) ) *                &
@@ -878 +873 @@
 !--             Passive scalar flux
                 IF ( passive_scalar .AND. ( .NOT. ws_scheme_sca                &
-                     .OR. monotonic_adjustment .OR. sr /= 0 ) )  THEN
+                     .OR. sr /= 0 ) )  THEN
                    pts = 0.5_wp * ( q(k,j,i)   - hom(k,1,41,sr) +              &
                                     q(k+1,j,i) - hom(k+1,1,41,sr) )
@@ -922 +917 @@
 
        ENDIF
-       IF ( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR. sr /= 0 )  THEN
+       IF ( .NOT. ws_scheme_sca .OR. sr /= 0 )  THEN
          !$OMP DO
          DO  i = nxl, nxr
@@ -1533 +1528 @@
         ONLY :  average_count_pr, cloud_droplets, cloud_physics, do_sum,       &
                 dt_3d, g, humidity, icloud_scheme, kappa, large_scale_forcing, &
-                large_scale_subsidence, max_pr_user, message_string,           &
-                monotonic_adjustment, ocean,                                   &
+                large_scale_subsidence, max_pr_user, message_string, ocean,    &
                 passive_scalar, precipitation, simulated_time,                 &
                 use_subsidence_tendencies, use_surface_fluxes, use_top_fluxes, &
@@ -1672 +1666 @@
        ENDIF
 
-       IF ( ws_scheme_sca .AND. .NOT. monotonic_adjustment .AND. sr == 0 )  THEN
+       IF ( ws_scheme_sca .AND. sr == 0 )  THEN
 
           DO  i = 0, threads_per_task-1
@@ -2495 +2489 @@
        IF ( ocean )  THEN
 
-          IF( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR. sr /= 0 )  THEN
+          IF( .NOT. ws_scheme_sca .OR. sr /= 0 )  THEN
 
              !$acc parallel loop gang present( hom, rflags_invers, rmask, sa, sums_l, w ) create( s1 )
@@ -2637 +2631 @@
           ELSE
 
-             IF( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR.  sr /= 0 )  THEN
+             IF( .NOT. ws_scheme_sca  .OR.  sr /= 0 )  THEN
 
                 !$acc parallel loop gang present( hom, rflags_invers, rmask, sums_l, vpt, w ) create( s1 )
@@ -2669 +2663 @@
 !
 !--    Passive scalar flux
-       IF ( passive_scalar  .AND.  ( .NOT. ws_scheme_sca .OR. monotonic_adjustment &
-                                     .OR.  sr /= 0 ) )  THEN
+       IF ( passive_scalar  .AND.  ( .NOT. ws_scheme_sca  .OR.  sr /= 0 ) )  THEN
 
           !$acc parallel loop gang present( hom, q, rflags_invers, rmask, sums_l, w ) create( s1 )
@@ -2724 +2717 @@
        ENDIF
 
-       IF ( .NOT. ws_scheme_sca .OR. monotonic_adjustment .OR.  sr /= 0 )  THEN
+       IF ( .NOT. ws_scheme_sca  .OR.  sr /= 0 )  THEN
 
           !$OMP DO