Changeset 0581cac in flexpart.git for src

Timestamp:

Oct 3, 2016, 9:07:05 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:

5844866

Parents:

9669e1e

Message:

call of wetdeposition moved back to original call

File:

• src/timemanager.f90 (modified) (4 diffs)

src/timemanager.f90

@@ -172 +172 @@
            write (*,*) 'timemanager> call wetdepo'
         endif     
-         call wetdepo(itime,lsynctime,loutnext,.false.)
+         call wetdepo(itime,lsynctime,loutnext)
     endif
 
@@ -548 +548 @@
   ! the calculation of the scavenged mass shall only be done once after release
   ! xscav_frac1 was initialised with a negative value
+
+      if  (DRYBKDEP) then
       do ks=1,nspec
-         if  (DRYBKDEP.and.(xscav_frac1(j,ks).lt.0)) then
-         if (ks.eq.1) then
+         if  ((xscav_frac1(j,ks).lt.0)) 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))
@@ -574 +574 @@
          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
+       endif
+
+!      if (WETBKDEP) then 
+!      firstdepocalc=.false.
+!      do ks=1,nspec
+!         if ((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
+!      endif
 
   ! Integrate Lagevin equation for lsynctime seconds
@@ -590 +593 @@
         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), &
+             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))