simplified version - velocities

src/advance_rec.f90

@@ -166,8 +166,9 @@ subroutine advance_rec(itime,xt,yt,zt,prob)
   ! correction by Petra Seibert, 10 April 2001
   !   this formulation means that prob(n) = 1 - f(0)*...*f(n)
   !   where f(n) is the exponential term
-               prob(ks)=1.+(prob(ks)-1.)* &
-                    exp(-vdepo(ks)*abs(lsynctime)/(2.*href))
+               prob(ks)=vdepo(ks)
+!               prob(ks)=vdepo(ks)/2./href
+! instead of prob - return vdepo -> result kg/m2/s
           endif
         end do
       endif

src/conccalc.f90

@@ -195,7 +195,7 @@ subroutine conccalc(itime,weight)
              do ks=1,nspec
                gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                  gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                 xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*xscav_frac1(i,ks)
+                 xmass1(i,ks)/rhoi*weight*xscav_frac1(i,ks)
              end do
           else
              do ks=1,nspec
@@ -237,7 +237,7 @@ subroutine conccalc(itime,weight)
                do ks=1,nspec
                  gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                    gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*w*weight*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*w*weight*xscav_frac1(i,ks)
                end do
             else
                do ks=1,nspec
@@ -254,7 +254,7 @@ subroutine conccalc(itime,weight)
               do ks=1,nspec
                  gridunc(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)= &
                    gridunc(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                end do
              else
               do ks=1,nspec
@@ -274,7 +274,7 @@ subroutine conccalc(itime,weight)
                do ks=1,nspec
                  gridunc(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)= &
                    gridunc(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*w*weight*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*w*weight*xscav_frac1(i,ks)
                end do
             else
                do ks=1,nspec
@@ -291,7 +291,7 @@ subroutine conccalc(itime,weight)
                do ks=1,nspec
                  gridunc(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                    gridunc(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                end do
             else
                do ks=1,nspec
@@ -332,7 +332,7 @@ subroutine conccalc(itime,weight)
                do ks=1,nspec
                  griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                    griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*weight*xscav_frac1(i,ks)
                end do
             else
                do ks=1,nspec
@@ -374,7 +374,7 @@ subroutine conccalc(itime,weight)
                  do ks=1,nspec
                    griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                      griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                     xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                     xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                  end do
               else
                 do ks=1,nspec
@@ -391,7 +391,7 @@ subroutine conccalc(itime,weight)
                  do ks=1,nspec
                    griduncn(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)= &
                      griduncn(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)+ &
-                     xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                     xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                  end do
               else
                  do ks=1,nspec
@@ -411,7 +411,7 @@ subroutine conccalc(itime,weight)
                  do ks=1,nspec
                    griduncn(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)= &
                      griduncn(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)+ &
-                     xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                     xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                  end do
               else
                  do ks=1,nspec
@@ -428,7 +428,7 @@ subroutine conccalc(itime,weight)
                  do ks=1,nspec
                    griduncn(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                      griduncn(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                     xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                     xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                  end do
               else
                  do ks=1,nspec

src/timemanager.f90

@@ -559,9 +559,7 @@ subroutine timemanager
                 decfact=1.
             endif
             if (DRYDEPSPEC(ks)) then        ! dry deposition
-               drydeposit(ks)=xmass1(j,ks)*prob_rec(ks)*decfact
-               xscav_frac1(j,ks)=xscav_frac1(j,ks)*(-1.)* &
-               drydeposit(ks)/xmass1(j,ks)
+               xscav_frac1(j,ks)=prob_rec(ks)
              else
                 xmass1(j,ks)=0
                 xscav_frac1(j,ks)=0.

src/wetdepo.f90

@@ -438,8 +438,8 @@ subroutine wetdepo(itime,ltsample,loutnext)
                  if (xmass1(jpart,ks).eq.0) then
                      firsttimerem=firsttimerem+1
                 endif
-                xscav_frac1(jpart,ks)=xscav_frac1(jpart,ks)*(-1.)* &
-                   wetdeposit(ks)/xmass1(jpart,ks)
+                 !xscav_frac1(jpart,ks)=wetdeposit(ks)/(xmass1(jpart,ks)+wetdeposit(ks))
+                 xscav_frac1(jpart,ks)=wetscav*(zpoint2(jpart)-zpoint1(jpart))
 !                write (*,*) 'paricle kept: ',jpart,ks,wetdeposit(ks),xscav_frac1(jpart,ks),xmass(jpart,ks)
              endif
           endif