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

Timestamp:

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

Author:

hoffmann

Message:

new Lagrangian particle structure integrated

File:

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

palm/trunk/SOURCE/lpm_calc_liquid_water_content.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
+! New particle structure integrated. 
+! Kind definition added to all floating point numbers.
 !
 ! Former revisions:
@@ -68 +70 @@
 
     USE particle_attributes,                                                   &
-        ONLY:  particles, prt_count, prt_start_index
+        ONLY:  grid_particles, number_of_particles, particles, prt_count
 
     IMPLICIT NONE
@@ -78 +80 @@
     INTEGER(iwp) ::  psi !:
 
-
     CALL cpu_log( log_point_s(45), 'lpm_calc_ql', 'start' )
 
 !
 !-- Set water content initially to zero
-    ql = 0.0;  ql_v = 0.0;  ql_vp = 0.0
+    ql = 0.0_wp;  ql_v = 0.0_wp;  ql_vp = 0.0_wp
 
 !
@@ -89 +90 @@
     DO  i = nxl, nxr
        DO  j = nys, nyn
-          DO  k = nzb, nzt+1
+          DO  k = nzb+1, nzt
+
+             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)
 
 !
 !--          Calculate the total volume in the boxes (ql_v, weighting factor
 !--          has to beincluded)
-             psi = prt_start_index(k,j,i)
-             DO  n = psi, psi+prt_count(k,j,i)-1
+             DO  n = 1, prt_count(k,j,i)
                 ql_v(k,j,i)  = ql_v(k,j,i)  + particles(n)%weight_factor *  &
                                               particles(n)%radius**3
@@ -102 +106 @@
 !
 !--          Calculate the liquid water content
-             IF ( ql_v(k,j,i) /= 0.0 )  THEN
-                ql(k,j,i) = ql(k,j,i) + rho_l * 1.33333333 * pi *           &
+             IF ( ql_v(k,j,i) /= 0.0_wp )  THEN
+                ql(k,j,i) = ql(k,j,i) + rho_l * 1.33333333_wp * pi *           &
                                         ql_v(k,j,i) /                       &
                                         ( rho_surface * dx * dy * dz )
 
-                IF ( ql(k,j,i) < 0.0 ) THEN
+                IF ( ql(k,j,i) < 0.0_wp )  THEN
                    WRITE( message_string, * )  'LWC out of range: ' , &
-                                               ql(k,j,i)
+                                               ql(k,j,i),i,j,k
                    CALL message( 'lpm_calc_liquid_water_content', '', 2, 2, &
                                  -1, 6, 1 )
@@ -116 +120 @@
              ELSE
 
-                ql(k,j,i) = 0.0
+                ql(k,j,i) = 0.0_wp
 
              ENDIF