Changeset 1359 for palm/trunk/SOURCE/sum_up_3d_data.f90

Timestamp:

Apr 11, 2014 5:15:14 PM (10 years ago)

Author:

hoffmann

Message:

new Lagrangian particle structure integrated

File:

• palm/trunk/SOURCE/sum_up_3d_data.f90 (modified) (6 diffs)

palm/trunk/SOURCE/sum_up_3d_data.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
-! 
+! New particle structure integrated. 
+!
 ! Former revisions:
 ! -----------------
@@ -92 +92 @@
 
     USE particle_attributes,                                                   &
-        ONLY:  particles, prt_count, prt_start_index
+        ONLY:  grid_particles, number_of_particles, particles, prt_count
 
     IMPLICIT NONE
@@ -104 +104 @@
 
     REAL(wp)     ::  mean_r !: 
+    REAL(wp)     ::  s_r2   !: 
     REAL(wp)     ::  s_r3   !: 
-    REAL(wp)     ::  s_r4   !: 
 
     CALL cpu_log (log_point(34),'sum_up_3d_data','start')
@@ -382 +382 @@
                 DO  j = nys, nyn
                    DO  k = nzb, nzt+1
-                      psi = prt_start_index(k,j,i)
+                      number_of_particles = prt_count(k,j,i)
+                      IF ( number_of_particles <= 0 )  CYCLE
+                      particles => grid_particles(k,j,i)%particles(1:number_of_particles)
+                      s_r2 = 0.0_wp
                       s_r3 = 0.0_wp
-                      s_r4 = 0.0_wp
-                      DO  n = psi, psi+prt_count(k,j,i)-1
-                         s_r3 = s_r3 + particles(n)%radius**3 * &
-                                       particles(n)%weight_factor
-                         s_r4 = s_r4 + particles(n)%radius**4 * &
-                                       particles(n)%weight_factor
+
+                      DO  n = 1, number_of_particles
+                         IF ( particles(n)%particle_mask )  THEN
+                            s_r2 = s_r2 + particles(n)%radius**2 * &
+                                particles(n)%weight_factor
+                            s_r3 = s_r3 + particles(n)%radius**3 * &
+                                particles(n)%weight_factor
+                         ENDIF
                       ENDDO
-                      IF ( s_r3 /= 0.0_wp )  THEN
-                         mean_r = s_r4 / s_r3
+
+                      IF ( s_r2 > 0.0_wp )  THEN
+                         mean_r = s_r3 / s_r2
                       ELSE
                          mean_r = 0.0_wp
@@ -401 +407 @@
              ENDDO
 
+
           CASE ( 'pr*' )
              DO  i = nxlg, nxrg
@@ -478 +485 @@
                 DO  j = nys, nyn
                    DO  k = nzb, nzt+1
-                      psi = prt_start_index(k,j,i)
-                      DO  n = psi, psi+prt_count(k,j,i)-1
-                         ql_vp_av(k,j,i) = ql_vp_av(k,j,i) + &
-                                           particles(n)%weight_factor / &
-                                           prt_count(k,j,i)
+                      number_of_particles = prt_count(k,j,i)
+                      IF ( number_of_particles <= 0 )  CYCLE
+                      particles => grid_particles(k,j,i)%particles(1:number_of_particles)
+                      DO  n = 1, number_of_particles
+                         IF ( particles(n)%particle_mask )  THEN
+                            ql_vp_av(k,j,i) = ql_vp_av(k,j,i) + &
+                                              particles(n)%weight_factor / &
+                                              number_of_particles
+                         ENDIF
                       ENDDO
                    ENDDO