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

Timestamp:

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

Author:

hoffmann

Message:

new Lagrangian particle structure integrated

File:

• palm/trunk/SOURCE/data_output_2d.f90 (modified) (8 diffs)

palm/trunk/SOURCE/data_output_2d.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! New particle structure integrated. 
 ! 
 ! Former revisions:
@@ -128 +128 @@
 
     USE particle_attributes,                                                   &
-        ONLY:  particle_advection_start, particles, prt_count,                 &
-               prt_start_index
+        ONLY:  grid_particles, number_of_particles, particle_advection_start,  &
+               particles, prt_count
     
     USE pegrid
@@ -163 +163 @@
     LOGICAL ::  two_d          !: 
     
-    REAL(wp) ::  mean_r         !:
-    REAL(wp) ::  s_r3           !:
-    REAL(wp) ::  s_r4           !:
+    REAL(wp) ::  mean_r        !:
+    REAL(wp) ::  s_r2          !:
+    REAL(wp) ::  s_r3          !:
     
-    REAL(wp), DIMENSION(:), ALLOCATABLE ::      level_z     !:
-    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::    local_2d    !:
-    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::    local_2d_l  !:
-    REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  local_pf    !:
+    REAL(wp), DIMENSION(:), ALLOCATABLE     ::  level_z             !:
+    REAL(wp), DIMENSION(:,:), ALLOCATABLE   ::  local_2d            !:
+    REAL(wp), DIMENSION(:,:), ALLOCATABLE   ::  local_2d_l          !:
+    REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  local_pf            !:
     REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  local_2d_sections   !:
     REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  local_2d_sections_l !:
+
 #if defined( __parallel )
-    REAL(wp), DIMENSION(:,:),   ALLOCATABLE ::  total_2d  !:
+    REAL(wp), DIMENSION(:,:),   ALLOCATABLE ::  total_2d    !:
 #endif
     REAL(wp), DIMENSION(:,:,:), POINTER ::  to_be_resorted  !: 
@@ -418 +419 @@
                 ENDIF
 
-             CASE ( 'pr_xy', 'pr_xz', 'pr_yz' )  ! mean particle radius
+             CASE ( 'pr_xy', 'pr_xz', 'pr_yz' )  ! mean particle radius (effective radius)
                 IF ( av == 0 )  THEN
                    IF ( simulated_time >= particle_advection_start )  THEN
@@ -424 +425 @@
                          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
@@ -445 +450 @@
                    ELSE
                       tend = 0.0_wp
-                   END IF
+                   ENDIF
                    DO  i = nxlg, nxrg
                       DO  j = nysg, nyng
@@ -600 +605 @@
                          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
-                                  tend(k,j,i) =  tend(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
+                                     tend(k,j,i) =  tend(k,j,i) +                 &
+                                                    particles(n)%weight_factor /  &
+                                                    prt_count(k,j,i)
+                                  ENDIF
                                ENDDO
                             ENDDO
@@ -612 +621 @@
                    ELSE
                       tend = 0.0_wp
-                   END IF
+                   ENDIF
                    DO  i = nxlg, nxrg
                       DO  j = nysg, nyng