Changeset cea125d in flexpart.git

Timestamp:

Jan 27, 2017, 8:59:20 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:

2363b24

Parents:

88929bf

Message:

hmix can also be interpolated, set in com_mod.f90

Location:

src

Files:

• advance.f90 (modified) (2 diffs)
• com_mod.f90 (modified) (1 diff)

src/advance.f90

@@ -249 +249 @@
   if (ngrid.le.0) then
     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)
-           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
+       mind=memind(k) ! eso: compatibility with 3-field version
+       if (interpolhmix) 
+             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)
+        else
+          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
+        endif
     end do
     tropop=tropopause(nix,njy,1,1)
@@ -274 +276 @@
   endif
 
-  h=(h1(1)*dt2+h1(2)*dt1)*dtt 
+  if (interpolhmix) h=(h1(1)*dt2+h1(2)*dt1)*dtt 
   zeta=zt/h
 

src/com_mod.f90

@@ -752 +752 @@
   logical :: lroot=.true. ! true if serial version, or if MPI .and. root process
   
-  logical :: usekernel=.false. ! true if the output kernel shall be switched on
+  logical :: usekernel=.false.    ! true if the output kernel shall be switched on
+  logical :: interpolhmxi=.false. ! true if the hmix shall be interpolated
+  
   
 contains