Changeset deaac29 in flexpart.git

Timestamp:

Nov 18, 2016, 8:13:26 AM (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:

c9cf570

Parents:

0ee2193

Message:

simplified version - velocities

Location:

src

Files:

• advance_rec.f90 (modified) (1 diff)
• conccalc.f90 (modified) (10 diffs)
• timemanager.f90 (modified) (1 diff)
• wetdepo.f90 (modified) (1 diff)

src/advance_rec.f90

@@ -167 +167 @@
   !   this formulation means that prob(n) = 1 - f(0)*...*f(n)
   !   where f(n) is the exponential term
-               prob(ks)=1.+(prob(ks)-1.)* &
-                    exp(-vdepo(ks)*abs(lsynctime)/(2.*href))
+               prob(ks)=vdepo(ks)
+!               prob(ks)=vdepo(ks)/2./href
+! instead of prob - return vdepo -> result kg/m2/s
           endif
         end do

src/conccalc.f90

@@ -196 +196 @@
                gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                  gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                 xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*xscav_frac1(i,ks)
+                 xmass1(i,ks)/rhoi*weight*xscav_frac1(i,ks)
              end do
           else
@@ -238 +238 @@
                  gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                    gridunc(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*w*weight*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*w*weight*xscav_frac1(i,ks)
                end do
             else
@@ -255 +255 @@
                  gridunc(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)= &
                    gridunc(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                end do
              else
@@ -275 +275 @@
                  gridunc(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)= &
                    gridunc(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*w*weight*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*w*weight*xscav_frac1(i,ks)
                end do
             else
@@ -292 +292 @@
                  gridunc(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                    gridunc(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                end do
             else
@@ -333 +333 @@
                  griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                    griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                   xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*xscav_frac1(i,ks)
+                   xmass1(i,ks)/rhoi*weight*xscav_frac1(i,ks)
                end do
             else
@@ -375 +375 @@
                    griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                      griduncn(ix,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                     xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                     xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                  end do
               else
@@ -392 +392 @@
                    griduncn(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)= &
                      griduncn(ix,jyp,kz,ks,nrelpointer,nclass(i),nage)+ &
-                     xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                     xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                  end do
               else
@@ -412 +412 @@
                    griduncn(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)= &
                      griduncn(ixp,jyp,kz,ks,nrelpointer,nclass(i),nage)+ &
-                     xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                     xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                  end do
               else
@@ -429 +429 @@
                    griduncn(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)= &
                      griduncn(ixp,jy,kz,ks,nrelpointer,nclass(i),nage)+ &
-                     xmass1(i,ks)/(1-xscav_frac1(i,ks))/rhoi*weight*w*xscav_frac1(i,ks)
+                     xmass1(i,ks)/rhoi*weight*w*xscav_frac1(i,ks)
                  end do
               else

src/timemanager.f90

@@ -560 +560 @@
             endif
             if (DRYDEPSPEC(ks)) then        ! dry deposition
-               drydeposit(ks)=xmass1(j,ks)*prob_rec(ks)*decfact
-               xscav_frac1(j,ks)=xscav_frac1(j,ks)*(-1.)* &
-               drydeposit(ks)/xmass1(j,ks)
+               xscav_frac1(j,ks)=prob_rec(ks)
              else
                 xmass1(j,ks)=0

src/wetdepo.f90

@@ -439 +439 @@
                      firsttimerem=firsttimerem+1
                 endif
-                xscav_frac1(jpart,ks)=xscav_frac1(jpart,ks)*(-1.)* &
-                   wetdeposit(ks)/xmass1(jpart,ks)
+                 !xscav_frac1(jpart,ks)=wetdeposit(ks)/(xmass1(jpart,ks)+wetdeposit(ks))
+                 xscav_frac1(jpart,ks)=wetscav*(zpoint2(jpart)-zpoint1(jpart))
 !                write (*,*) 'paricle kept: ',jpart,ks,wetdeposit(ks),xscav_frac1(jpart,ks),xmass(jpart,ks)
              endif