Changeset db712a8 in flexpart.git for src/wetdepokernel_nest.f90

Timestamp:

Mar 3, 2016, 12:34:56 PM (8 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

38b7917

Parents:

b0434e1

Message:

Completed handling of nested wind fields with cloud water (for wet deposition).

File:

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

src/wetdepokernel_nest.f90

@@ -20 +20 @@
 !**********************************************************************
 
-subroutine wetdepokernel_nest &
-       (nunc,deposit,x,y,nage,kp)
-  !        i      i    i i  i    i
+subroutine wetdepokernel_nest(nunc,deposit,x,y,nage,kp)
+  !                           i    i       i i i    i
   !*****************************************************************************
   !                                                                            *
@@ -55 +54 @@
   integer :: ix,jy,ixp,jyp,ks,kp,nunc,nage
 
-
+  real :: dbg_dx, dbg_dy, dbg_xoutshiftn, dbg_youtshiftn, dbg_dxoutn, dbg_dyoutn,dbg_t
 
   xl=(x*dx+xoutshiftn)/dxoutn
   yl=(y*dy+youtshiftn)/dyoutn
-  ix=int(xl)
-  jy=int(yl)
+
+  ! old:
+  ! ix=int(xl) 
+  ! jy=int(yl)
+
+  ! ESO: for xl,yl in range <-.5,-1> we get ix,jy=0 and thus negative
+  ! wx,wy as the int function rounds upwards for negative numbers.
+  ! Either use the floor function, or (perhaps more correctly?) use "(xl.gt.-0.5)" 
+  ! in place of "(ix.ge.0)" and similar for the upper boundary.
+
+  ! new:
+  ix=floor(xl)
+  jy=floor(yl)
+
   ddx=xl-real(ix)                   ! distance to left cell border
   ddy=yl-real(jy)                   ! distance to lower cell border
+
 
   if (ddx.gt.0.5) then
@@ -80 +92 @@
   endif
 
-
-  ! Determine mass fractions for four grid points
-  !**********************************************
+! Determine mass fractions for four grid points
+!**********************************************
 
   do ks=1,nspec
-
-  if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. &
-       (jy.le.numygridn-1)) then
-    w=wx*wy
+    if ((ix.ge.0).and.(jy.ge.0).and.(ix.le.numxgridn-1).and. &
+         (jy.le.numygridn-1)) then
+      w=wx*wy
       wetgriduncn(ix,jy,ks,kp,nunc,nage)= &
            wetgriduncn(ix,jy,ks,kp,nunc,nage)+deposit(ks)*w
-  endif
+    endif
 
-  if ((ixp.ge.0).and.(jyp.ge.0).and.(ixp.le.numxgridn-1).and. &
-       (jyp.le.numygridn-1)) then
-    w=(1.-wx)*(1.-wy)
+    if ((ixp.ge.0).and.(jyp.ge.0).and.(ixp.le.numxgridn-1).and. &
+         (jyp.le.numygridn-1)) then
+      w=(1.-wx)*(1.-wy)
       wetgriduncn(ixp,jyp,ks,kp,nunc,nage)= &
            wetgriduncn(ixp,jyp,ks,kp,nunc,nage)+deposit(ks)*w
-  endif
+    endif
 
-  if ((ixp.ge.0).and.(jy.ge.0).and.(ixp.le.numxgridn-1).and. &
-       (jy.le.numygridn-1)) then
-    w=(1.-wx)*wy
+    if ((ixp.ge.0).and.(jy.ge.0).and.(ixp.le.numxgridn-1).and. &
+         (jy.le.numygridn-1)) then
+      w=(1.-wx)*wy
       wetgriduncn(ixp,jy,ks,kp,nunc,nage)= &
            wetgriduncn(ixp,jy,ks,kp,nunc,nage)+deposit(ks)*w
-  endif
+    endif
 
-  if ((ix.ge.0).and.(jyp.ge.0).and.(ix.le.numxgridn-1).and. &
-       (jyp.le.numygridn-1)) then
-    w=wx*(1.-wy)
+    if ((ix.ge.0).and.(jyp.ge.0).and.(ix.le.numxgridn-1).and. &
+         (jyp.le.numygridn-1)) then
+      w=wx*(1.-wy)
       wetgriduncn(ix,jyp,ks,kp,nunc,nage)= &
            wetgriduncn(ix,jyp,ks,kp,nunc,nage)+deposit(ks)*w
-  endif
+    endif
 
   end do