Update ptrack4 to allow more underflow

schism-dev · Sep 10, 2024 · df6f0c3 · df6f0c3
1 parent 205dcfb
commit df6f0c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Utility/Particle_Tracking/ptrack4.f90 b/src/Utility/Particle_Tracking/ptrack4.f90
@@ -1808,10 +1808,11 @@ subroutine quicksearch(iloc,idt,ipar,nnel0,jlev0,time,x0,y0,z0,xt,yt,zt,nnel1,jl
       endif
 
       do k=kbpl+1,nvrt
-        if(ztmp(k)-ztmp(k-1)<0) then !can be 0 for deg. case
+        if(ztmp(k)-ztmp(k-1)<-1.d-8) then !can be 0 or even small negative for degenerate case or interp error
           write(11,*)'Inverted z-level in quicksearch:',nnel1,etal,dep,k,ztmp(k)-ztmp(k-1),ztmp(kbpl:nvrt)
           stop
         endif
+        ztmp(k)=max(ztmp(k),ztmp(k-1))
       enddo !k
 
       if(zt<=ztmp(kbpl)) then

diff --git a/src/Utility/Tides/gen_harm_FES.m b/src/Utility/Tides/gen_harm_FES.m
@@ -14,7 +14,7 @@
 %const={'s2','m2','n2','k2','k1','p1','o1','q1','m4'};
 
 %List of open bnd seg's that contain lon/lat of open bnd nodes
-open_ll={'fg.bp.1','fg.bp.2'}; %,'fg.bp.3','fg.bp.4','fg.bp.5','fg.bp.6'};
+open_ll={'fg.bp.1'}; %,'fg.bp.2'}; %,'fg.bp.3','fg.bp.4','fg.bp.5','fg.bp.6'};
 
 for iseg=1:length(open_ll)
 %-----------------------------------------------------------