Changeset 1776 for palm/trunk

Timestamp:

Mar 2, 2016 5:54:58 PM (9 years ago)

Author:

hoffmann

Message:

Bugfix in computation of collection efficiencies

File:

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

palm/trunk/SOURCE/lpm_collision_kernels.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: Collection efficiencies must be calculated for the larger droplet.
 ! 
 ! Former revisions:
@@ -875 +875 @@
              IF ( ir < 16 )  THEN
                 IF ( ir >= 2 )  THEN
-                   pp = ( ( radclass(j) * 1.0E06_wp ) - r0(ir-1) ) / &
+                   pp = ( ( MAX(radclass(j),radclass(i)) * 1.0E06_wp ) - r0(ir-1) ) / &
                         ( r0(ir) - r0(ir-1) )
                    qq = ( rq - rat(iq-1) ) / ( rat(iq) - rat(iq-1) )
@@ -1041 +1041 @@
              IF ( ir < 8 )  THEN
                 IF ( ir >= 2 )  THEN
-                   pp = ( radclass(j)*1.0E6_wp - r0(ir-1) ) / ( r0(ir) - r0(ir-1) )
+                   pp = ( MAX(radclass(j),radclass(i))*1.0E6_wp - r0(ir-1) ) / &
+                        ( r0(ir) - r0(ir-1) )
                    qq = ( rq - rat(iq-1) ) / ( rat(iq) - rat(iq-1) )
                    y2 = ( 1.0_wp - pp ) * ( 1.0_wp - qq ) * ecoll_100(ir-1,iq-1) + &