Changeset 20502

Timestamp:

04/13/16 08:26:45 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: speedint up flowlines

Location:

issm/trunk-jpl/src/m/exp

Files:

• downstreamflowlines.m (modified) (2 diffs)
• flowlines.m (modified) (3 diffs)

issm/trunk-jpl/src/m/exp/downstreamflowlines.m

@@ -38 +38 @@
 end
 
-%check seed points
-tria=TriaSearch(index,x,y,x0,y0);
+%Create triangulation once for all and check seed points
+trep = triangulation(index,x,y);
+tria = pointLocation(trep,[x0 y0]);
 pos=find(isnan(tria));
 x0(pos)=[];
@@ -70 +71 @@
         %find current triangle
         queue=find(~done);
-        tria=TriaSearch(index,x,y,X(queue),Y(queue));
+        tria = pointLocation(trep,[X(queue),Y(queue)]);
 
         %check that the point is actually inside a triangle of the mesh

issm/trunk-jpl/src/m/exp/flowlines.m

@@ -37 +37 @@
 precision=1; %division of each segment (higer precision increases number of segments)
 
-%check seed points
-tria=TriaSearch(index,x,y,x0,y0);
-%tria=tsearch(x,y,index,x0,y0);
+%Create triangulation once for all and check seed points
+trep = triangulation(index,x,y);
+tria = pointLocation(trep,[x0 y0]);
 pos=find(isnan(tria));
 x0(pos)=[];
@@ -70 +70 @@
         %find current triangle
         queue=find(~done);
-        tria=TriaSearch(index,x,y,X(queue),Y(queue));
-        %tria=tsearch(x,y,index,X(queue),Y(queue));
+        tria = pointLocation(trep,[X(queue),Y(queue)]);
 
         %check that the point is actually inside a triangle of the mesh
@@ -121 +120 @@
         %find current triangle
         queue=find(~done);
-        tria=TriaSearch(index,x,y,X(queue),Y(queue));
-        %tria=tsearch(x,y,index,X(queue),Y(queue));
+        tria = pointLocation(trep,[X(queue),Y(queue)]);
 
         %check that the point is actually inside a triangle of the mesh