Changeset 790 for palm/trunk/SOURCE/data_output_3d.f90

Timestamp:

Nov 29, 2011 3:11:20 AM (12 years ago)

Author:

raasch

Message:

Bugfix for output of mean particle radius + preliminary works for implementing the Wang collision kernel

File:

• palm/trunk/SOURCE/data_output_3d.f90 (modified) (3 diffs)

palm/trunk/SOURCE/data_output_3d.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! bugfix: calculation of 'pr' must depend on the particle weighting factor,
+! nzt+1 replaced by nz_do3d for 'pr'
 !
 ! Former revisions:
@@ -207 +209 @@
                 DO  i = nxl, nxr
                    DO  j = nys, nyn
-                      DO  k = nzb, nzt+1
+                      DO  k = nzb, nz_do3d
                          psi = prt_start_index(k,j,i)
                          s_r3 = 0.0
                          s_r4 = 0.0
                          DO  n = psi, psi+prt_count(k,j,i)-1
-                            s_r3 = s_r3 + particles(n)%radius**3
-                            s_r4 = s_r4 + particles(n)%radius**4
+                         s_r3 = s_r3 + particles(n)%radius**3 * &
+                                       particles(n)%weight_factor
+                         s_r4 = s_r4 + particles(n)%radius**4 * &
+                                       particles(n)%weight_factor
                          ENDDO
                          IF ( s_r3 /= 0.0 )  THEN
@@ -227 +231 @@
                 DO  i = nxlg, nxrg
                    DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
+                      DO  k = nzb, nz_do3d
                          local_pf(i,j,k) = tend(k,j,i)
                       ENDDO