Changeset 5844866 in flexpart.git for src/timemanager.f90

Timestamp:

Oct 12, 2016, 1:14:19 PM (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:

df4a68e

Parents:

0581cac

Message:

first working version with backward deposition

File:

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

src/timemanager.f90

@@ -107 +107 @@
   integer :: ix,jy,ldeltat,itage,nage
   integer :: i_nan=0,ii_nan,total_nan_intl=0  !added by mc to check instability in CBL scheme 
-  real :: outnum,weight,prob(maxspec),decfact
+  real :: outnum,weight,prob_rec(maxspec),prob(maxspec),decfact
   ! real :: uap(maxpart),ucp(maxpart),uzp(maxpart)
   ! real :: us(maxpart),vs(maxpart),ws(maxpart)
@@ -552 +552 @@
       do ks=1,nspec
          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))
+         call advance_rec(itime,xtra1(j),ytra1(j),ztra1(j),prob_rec)
             if (decay(ks).gt.0.) then             ! radioactive decay
                 decfact=exp(-real(abs(lsynctime))*decay(ks))
@@ -561 +559 @@
             endif
             if (DRYDEPSPEC(ks)) then        ! dry deposition
-               drydeposit(ks)=xmass1(j,ks)*prob(ks)*decfact
+               drydeposit(ks)=xmass1(j,ks)*prob_rec(ks)*decfact
                xscav_frac1(j,ks)=xscav_frac1(j,ks)*(-1.)* &
                drydeposit(ks)/xmass1(j,ks)
+!               write (*,*) 'notance: ',prob(ks),xmass1(j,ks),ztra1(j)
                if (decay(ks).gt.0.) then   ! correct for decay (see wetdepo)
                   drydeposit(ks)=drydeposit(ks)* &
@@ -572 +571 @@
                 xscav_frac1(j,ks)=0.
              endif
+!         write (*,*) 'xscav: ',j,ks,xscav_frac1(j,ks)
          endif
        enddo
@@ -600 +600 @@
             us(j),vs(j),ws(j),nstop,xtra1(j),ytra1(j),ztra1(j),prob, &
             cbt(j))
+!        write (*,*) 'advance: ',prob(1),xmass1(j,1),ztra1(j)
 
   ! Calculate the gross fluxes across layer interfaces