Changeset 17726

Timestamp:

04/14/14 15:54:05 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed surface and base falgs

File:

• issm/trunk-jpl/src/m/contrib/dassflow/importgmsh.m (modified) (2 diffs)

issm/trunk-jpl/src/m/contrib/dassflow/importgmsh.m

@@ -83 +83 @@
                         else         %Boundary element
                                 segments(end+1,:)=A;
-                                if    (flags(1)==3), segmentmarkers(end+1)=3; 
+                                if    (flags(1)==1), segmentmarkers(end+1)=1; 
+                                elseif(flags(1)==2), segmentmarkers(end+1)=2;
+                                elseif(flags(1)==3), segmentmarkers(end+1)=3;
                                 elseif(flags(1)==4), segmentmarkers(end+1)=4;
-                                elseif(flags(1)==1), segmentmarkers(end+1)=1;
-                                elseif(flags(1)==2), segmentmarkers(end+1)=2;
-                                elseif(flags(1)==5), segmentmarkers(end+1)=5;
-                                elseif(flags(1)==6), segmentmarkers(end+1)=6;
                                 else error(['flags ' num2str(flags') ' not supported']);
                                 end
@@ -144 +142 @@
         md.mesh.numberofelements=size(md.mesh.elements,1);
         md.mesh.numberofvertices=length(md.mesh.x);
+
+        %base 2, surface 1, inflow 3, outflow 4
         md.mesh.vertexonbase=zeros(md.mesh.numberofvertices,1);
-        md.mesh.vertexonbase(find(segments(find(segmentmarkers==1),1:3)))=1;
+        md.mesh.vertexonbase(segments(find(segmentmarkers==2),1:3))=1;
         md.mesh.vertexonsurface=zeros(md.mesh.numberofvertices,1);
-        md.mesh.vertexonsurface(find(segments(find(segmentmarkers==3),1:3)))=1;
+        md.mesh.vertexonsurface(segments(find(segmentmarkers==1),1:3))=1;
 end