Changeset 10992

Timestamp:

11/30/11 15:42:32 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed meshprocessrifts (numrifts does not exist anymore)

Location:

issm/trunk-jpl/src/m

Files:

• classes/rifts.m (modified) (1 diff)
• model/mesh/rifts/meshprocessrifts.m (modified) (4 diffs)

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

@@ -55 +55 @@
                         disp(sprintf('   rifts parameters:'));
 
-                        fielddisplay(obj,'numrifts','number of of rifts');
                         fielddisplay(obj,'riftstruct','structure containing all rift information (vertices coordinates, segments, type of melange, ...)');
                         fielddisplay(obj,'riftproperties','');

issm/trunk-jpl/src/m/model/mesh/rifts/meshprocessrifts.m

@@ -26 +26 @@
 %Call MEX file
 [md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers,md.rifts.riftstruct]=TriMeshProcessRifts(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.segments,md.mesh.segmentmarkers);
-md.rifts
-md.rifts.riftstruct
 if ~isstruct(md.rifts.riftstruct),
         error('TriMeshProcessRifts did not find any rift');
@@ -33 +31 @@
 
 %Fill in rest of fields:
+numrifts=length(md.rifts.riftstruct);
 md.mesh.numberofelements=length(md.mesh.elements);
 md.mesh.numberofvertices=length(md.mesh.x);
 md.mesh.z=zeros(md.mesh.numberofvertices,1);
 md.mesh.vertexonboundary=zeros(length(md.mesh.x),1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
-md.rifts.numrifts=length(md.rifts.riftstruct);
-md.flowequation.element_equation=3*ones(md.mesh.numberofelements,1);
 md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1);
 md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1);
@@ -45 +42 @@
 
 %get coordinates of rift tips
-for i=1:md.rifts.numrifts,
+for i=1:numrifts,
         md.rifts.riftstruct(i).tip1coordinates=[md.mesh.x(md.rifts.riftstruct(i).tips(1)) md.mesh.y(md.rifts.riftstruct(i).tips(1))];
         md.rifts.riftstruct(i).tip2coordinates=[md.mesh.x(md.rifts.riftstruct(i).tips(2)) md.mesh.y(md.rifts.riftstruct(i).tips(2))];
@@ -53 +50 @@
 flags=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,domainoutline,'node',0);
 found=0;
-for i=1:md.rifts.numrifts,
+for i=1:numrifts,
         if flags(md.rifts.riftstruct(i).tips(1))==0,
                 found=1;