Changeset 16560 for issm/trunk/src/m/mesh/meshconvert.m

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/mesh/meshconvert.m (modified) (2 diffs)

issm/trunk/src/m/mesh/meshconvert.m ¶

@@ -12 +12 @@
 
 if nargin==1,
-        x=md.mesh.x;
-        y=md.mesh.y;
-        index=md.mesh.elements;
+        index = md.mesh.elements;
+        x     = md.mesh.x;
+        y     = md.mesh.y;
 else
-        x=varargin{1};
-        y=varargin{2};
-        index=varargin{3};
+        index = varargin{1};
+        x     = varargin{2};
+        y     = varargin{3};
 end
 
@@ -25 +25 @@
 
 % plug results onto model
-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);
+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.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;