Changes in trunk/src/advance.f90 [29:4]

File:

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

trunk/src/advance.f90

@@ -463 +463 @@
       dcwsave=dcwsave+vp*dt
       zt=zt+w*dt*real(ldirect)
-
-      ! HSO/AL: Particle managed to go over highest level -> interpolation error in goto 700
-      !          alias interpol_wind (division by zero)
-      if (zt.ge.height(nz)) zt=height(nz)-100.*eps
 
       if (zt.gt.h) then
@@ -703 +699 @@
   endif
 
-  ! HSO/AL: Prevent particles from disappearing at the pole
-  !******************************************************************
-
-  if ( yt.lt.0. ) then
-    xt=mod(xt+180.,360.)
-    yt=-yt
-  else if ( yt.gt.real(nymin1) ) then
-    xt=mod(xt+180.,360.)
-    yt=2*real(nymin1)-yt
-  endif
 
   ! Check position: If trajectory outside model domain, terminate it
@@ -718 +704 @@
 
   if ((xt.lt.0.).or.(xt.ge.real(nxmin1)).or.(yt.lt.0.).or. &
-       (yt.gt.real(nymin1))) then
+       (yt.ge.real(nymin1))) then
     nstop=3
     return
@@ -873 +859 @@
   endif
 
-  ! HSO/AL: Prevent particles from disappearing at the pole
-  !******************************************************************
-
-  if ( yt.lt.0. ) then
-    xt=mod(xt+180.,360.)
-    yt=-yt
-  else if ( yt.gt.real(nymin1) ) then
-    xt=mod(xt+180.,360.)
-    yt=2*real(nymin1)-yt
-  endif
-
   ! Check position: If trajectory outside model domain, terminate it
   !*****************************************************************
 
   if ((xt.lt.0.).or.(xt.ge.real(nxmin1)).or.(yt.lt.0.).or. &
-       (yt.gt.real(nymin1))) then
+       (yt.ge.real(nymin1))) then
     nstop=3
     return