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

Timestamp:

Apr 7, 2016 7:49:42 AM (5 years ago)

Author:

hoffmann

Message:

changes in LPM and bulk cloud microphysics

File:

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

palm/trunk/SOURCE/flow_statistics.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-!
+! Output of bulk microphysics simplified.
 !
 ! Former revisions:
@@ -193 +193 @@
     USE control_parameters,                                                    &
         ONLY:   average_count_pr, cloud_droplets, cloud_physics, do_sum,       &
-                dt_3d, g, humidity, icloud_scheme, kappa, large_scale_forcing, &
+                dt_3d, g, humidity, kappa, large_scale_forcing,                &
                 large_scale_subsidence, max_pr_user, message_string, neutral,  &
-                ocean, passive_scalar, precipitation, simulated_time,          &
+                microphysics_seifert, ocean, passive_scalar, simulated_time,   &
                 use_subsidence_tendencies, use_surface_fluxes, use_top_fluxes, &
                 ws_scheme_mom, ws_scheme_sca
@@ -898 +898 @@
                       sums_l(k,46,tn) = sums_l(k,46,tn) + pts * w(k,j,i) *     &
                                                           rmask(j,i,sr)
+                      sums_l(k,54,tn) = sums_l(k,54,tn) + ql(k,j,i) * rmask(j,i,sr)
+
                       IF ( .NOT. cloud_droplets )  THEN
                          pts = 0.5_wp *                                        &
@@ -906 +908 @@
                          sums_l(k,52,tn) = sums_l(k,52,tn) + pts * w(k,j,i) *  &
                                                              rmask(j,i,sr)
-                         IF ( icloud_scheme == 0  )  THEN
-                            sums_l(k,54,tn) = sums_l(k,54,tn) + ql(k,j,i) *    &
+                         sums_l(k,75,tn) = sums_l(k,75,tn) + qc(k,j,i) *       &
+                                                             rmask(j,i,sr)
+                         sums_l(k,76,tn) = sums_l(k,76,tn) + prr(k,j,i) *      &
+                                                             rmask(j,i,sr)
+                         IF ( microphysics_seifert )  THEN
+                            sums_l(k,73,tn) = sums_l(k,73,tn) + nr(k,j,i) *    &
                                                                 rmask(j,i,sr)
-                            sums_l(k,75,tn) = sums_l(k,75,tn) + qc(k,j,i) *    &
-                                                                rmask(j,i,sr)
-                            IF ( precipitation )  THEN
-                               sums_l(k,73,tn) = sums_l(k,73,tn) + nr(k,j,i) * &
-                                                                   rmask(j,i,sr)
-                               sums_l(k,74,tn) = sums_l(k,74,tn) + qr(k,j,i) * &
-                                                                   rmask(j,i,sr)
-                               sums_l(k,76,tn) = sums_l(k,76,tn) + prr(k,j,i) *&
-                                                                   rmask(j,i,sr)
-                            ENDIF
-                         ELSE
-                            sums_l(k,54,tn) = sums_l(k,54,tn) + ql(k,j,i) *    &
+                            sums_l(k,74,tn) = sums_l(k,74,tn) + qr(k,j,i) *    &
                                                                 rmask(j,i,sr)
                          ENDIF
-                      ELSE
-                         sums_l(k,54,tn) = sums_l(k,54,tn) + ql(k,j,i) *       &
-                                                             rmask(j,i,sr)
                       ENDIF
+
                    ELSE
                       IF( .NOT. ws_scheme_sca .OR. sr /= 0 )  THEN
@@ -1662 +1655 @@
     USE control_parameters,                                                    &
         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, neutral,  &
-                ocean, passive_scalar, precipitation, simulated_time,          &
-                use_subsidence_tendencies, use_surface_fluxes, use_top_fluxes, &
-                ws_scheme_mom, ws_scheme_sca
+                dt_3d, g, humidity, kappa, large_scale_forcing,                &
+                large_scale_subsidence, max_pr_user, message_string,           &
+                microphysics_seifert, neutral, ocean, passive_scalar,          &
+                simulated_time, use_subsidence_tendencies, use_surface_fluxes, &
+                use_top_fluxes, ws_scheme_mom, ws_scheme_sca
         
     USE cpulog,                                                                &
@@ -2774 +2767 @@
                 !$acc end parallel loop
 
-                IF ( icloud_scheme == 0  )  THEN
+                IF ( microphysics_seifert )  THEN
 
                    !$acc parallel loop gang present( qc, ql, rflags_invers, rmask, sums_l ) create( s1, s2 )
@@ -2791 +2784 @@
                    !$acc end parallel loop
 
-                   IF ( precipitation )  THEN
-
-                      !$acc parallel loop gang present( nr, qr, prr, rflags_invers, rmask, sums_l ) create( s1, s2, s3 )
-                      DO  k = nzb, nzt_diff
-                         s1 = 0
-                         s2 = 0
-                         s3 = 0
-                         !$acc loop vector collapse( 2 ) reduction( +: s1, s2, s3 )
-                         DO  i = nxl, nxr
-                            DO  j = nys, nyn
-                               s1 = s1 + nr(k,j,i)  * rmask(j,i,sr) * rflags_invers(j,i,k+1)
-                               s2 = s2 + qr(k,j,i)  * rmask(j,i,sr) * rflags_invers(j,i,k+1)
-                               s3 = s3 + prr(k,j,i) * rmask(j,i,sr) * rflags_invers(j,i,k+1)
-                            ENDDO
+                   !$acc parallel loop gang present( nr, qr, prr, rflags_invers, rmask, sums_l ) create( s1, s2, s3 )
+                   DO  k = nzb, nzt_diff
+                      s1 = 0
+                      s2 = 0
+                      s3 = 0
+                      !$acc loop vector collapse( 2 ) reduction( +: s1, s2, s3 )
+                      DO  i = nxl, nxr
+                         DO  j = nys, nyn
+                            s1 = s1 + nr(k,j,i)  * rmask(j,i,sr) * rflags_invers(j,i,k+1)
+                            s2 = s2 + qr(k,j,i)  * rmask(j,i,sr) * rflags_invers(j,i,k+1)
+                            s3 = s3 + prr(k,j,i) * rmask(j,i,sr) * rflags_invers(j,i,k+1)
                          ENDDO
-                         sums_l(k,73,tn) = s1
-                         sums_l(k,74,tn) = s2
-                         sums_l(k,76,tn) = s3
                       ENDDO
-                      !$acc end parallel loop
-
-                   ENDIF
+                      sums_l(k,73,tn) = s1
+                      sums_l(k,74,tn) = s2
+                      sums_l(k,76,tn) = s3
+                   ENDDO
+                   !$acc end parallel loop
 
                 ELSE