Changeset 12070

Timestamp:

04/20/12 08:39:09 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added assertion in meshprocessrifts for safety

Location:

issm/trunk-jpl/src/c/shared/TriMesh

Files:

• TriMeshUtils.cpp (modified) (2 diffs)
• trimesh.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp

@@ -789 +789 @@
 ******************************************************************************************************************************/
 
-int OrderRifts(double** priftstips, double** riftssegments,double** riftspairs,int numrifts,int* riftsnumsegments,double* x,double* y){
+int OrderRifts(double** priftstips, double** riftssegments,double** riftspairs,int numrifts,int* riftsnumsegments,double* x,double* y,int nods,int nels){
         
         int noerr=1;
@@ -847 +847 @@
                         }
                         /* Make sure node3 faces node1 and node4 faces node2: */
+                        _assert_(node1<nods && node4<nods);
                         if ((x[node1]==x[node4]) && (y[node1]==y[node4])){
                                 /*Swap node3 and node4:*/

issm/trunk-jpl/src/c/shared/TriMesh/trimesh.h

@@ -34 +34 @@
 int IsRiftPresent(int* priftflag,int* pnumrifts, double* segmentmarkerlist,int nsegs);
 int SplitRiftSegments(double** psegments,double** psegmentmarkerlist, int* pnumsegs, int* pnumrifts,int** priftsnumsegs,double*** priftssegments,int numrifts);
-int OrderRifts(double** priftstips, double** riftssegments,double** riftspairs,int numrifts,int* riftsnumsegments,double* x,double* y);
+int OrderRifts(double** priftstips, double** riftssegments,double** riftspairs,int numrifts,int* riftsnumsegments,double* x,double* y,int nods,int nels);
 int PenaltyPairs(double*** priftspenaltypairs,int** priftsnumpenaltypairs,int numrifts,double**  riftssegments,
                 int* riftsnumsegments,double** riftspairs,double* riftstips,double* x,double* y);