Changeset 5392

Timestamp:

08/19/10 08:22:11 (15 years ago)

Author:

Eric.Larour

Message:

Replaced tsearch by TriaSearch in flowlines.
New clicktoflowline routine, to create exp file directly by clicking.

Location:

issm/trunk/src/m/utils/Exp

Files:

• clicktoflowline.m (added)
• flowlines.m (modified) (5 diffs)

issm/trunk/src/m/utils/Exp/flowlines.m

@@ -39 +39 @@
 %check seed points
 tria=TriaSearch(index,x,y,x0,y0);
-if isnan(tria),
-        error('flowlines error message: seed point is not inside mesh!');
-end
+pos=find(isnan(tria));
+x0(pos)=[];
+y0(pos)=[];
 
 %initialize other variables
@@ -69 +69 @@
         %find current triangle
         queue=find(~done);
-        tria=tsearch(x,y,index,X(queue),Y(queue));
+        tria=TriaSearch(index,x,y,X(queue),Y(queue));
 
         %check that the point is actually inside a triangle of the mesh
@@ -81 +81 @@
         tria(listnan)=[]; 
         queue(listnan)=[];
+
+        if isempty(tria),
+                break;
+        end
 
         %velocity of the current triangle and norm it
@@ -114 +118 @@
         %find current triangle
         queue=find(~done);
-        tria=tsearch(x,y,index,X(queue),Y(queue));
+        tria=TriaSearch(index,x,y,X(queue),Y(queue));
 
         %check that the point is actually inside a triangle of the mesh
@@ -126 +130 @@
         tria(listnan)=[]; 
         queue(listnan)=[];
+
+        if isempty(tria),
+                break;
+        end
 
         %velocity of the current triangle and norm it