Changeset 1c0d5e6 in flexpart.git for src/drydepokernel.f90

Timestamp:

Dec 1, 2016, 12:47:22 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:

56a2e54

Parents:

8ee24a5

Message:

adding logical usekernel var-also for dry and wet

File:

• src/drydepokernel.f90 (modified) (1 diff)

src/drydepokernel.f90

@@ -81 +81 @@
     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
+       w=wx*wy
       drygridunc(ix,jy,ks,kp,nunc,nage)= &
            drygridunc(ix,jy,ks,kp,nunc,nage)+deposit(ks)*w
-      continue
-  endif
+     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