Changeset 1347

Timestamp:

07/17/09 17:30:56 (16 years ago)

Author:

seroussi

Message:

Fixed findsegments

File:

• issm/trunk/src/m/classes/public/mesh/findsegments.m (modified) (1 diff)

issm/trunk/src/m/classes/public/mesh/findsegments.m

@@ -15 +15 @@
 num_segments=length(pos);
 segments=zeros(num_segments,3);
+count=1;
+
 for i=1:num_segments,
         el1=pos(i);
         els2=elementconnectivity(el1,find(elementconnectivity(el1,:)));
-        flag=intersect(md.elements(els2(1),:),md.elements(els2(2),:));
-        nods1=md.elements(el1,:);
-        nods1(find(nods1==flag))=[];
-        segments(i,:)=[nods1 el1];
+        if length(els2)>1,
+                flag=intersect(md.elements(els2(1),:),md.elements(els2(2),:));
+                nods1=md.elements(el1,:);
+                nods1(find(nods1==flag))=[];
+                segments(count,:)=[nods1 el1];
 
-        ord1=find(nods1(1)==md.elements(el1,:));
-        ord2=find(nods1(2)==md.elements(el1,:));
+                ord1=find(nods1(1)==md.elements(el1,:));
+                ord2=find(nods1(2)==md.elements(el1,:));
 
-        %swap segment grids if necessary
-        if ( (ord1==1 & ord2==2) | (ord1==2 & ord2==3) | (ord1==3 & ord2==1) ),
-                temp=segments(i,1);
-                segments(i,1)=segments(i,2);
-                segments(i,2)=temp;
+                %swap segment grids if necessary
+                if ( (ord1==1 & ord2==2) | (ord1==2 & ord2==3) | (ord1==3 & ord2==1) ),
+                        temp=segments(count,1);
+                        segments(count,1)=segments(count,2);
+                        segments(count,2)=temp;
+                end
+                segments(count,1:2)=fliplr(segments(count,1:2));
+                count=count+1;
+        else
+                nods1=md.elements(el1,:);
+                flag=setdiff(nods1,md.elements(els2,:));
+                for j=1:3,
+                        nods=nods1; nods(j)=[];
+                        if any(ismember(flag,nods)),
+                                segments(count,:)=[nods el1];
+                                ord1=find(nods(1)==md.elements(el1,:));
+                                ord2=find(nods(2)==md.elements(el1,:));
+                                if ( (ord1==1 & ord2==2) | (ord1==2 & ord2==3) | (ord1==3 & ord2==1) ),
+                                        temp=segments(count,1);
+                                        segments(count,1)=segments(count,2);
+                                        segments(count,2)=temp;
+                                end
+                                segments(count,1:2)=fliplr(segments(count,1:2));
+                                count=count+1;
+                        end
+                end
         end
-        segments(i,1:2)=fliplr(segments(i,1:2));
 end