Changeset 54cbd6c in flexpart.git for src/timemanager.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/timemanager.f90 (modified) (3 diffs)

src/timemanager.f90

@@ -115 +115 @@
   real :: xold,yold,zold,xmassfract
   real, parameter :: e_inv = 1.0/exp(1.0)
+  logical :: firstdepocalc
   !double precision xm(maxspec,maxpointspec_act),
   !    +                 xm_depw(maxspec,maxpointspec_act),
@@ -171 +172 @@
            write (*,*) 'timemanager> call wetdepo'
         endif     
-         call wetdepo(itime,lsynctime,loutnext)
+         call wetdepo(itime,lsynctime,loutnext,.false.)
     endif
 
@@ -541 +542 @@
         zold=ztra1(j)
 
+   
+  ! RECEPTOR: dry/wet depovel
+  !****************************
+  ! Before the particle is moved 
+  ! the calculation of the scavenged mass shall only be done once after release
+  ! xscav_frac1 was initialised with a negative value
+      do ks=1,nspec
+         if  (DRYBKDEP.and.(xscav_frac1(j,ks).lt.0)) then
+         if (ks.eq.1) then
+         call advance_rec(itime,npoint(j),idt(j),uap(j),ucp(j),uzp(j), &
+            us(j),vs(j),ws(j),nstop,xtra1(j),ytra1(j),ztra1(j),prob, &
+            cbt(j))
+         endif
+            if (decay(ks).gt.0.) then             ! radioactive decay
+                decfact=exp(-real(abs(lsynctime))*decay(ks))
+            else
+                 decfact=1.
+            endif
+            if (DRYDEPSPEC(ks)) then        ! dry deposition
+               drydeposit(ks)=xmass1(j,ks)*prob(ks)*decfact
+               xscav_frac1(j,ks)=xscav_frac1(j,ks)*(-1.)* &
+               drydeposit(ks)/xmass1(j,ks)
+               if (decay(ks).gt.0.) then   ! correct for decay (see wetdepo)
+                  drydeposit(ks)=drydeposit(ks)* &
+                  exp(real(abs(ldeltat))*decay(ks))
+                endif
+             else
+                xmass1(j,ks)=0
+                xscav_frac1(j,ks)=0.
+             endif
+         endif
+       enddo
+
+       firstdepocalc=.false.
+       do ks=1,nspec
+          if ((WETBKDEP).and.(xscav_frac1(j,ks).lt.0) &
+                 .and.firstdepocalc.eqv..false.) then 
+             ! Backward wetdeposition and first timestep after release
+             call wetdepo(itime,lsynctime,loutnext,.true.)
+             firstdepocalc=.true.
+          endif
+       enddo
+
   ! Integrate Lagevin equation for lsynctime seconds
   !*************************************************
 
-        call advance(itime,npoint(j),idt(j),uap(j),ucp(j),uzp(j), &
-             us(j),vs(j),ws(j),nstop,xtra1(j),ytra1(j),ztra1(j),prob, &
-             cbt(j))
+        if (verbosity.gt.0) then
+           if (j.eq.1) then
+           write (*,*) 'timemanager> call advance'
+        endif     
+        endif     
+         call advance(itime,npoint(j),idt(j),uap(j),ucp(j),uzp(j), &
+            us(j),vs(j),ws(j),nstop,xtra1(j),ytra1(j),ztra1(j),prob, &
+            cbt(j))
 
   ! Calculate the gross fluxes across layer interfaces