Changeset 19957

Timestamp:

01/15/16 13:05:33 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: prototype of contourenvelope has changed, updating accordingly

Location:

issm/trunk-jpl/src/m

Files:

• classes/model.m (modified) (2 diffs)
• contrib/massbalance/contourmassbalance.m (modified) (1 diff)
• mesh/rifts/meshaddrifts.m (modified) (1 diff)

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

@@ -511 +511 @@
                                 md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices);
                                 md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity);
-                                md2.mesh.segments=contourenvelope(md2);
+                                md2.mesh.segments=contourenvelope(md2.mesh);
                                 md2.mesh.vertexonboundary=zeros(numberofvertices2,1); md2.mesh.vertexonboundary(md2.mesh.segments(:,1:2))=1;
                         else
@@ -517 +517 @@
                                 md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements2d,md2.mesh.numberofvertices2d);
                                 md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity);
-                                segments=contourenvelope(md2);
+                                segments=contourenvelope(md2.mesh);
                                 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);

issm/trunk-jpl/src/m/contrib/massbalance/contourmassbalance.m

@@ -18 +18 @@
 
 %Get segments enveloping contour
-segments=contourenvelope(md,file);
+segments=contourenvelope(md.mesh,file);
 %md.stressbalance.icefront=segments; plotmodel(md,'data','pressureload','expdisp',file);
 

issm/trunk-jpl/src/m/mesh/rifts/meshaddrifts.m

@@ -34 +34 @@
 
         %create domain of md2 model: 
-        md2.mesh.segments=contourenvelope(md2,'Meshaddrifts.Contour.exp');
+        md2.mesh.segments=contourenvelope(md2.mesh,'Meshaddrifts.Contour.exp');
         domain_index=md2.mesh.segments(1,1:2);
         while (domain_index(end)~=domain_index(1)),