Changeset 12094

Timestamp:

04/20/12 15:03:00 (13 years ago)

Author:

Mathieu Morlighem

Message:

Merging TriMesh and TriMeshRifts

File:

• issm/trunk-jpl/src/m/model/mesh/triangle.m (modified) (1 diff)

issm/trunk-jpl/src/m/model/mesh/triangle.m

@@ -38 +38 @@
 
 %Mesh using TriMesh
-if strcmp(riftname,''),
-        [md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers]=TriMesh(domainname,area,true);
-else
-        [elements,x,y,segments,segmentmarkers]=TriMeshRifts(domainname,riftname,area,true);
+[elements,x,y,segments,segmentmarkers]=TriMesh(domainname,riftname,area);
 
-        %check that all the created nodes belong to at least one element
-        orphan=find(~ismember([1:length(x)],sort(unique(elements(:)))));
-        for i=1:length(orphan),
-                %get rid of the orphan node i
-                %update x and y
-                x=[x(1:orphan(i)-(i-1)-1); x(orphan(i)-(i-1)+1:end)];
-                y=[y(1:orphan(i)-(i-1)-1); y(orphan(i)-(i-1)+1:end)];
-                %update elements
-                pos=find(elements>orphan(i)-(i-1));
-                elements(pos)=elements(pos)-1;
-                %update segments
-                pos1=find(segments(:,1)>orphan(i)-(i-1));
-                pos2=find(segments(:,2)>orphan(i)-(i-1));
-                segments(pos1,1)=segments(pos1,1)-1;
-                segments(pos2,2)=segments(pos2,2)-1;
-        end
+%check that all the created nodes belong to at least one element
+orphan=find(~ismember([1:length(x)],sort(unique(elements(:)))));
+for i=1:length(orphan),
+        disp('WARNING: removing orphans');
+        %get rid of the orphan node i
+        %update x and y
+        x=[x(1:orphan(i)-(i-1)-1); x(orphan(i)-(i-1)+1:end)];
+        y=[y(1:orphan(i)-(i-1)-1); y(orphan(i)-(i-1)+1:end)];
+        %update elements
+        pos=find(elements>orphan(i)-(i-1));
+        elements(pos)=elements(pos)-1;
+        %update segments
+        pos1=find(segments(:,1)>orphan(i)-(i-1));
+        pos2=find(segments(:,2)>orphan(i)-(i-1));
+        segments(pos1,1)=segments(pos1,1)-1;
+        segments(pos2,2)=segments(pos2,2)-1;
+end
 
-        %plug into md
-        md.mesh.x=x;
-        md.mesh.y=y;
-        md.mesh.elements=elements;
-        md.mesh.segments=segments;
-        md.mesh.segmentmarkers=segmentmarkers;
-end
+%plug into md
+md.mesh.x=x;
+md.mesh.y=y;
+md.mesh.elements=elements;
+md.mesh.segments=segments;
+md.mesh.segmentmarkers=segmentmarkers;
 
 %Fill in rest of fields: