Changeset 17565

Timestamp:

03/27/14 12:22:40 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing extract 3D

Location:

issm/trunk-jpl/src/m/classes

Files:

• model.m (modified) (1 diff)
• model.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/model.m

@@ -473 +473 @@
                                 md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements2d,md2.mesh.numberofvertices2d);
                                 md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity);
-                                md2.mesh.vertexonboundary=zeros(numberofvertices2/md2.mesh.numberoflayers,1); md2.mesh.vertexonboundary(md2.mesh.segments(:,1:2))=1;
+                                segments=contourenvelope(md2);
+                                md2.mesh.vertexonboundary=zeros(numberofvertices2/md2.mesh.numberoflayers,1); md2.mesh.vertexonboundary(segments(:,1:2))=1;
                                 md2.mesh.vertexonboundary=repmat(md2.mesh.vertexonboundary,md2.mesh.numberoflayers,1);
                                 %Then do it for 3d as usual

issm/trunk-jpl/src/m/classes/model.py

@@ -374 +374 @@
                         [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements2d,md2.mesh.numberofvertices2d)
                         [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity)
+                        segments=contourenvelope(md2)
                         md2.mesh.vertexonboundary=numpy.zeros(numberofvertices2/md2.mesh.numberoflayers,bool)
-                        md2.mesh.vertexonboundary[md2.mesh.segments[:,0:2]-1]=True
+                        md2.mesh.vertexonboundary[segments[:,0:2]-1]=True
                         md2.mesh.vertexonboundary=numpy.tile(md2.mesh.vertexonboundary,md2.mesh.numberoflayers)
                         #Then do it for 3d as usual