Changeset 11944 for issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp

Timestamp:

04/05/12 14:54:00 (13 years ago)

Author:

Eric.Larour

Message:

Diverse

File:

• issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp ¶

@@ -20 +20 @@
         /*output: */
         double* index=NULL;
+        Matrix* index_matrix=NULL;
         double* x=NULL;
         double* y=NULL;
         double* segments=NULL;
+        Matrix* segments_matrix=NULL;
         double* segmentmarkerlist=NULL;
 
@@ -90 +92 @@
                  backcounter=counter;
         }
+
         
         /*Build regions: */
@@ -124 +127 @@
 
         sprintf(options,"%s%lf","pQzDq30ia",area); /*replace V by Q to quiet down the logging*/
+
   
         triangulate(options, &in, &out, NULL);
+
         /*report(&out, 0, 1, 1, 1, 1, 0);*/
+
 
         /*Allocate index, x and y: */
@@ -151 +157 @@
         }
 
+
+
         /*Associate elements with segments: */
         AssociateSegmentToElement(&segments,out.numberofsegments,index,out.numberoftriangles);
@@ -159 +167 @@
         }
 
-        printf("%i %i %i\n",out.numberoftriangles,out.numberofpoints,out.numberofsegments);
 
         /*Output : */
-        *pindex=new Matrix(index,out.numberoftriangles,3,1);
+        index_matrix=new Matrix(index,out.numberoftriangles,3,1); 
+        index_matrix->Convert(DENSE_SEQUENTIAL);
+        *pindex=index_matrix;
+        
+        segments_matrix=new Matrix(segments,out.numberofsegments,3,1); segments_matrix->Convert(DENSE_SEQUENTIAL);
+        *psegments=segments_matrix;
+
         *px=new Vector(x,out.numberofpoints);
         *py=new Vector(y,out.numberofpoints);
-        *psegments=new Matrix(segments,out.numberofsegments,3,1);
         *psegmentmarkerlist=new Vector(segmentmarkerlist,out.numberofsegments);
+
 }