Changeset 3666

Timestamp:

05/06/10 10:23:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed tolerance

File:

• issm/trunk/src/m/classes/public/processgeometry.m (modified) (5 diffs)

issm/trunk/src/m/classes/public/processgeometry.m

@@ -14 +14 @@
         x2=geom.Vertices(geom.Edges(i,2),1);
         y2=geom.Vertices(geom.Edges(i,2),2);
+        color1=geom.Edges(i,3);
 
-        j=i+1; %test edges located AFTER i only
+        j=i; %test edges located AFTER i only
         while (j<size(geom.Edges,1)),
 
@@ -31 +32 @@
                 x4=geom.Vertices(geom.Edges(j,2),1);
                 y4=geom.Vertices(geom.Edges(j,2),2);
+                color2=geom.Edges(j,3);
 
                 %Check if the two edges are crossing one another
@@ -40 +42 @@
 
                         %Add vertex to the list of vertices
-                        geom.Vertices(end+1,:)=[x y 1];
+                        geom.Vertices(end+1,:)=[x y min(color1,color2)];
                         id=size(geom.Vertices,1);
 
@@ -56 +58 @@
         end
 
+end
+
+%Check point outside
+disp('Checking for points outside the domain...');
+i=0;
+num=0;
+while (i<size(geom.Vertices,1)),
+
+        %vertex counter
+        i=i+1;
+
+        %Get coordinates
+        x=geom.Vertices(i,1);
+        y=geom.Vertices(i,2);
+        color=geom.Vertices(i,3);
+
+        %Check that the point is inside the domain
+        if (color~=1 & ~ContourToNodes(x,y,outline(1),1)),
+
+                %Remove points from list of Vertices
+                num=num+1;
+                geom.Vertices(i,:)=[];
+
+                %update edges
+                [posedges dummy]=find(geom.Edges==i);
+                geom.Edges(posedges,:)=[];
+                posedges=find(geom.Edges>i);
+                geom.Edges(posedges)=geom.Edges(posedges)-1;
+
+                %update counter
+                i=i-1;
+        end
+end
+if num,
+        disp(['WARNING: ' num2str(num) ' points outside the domain outline have been removed']);
 end
 
@@ -102 +139 @@
 %remove empty edges
 geom.Edges(find(geom.Edges(:,1)==geom.Edges(:,2)),:)=[];
-
-%Check point outside
-disp('Checking for points outside the domain...');
-i=0;
-num=0;
-while (i<size(geom.Vertices,1)),
-
-        %vertex counter
-        i=i+1;
-
-        %Get coordinates
-        x=geom.Vertices(i,1);
-        y=geom.Vertices(i,2);
-
-        %Check that the point is inside the domain
-        if (~ContourToNodes(x,y,outline(1),1)),
-
-                %Remove points from list of Vertices
-                num=num+1;
-                geom.Vertices(i,:)=[];
-
-                %update edges
-                [posedges dummy]=find(geom.Edges==i);
-                geom.Edges(posedges,:)=[];
-                posedges=find(geom.Edges>i);
-                geom.Edges(posedges)=geom.Edges(posedges)-1;
-
-                %update counter
-                i=i-1;
-        end
-end
-if num,
-        disp(['WARNING: ' num2str(num) 'points outside the domain outline have been removed']);
-end