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

Timestamp:

Mar 26, 2013 6:16:16 PM (11 years ago)

Author:

hoffmann

Message:

optimization of two-moments cloud physics

File:

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

palm/trunk/SOURCE/flow_statistics.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! ql is calculated by calc_liquid_water_content
 !
 ! Former revisions:
@@ -766 +766 @@
                                                           rmask(j,i,sr)
                       IF ( .NOT. cloud_droplets )  THEN
-                         pts = 0.5 *                                          &
-                              ( ( q(k,j,i) - ql(k,j,i) ) -                    &
-                              hom(k,1,42,sr) +                                &
-                              ( q(k+1,j,i) - ql(k+1,j,i) ) -                  &
+                         pts = 0.5 *                                           &
+                              ( ( q(k,j,i) - ql(k,j,i) ) -                     &
+                              hom(k,1,42,sr) +                                 &
+                              ( q(k+1,j,i) - ql(k+1,j,i) ) -                   &
                               hom(k+1,1,42,sr) )
-                         sums_l(k,52,tn) = sums_l(k,52,tn) + pts * w(k,j,i) * &
+                         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) + &
-                                                                qr(k,j,i) ) * &
+                            sums_l(k,54,tn) = sums_l(k,54,tn) + ql(k,j,i) *    &
                                                                 rmask(j,i,sr)
-                            sums_l(k,73,tn) = sums_l(k,73,tn) + nr(k,j,i) *   &
+                            sums_l(k,75,tn) = sums_l(k,75,tn) + qc(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,75,tn) = sums_l(k,75,tn) + ql(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 ( 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,54,tn) = sums_l(k,54,tn) + ql(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,54,tn) = sums_l(k,54,tn) + ql(k,j,i) *       &
                                                              rmask(j,i,sr)
                       ENDIF