Changes in src/drydepokernel.f90 [4c64400:1c0d5e6] in flexpart.git

File:

• src/drydepokernel.f90 (modified) (3 diffs)

src/drydepokernel.f90

@@ -40 +40 @@
   !                                                                            *
   !*****************************************************************************
-  ! Changes:
-  ! eso 10/2016: Added option to disregard kernel 
-  ! 
-  !*****************************************************************************
-
 
   use unc_mod
@@ -52 +47 @@
   implicit none
 
-  real(dep_prec), dimension(maxspec) :: deposit
-  real :: x,y,ddx,ddy,xl,yl,wx,wy,w
+  real :: x,y,deposit(maxspec),ddx,ddy,xl,yl,wx,wy,w
   integer :: ix,jy,ixp,jyp,ks,nunc,nage,kp
 
@@ -80 +74 @@
   endif
 
-  ! If no kernel is used, direct attribution to grid cell
-  !******************************************************
-
-  if (lnokernel) then
-    do ks=1,nspec
-      if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then
-        if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
-             (jy.le.numygrid-1)) then
-          drygridunc(ix,jy,ks,kp,nunc,nage)= &
-               drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)
-        end if
-      end if
-    end do
-  else ! use kernel 
-
 
   ! Determine mass fractions for four grid points
   !**********************************************
-  do ks=1,nspec
+    do ks=1,nspec
 
-   if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then
+    if ((abs(deposit(ks)).gt.0).and.DRYDEPSPEC(ks)) then
 
-   if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
+    if (.not.usekernel) then
+       drygridunc(ix,jy,ks,kp,nunc,nage)= &
+           drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)
+    else
+      if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgrid-1).and. &
         (jy.le.numygrid-1)) then
-     w=wx*wy
-     drygridunc(ix,jy,ks,kp,nunc,nage)= &
-          drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)*w
-     continue
-   endif
+       w=wx*wy
+      drygridunc(ix,jy,ks,kp,nunc,nage)= &
+           drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)*w
+     endif
 
-  if ((ixp.ge.0).and.(jyp.ge.0).and.(ixp.le.numxgrid-1).and. &
+    if ((ixp.ge.0).and.(jyp.ge.0).and.(ixp.le.numxgrid-1).and. &
        (jyp.le.numygrid-1)) then
     w=(1.-wx)*(1.-wy)
       drygridunc(ixp,jyp,ks,kp,nunc,nage)= &
            drygridunc(ixp,jyp,ks,kp,nunc,nage)+deposit(ks)*w
-  endif
+    endif
 
-  if ((ixp.ge.0).and.(jy.ge.0).and.(ixp.le.numxgrid-1).and. &
+    if ((ixp.ge.0).and.(jy.ge.0).and.(ixp.le.numxgrid-1).and. &
        (jy.le.numygrid-1)) then
-    w=(1.-wx)*wy
+      w=(1.-wx)*wy
       drygridunc(ixp,jy,ks,kp,nunc,nage)= &
            drygridunc(ixp,jy,ks,kp,nunc,nage)+deposit(ks)*w
-  endif
+    endif
 
-  if ((ix.ge.0).and.(jyp.ge.0).and.(ix.le.numxgrid-1).and. &
+    if ((ix.ge.0).and.(jyp.ge.0).and.(ix.le.numxgrid-1).and. &
        (jyp.le.numygrid-1)) then
-    w=wx*(1.-wy)
+      w=wx*(1.-wy)
       drygridunc(ix,jyp,ks,kp,nunc,nage)= &
            drygridunc(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w
-  endif
+    endif
 
-  endif
+    endif ! kernel
+    endif ! deposit>0
 
-  end do
-end if
+    end do
 
 end subroutine drydepokernel