Changeset 19955

Timestamp:

01/15/16 10:15:22 (9 years ago)

Author:

Eric.Larour

Message:

CHG: contourenvelope now deals only with a mesh class instead of a model class. model.m had to be
adapted accordingly.
New routines meshtodomain which takes the segments in the mesh and dumps a domain outline out of them.
New routine alignsegments which puts unordered segments into order (prior for example to calling meshtodomain).

Location:

issm/trunk-jpl/src/m

Files:

• classes/model.m (modified) (1 diff)
• exp/meshtodomain.m (added)
• miscellaneous/alignsegments.m (added)
• parameterization/contourenvelope.m (modified) (2 diffs)

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

@@ -303 +303 @@
                         md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices);
                         md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity);
-                        md.mesh.segments=contourenvelope(md);
+                        md.mesh.segments=contourenvelope(md.mesh);
 
                 end % }}}

issm/trunk-jpl/src/m/parameterization/contourenvelope.m ¶

@@ -1 @@
-function segments=contourenvelope(md,varargin)
+function segments=contourenvelope(mh,varargin)
 %CONTOURENVELOPE - build a set of segments enveloping a contour .exp
 %
 %   Usage:
-%      segments=contourenvelope(md,varargin)
+%      segments=contourenvelope(mh,varargin)
 %
 %   Example:
-%      segments=contourenvelope(md,'Stream.exp');
-%      segments=contourenvelope(md);
+%      segments=contourenvelope(mh,'Stream.exp');
+%      segments=contourenvelope(mh);
 
 %some checks
@@ -33 +33 @@
 %Now, build the connectivity tables for this mesh.
 %Computing connectivity
-if (size(md.mesh.vertexconnectivity,1)~=md.mesh.numberofvertices & size(md.mesh.vertexconnectivity,1)~=md.mesh.numberofvertices2d),
-        md.mesh.vertexconnectivity=NodeConnectivity(md.mesh.elements,md.mesh.numberofvertices);
+if isnan(mh.vertexconnectivity),
+        mh.vertexconnectivity=NodeConnectivity(mh.elements,mh.numberofvertices);
 end
-if (size(md.mesh.elementconnectivity,1)~=md.mesh.numberofelements & size(md.mesh.elementconnectivity,1)~=md.mesh.numberofelements2d),
-        md.mesh.elementconnectivity=ElementConnectivity(md.mesh.elements,md.mesh.vertexconnectivity);
+if isnan(mh.elementconnectivity),
+        mh.elementconnectivity=ElementConnectivity(mh.elements,mh.vertexconnectivity);
 end
 
 %get nodes inside profile
-mesh.elementconnectivity=md.mesh.elementconnectivity;
-if dimension(md.mesh)==2,
-        mesh.elements=md.mesh.elements;
-        mesh.x=md.mesh.x;
-        mesh.y=md.mesh.y;
-        mesh.numberofvertices=md.mesh.numberofvertices;
-        mesh.numberofelements=md.mesh.numberofelements;
+mesh.elementconnectivity=mh.elementconnectivity;
+if dimension(mh)==2,
+        mesh.elements=mh.elements;
+        mesh.x=mh.x;
+        mesh.y=mh.y;
+        mesh.numberofvertices=mh.numberofvertices;
+        mesh.numberofelements=mh.numberofelements;
 else
-        mesh.elements=md.mesh.elements2d;
-        mesh.x=md.mesh.x2d;
-        mesh.y=md.mesh.y2d;
-        mesh.numberofvertices=md.mesh.numberofvertices2d;
-        mesh.numberofelements=md.mesh.numberofelements2d;
+        mesh.elements=mh.elements2d;
+        mesh.x=mh.x2d;
+        mesh.y=mh.y2d;
+        mesh.numberofvertices=mh.numberofvertices2d;
+        mesh.numberofelements=mh.numberofelements2d;
 end