Changeset 835 for palm

Timestamp:

Feb 22, 2012 11:21:19 AM (13 years ago)

Author:

raasch

Message:

Bugfix: array diss can be used only in case of Wang kernel

Location:

palm/trunk/SOURCE

Files:

• advec_particles.f90 (modified) (3 diffs)
• lpm_collision_kernels.f90 (modified) (2 diffs)

palm/trunk/SOURCE/advec_particles.f90

@@ -4 +4 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix: array diss can be used only in case of Wang kernel
 !
 ! Former revisions:
@@ -180 +180 @@
                 distance, drdt, drdt_ini, drdt_m, dt_ros, dt_ros_last, &
                 dt_ros_next, dt_ros_sum, dt_ros_sum_ini, d2rdt2, d2rdtdr, &
-                dt_gap, dt_particle, dt_particle_m, d_sum, e_a, e_int, &
+                dt_gap, dt_particle, dt_particle_m, d_sum, epsilon, e_a, e_int,&
                 e_int_l, e_int_u, e_mean_int, e_s, err_ros, errmax, exp_arg, &
                 exp_term, fs_int, gg, g1, g2, g3, g4, integral, &
@@ -639 +639 @@
 !
 !--                   Determine dissipation class index of this gridbox
-                      eclass = INT( diss(k,j,i) * 1.0E4 / 1000.0 * &
-                                    dissipation_classes ) + 1
-                      IF ( hall_kernel .OR. diss(k,j,i) * 1.0E4 < 0.001 )  THEN
+                      IF ( wang_kernel )  THEN
+                         eclass = INT( diss(k,j,i) * 1.0E4 / 1000.0 * &
+                                       dissipation_classes ) + 1
+                         epsilon = diss(k,j,i)
+                      ELSE
+                         epsilon = 0.0
+                      ENDIF
+                      IF ( hall_kernel  .OR.  epsilon * 1.0E4 < 0.001 )  THEN
                          eclass = 0   ! Hall kernel is used
                       ELSE

palm/trunk/SOURCE/lpm_collision_kernels.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: array diss can be used only in case of Wang kernel
 !
 ! Former revisions:
@@ -242 +242 @@
        radclass(1:radius_classes) = particles(pstart:pend)%radius * 100.0
 
-       epsilon = diss(k1,j1,i1) * 1.0E4   ! dissipation rate in cm**2/s**-3
+       IF ( wang_kernel )  THEN
+          epsilon = diss(k1,j1,i1) * 1.0E4   ! dissipation rate in cm**2/s**-3
+       ELSE
+          epsilon = 0.0
+       ENDIF
        urms    = 202.0 * ( epsilon / 400.0 )**( 0.33333333333 )