Changeset 585a533 in flexpart.git

Timestamp:

Jan 31, 2017, 1:51:21 PM (7 years ago)

Author:

Sabine <sabine.eckhardt@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

93a1fa9

Parents:

278f4ed

Message:

BUGFIX: wetscav was not initialized, calculate wetscav only if species is scavenged!

File:

• src/wetdepo.f90 (modified) (3 diffs)

src/wetdepo.f90

@@ -108 +108 @@
 ! CALCULATE DEPOSITION 
 !**************************************************
+       wetscav=0.
+
+       if (((dquer(ks).le.0.).and.(weta_gas(ks).gt.0..or.wetb_gas(ks).gt.0.)) &
+          .or. &
+          ((dquer(ks).gt.0.).and.(crain_aero(ks).gt.0..or.csnow_aero(ks).gt.0.)))  then
+
       call get_wetscav(itime,ltsample,loutnext,jpart,ks,grfraction,inc_count,blc_count,wetscav)
 
@@ -113 +119 @@
         wetdeposit(ks)=xmass1(jpart,ks)* &
              (1.-exp(-wetscav*abs(ltsample)))*grfraction(1)  ! wet deposition
-!        if (xscav_frac1(jpart,ks).lt.0) then
-!                  xscav_frac1(jpart,ks)=wetscav*grfraction(1)* &
-!                         (zpoint2(npoint(jpart))-zpoint1(npoint(jpart)))
-!        endif
       else ! if no scavenging
         wetdeposit(ks)=0.
-!        if (xscav_frac1(jpart,ks).lt.0) then
-!           xscav_frac1(jpart,ks)=0.
-!           xmass1(jpart,ks)=0.
-!        endif
       endif
  
@@ -145 +143 @@
       endif
 
+    endif ! no deposition
     end do ! loop over species