Changeset 0ee2193 in flexpart.git

Timestamp:

Oct 24, 2016, 1:03:58 PM (7 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:

deaac29

Parents:

d4a4250

Message:

BUGFIX: advance_rec lsynctime instead if ideltas

Location:

src

Files:

• advance.f90 (modified) (1 diff)
• advance_rec.f90 (modified) (1 diff)
• timemanager.f90 (modified) (2 diffs)

src/advance.f90

@@ -569 +569 @@
                prob(ks)=1.+(prob(ks)-1.)* &
                     exp(-vdepo(ks)*abs(dt)/(2.*href))
-!              write(*,*) 'Prob calc: ',zt,href,prob(ks)
           endif
         end do

src/advance_rec.f90

@@ -168 +168 @@
   !   where f(n) is the exponential term
                prob(ks)=1.+(prob(ks)-1.)* &
-                    exp(-vdepo(ks)*abs(ideltas)/(2.*href))
+                    exp(-vdepo(ks)*abs(lsynctime)/(2.*href))
           endif
         end do

src/timemanager.f90

@@ -553 +553 @@
          if  ((xscav_frac1(j,ks).lt.0)) then
             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))
@@ -562 +563 @@
                xscav_frac1(j,ks)=xscav_frac1(j,ks)*(-1.)* &
                drydeposit(ks)/xmass1(j,ks)
-               !if (xscav_frac1(j,ks).eq.1) then
-!                  write (*,*) 'xscav 1: ',j,prob_rec(ks),xmass1(j,ks), &
-!                                ztra1(j),drydeposit(ks),decfact
-              !     stop
-              ! endif
              else
                 xmass1(j,ks)=0