Changeset 16324

Timestamp:

10/08/13 07:54:48 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added vertical support for bamg

Location:

issm/trunk-jpl/src/m/mesh

Files:

• bamg.m (modified) (1 diff)
• triangle2dvertical.m (added)

issm/trunk-jpl/src/m/mesh/bamg.m

@@ -316 +316 @@
 [bamgmesh_out bamggeom_out]=BamgMesher(bamg_mesh,bamg_geometry,bamg_options);
 
-% plug results onto model
+if getfieldvalue(options,'vertical',0),
+        md.mesh=mesh2dvertical;
+        md.mesh.x=bamgmesh_out.Vertices(:,1);
+        md.mesh.z=bamgmesh_out.Vertices(:,2);
+        md.mesh.elements=bamgmesh_out.Triangles(:,1:3);
+        md.mesh.edges=bamgmesh_out.IssmEdges;
+        md.mesh.segments=bamgmesh_out.IssmSegments(:,1:3);
+        md.mesh.segmentmarkers=bamgmesh_out.IssmSegments(:,4);
+
+        %Fill in rest of fields:
+        md.mesh.numberofelements=size(md.mesh.elements,1);
+        md.mesh.numberofvertices=length(md.mesh.x);
+        md.mesh.numberofedges=size(md.mesh.edges,1);
+        md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
+
+        %Now, build the connectivity tables for this mesh.
+        md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
+else
+        % plug results onto model
+        md.mesh.x=bamgmesh_out.Vertices(:,1);
+        md.mesh.y=bamgmesh_out.Vertices(:,2);
+        md.mesh.elements=bamgmesh_out.Triangles(:,1:3);
+        md.mesh.edges=bamgmesh_out.IssmEdges;
+        md.mesh.segments=bamgmesh_out.IssmSegments(:,1:3);
+        md.mesh.segmentmarkers=bamgmesh_out.IssmSegments(:,4);
+
+        %Fill in rest of fields:
+        md.mesh.dimension=2;
+        md.mesh.numberofelements=size(md.mesh.elements,1);
+        md.mesh.numberofvertices=length(md.mesh.x);
+        md.mesh.numberofedges=size(md.mesh.edges,1);
+        md.mesh.z=zeros(md.mesh.numberofvertices,1);
+        md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1);
+        md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1);
+        md.mesh.elementonbed=ones(md.mesh.numberofelements,1);
+        md.mesh.elementonsurface=ones(md.mesh.numberofelements,1);
+        md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
+end
 md.private.bamg=struct();
 md.private.bamg.mesh=bamgmesh(bamgmesh_out);
 md.private.bamg.geometry=bamggeom(bamggeom_out);
-md.mesh.x=bamgmesh_out.Vertices(:,1);
-md.mesh.y=bamgmesh_out.Vertices(:,2);
-md.mesh.elements=bamgmesh_out.Triangles(:,1:3);
-md.mesh.edges=bamgmesh_out.IssmEdges;
-md.mesh.segments=bamgmesh_out.IssmSegments(:,1:3);
-md.mesh.segmentmarkers=bamgmesh_out.IssmSegments(:,4);
-
-%Fill in rest of fields:
-md.mesh.dimension=2;
-md.mesh.numberofelements=size(md.mesh.elements,1);
-md.mesh.numberofvertices=length(md.mesh.x);
-md.mesh.numberofedges=size(md.mesh.edges,1);
-md.mesh.z=zeros(md.mesh.numberofvertices,1);
-md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1);
-md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1);
-md.mesh.elementonbed=ones(md.mesh.numberofelements,1);
-md.mesh.elementonsurface=ones(md.mesh.numberofelements,1);
-md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
 md.mesh.elementconnectivity=md.private.bamg.mesh.ElementConnectivity;
 md.mesh.elementconnectivity(find(isnan(md.mesh.elementconnectivity)))=0;
+
 
 %Check for orphan