Changeset 54cbd6c in flexpart.git for src/wetdepo.f90

Timestamp:

Sep 30, 2016, 11:01:54 AM (8 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:

9669e1e

Parents:

dced13c

Message:

all f90 files for dry/wet backward mode

File:

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

src/wetdepo.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine wetdepo(itime,ltsample,loutnext)
-!                  i      i        i
+subroutine wetdepo(itime,ltsample,loutnext,forreceptor)
+!                  i      i        i            i
 !*****************************************************************************
 !                                                                            *
@@ -30 +30 @@
 ! This fraction is parameterized from total cloud cover and rates of large   *
 ! scale and convective precipitation.                                        *
+! SEC: if forrecptor is true then the wetdeposition fraction is only applied *
+! on the xscav_frac and not on the xmass                                     *
 !                                                                            *
 !    Author: A. Stohl                                                        *
@@ -92 +94 @@
   integer :: blc_count, inc_count
   real    :: Si_dummy, wetscav_dummy
-  logical :: readclouds_this_nest
+  logical :: readclouds_this_nest,forreceptor
 
 
@@ -172 +174 @@
            memtime(1),memtime(2),interp_time,lsp,convp,cc)
     endif
-
-!  If total precipitation is less than 0.01 mm/h - no scavenging occurs
-!  sec this is just valid if release is over a point
-    if ((lsp.lt.0.01).and.(convp.lt.0.01)) then
-          if (SCAVDEP) then
-             do ks=1,nspec
-                if (xscav_frac1(jpart,ks).lt.0) then ! first timestep no scavenging
-                   xmass1(jpart,ks)=0.
-                   xscav_frac1(jpart,ks)=0.
-!                  write (*,*) 'paricle removed - no scavenging: ',jpart,ks
-                endif
-             end do
-          endif
-          goto 20
-    endif
-
 
 ! get the level were the actual particle is in
@@ -413 +399 @@
         kp=1
       endif
-      if (restmass .gt. smallnum) then
-        xmass1(jpart,ks)=restmass
+      if (forreceptor .eqv. .false.) then
+         if (restmass .gt. smallnum) then
+           xmass1(jpart,ks)=restmass
 !   depostatistic
 !   wetdepo_sum(ks,kp)=wetdepo_sum(ks,kp)+wetdeposit(ks)
 !   depostatistic
-      else
-        xmass1(jpart,ks)=0.
-      endif
+         else
+           xmass1(jpart,ks)=0.
+        endif
+     else ! for the backward deposition calculation
+         if (wetdeposit(ks).gt.0) then ! deposition occured
+                xscav_frac1(jpart,ks)=xscav_frac1(jpart,ks)*(-1.)* &
+                   wetdeposit(ks)/xmass1(jpart,ks)
+!                write (*,*) 'paricle kept: ',jpart,ks,wetdeposit(ks),xscav_frac1(jpart,ks)
+         else
+                xmass1(jpart,ks)=0.
+                xscav_frac1(jpart,ks)=0.
+         endif
+     endif
 !   Correct deposited mass to the last time step when radioactive decay of
 !   gridded deposited mass was calculated
@@ -426 +423 @@
         wetdeposit(ks)=wetdeposit(ks)*exp(abs(ldeltat)*decay(ks))
       endif
-
-      if (SCAVDEP) then
-! the calculation of the scavenged mass shall only be done once after release
-! xscav_frac1 was initialised with a negative value
-          if (xscav_frac1(jpart,ks).lt.0) then
-             if (wetdeposit(ks).eq.0) then
-! terminate particle
-                xmass1(jpart,ks)=0.
-                xscav_frac1(jpart,ks)=0.
-             else
-                xscav_frac1(jpart,ks)=xscav_frac1(jpart,ks)*(-1.)* &
-                   wetdeposit(ks)/xmass1(jpart,ks)
-!                write (*,*) 'paricle kept: ',jpart,ks,wetdeposit(ks),xscav_frac1(jpart,ks)
-             endif
-          endif
-      endif
-
 
     end do !all species