Changeset 7725d96 in flexpart.git

Timestamp:

Jan 26, 2017, 3:12:36 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:

420423c

Parents:

6481010

Message:

code included to interpolate hmix

File:

• src/advance.f90 (modified) (4 diffs)

src/advance.f90

@@ -117 +117 @@
   real :: usigold,vsigold,wsigold,r,rs
   real :: uold,vold,wold,vdepo(maxspec)
+  real :: h1(2)
   !real uprof(nzmax),vprof(nzmax),wprof(nzmax)
   !real usigprof(nzmax),vsigprof(nzmax),wsigprof(nzmax)
@@ -223 +224 @@
 
 
+ ! Determine the lower left corner and its distance to the current position
+  !*************************************************************************
+
+  ddx=xt-real(ix)
+  ddy=yt-real(jy)
+  rddx=1.-ddx
+  rddy=1.-ddy
+  p1=rddx*rddy
+  p2=ddx*rddy
+  p3=rddx*ddy
+  p4=ddx*ddy
+
+ ! Calculate variables for time interpolation
+  !*******************************************
+
+  dt1=real(itime-memtime(1))
+  dt2=real(memtime(2)-itime)
+  dtt=1./(dt1+dt2)
+
   ! Compute maximum mixing height around particle position
   !*******************************************************
@@ -230 +250 @@
     do k=1,2
       mind=memind(k) ! eso: compatibility with 3-field version
-      do j=jy,jyp
-        do i=ix,ixp
-          if (hmix(i,j,1,mind).gt.h) h=hmix(i,j,1,mind)
-        end do
-      end do
+!      do j=jy,jyp
+!       do i=ix,ixp
+!          if (hmix(i,j,1,mind).gt.h) h=hmix(i,j,1,mind)
+           h1(k)=p1*hmix(ix ,jy ,1,mind) &
+         + p2*hmix(ixp,jy ,1,mind) &
+         + p3*hmix(ix ,jyp,1,mind) &
+         + p4*hmix(ixp,jyp,1,mind)
+
+!       end do
+!     end do
     end do
     tropop=tropopause(nix,njy,1,1)
@@ -249 +274 @@
   endif
 
+  h=(h1(1)*dt2+h1(2)*dt1)*dtt 
   zeta=zt/h