Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/modules/TriMeshx/TriMeshx.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/TriMeshx/TriMeshx.cpp (modified) (6 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/TriMeshx/TriMeshx.cpp

@@ -57 +57 @@
 
         /*fill in the point list: */
-        in.pointlist = (REAL *) xmalloc(in.numberofpoints * 2 * sizeof(REAL));
+        in.pointlist = xNew<REAL>(in.numberofpoints*2);
 
         counter=0;
@@ -78 +78 @@
         
         /*fill in the point attribute list: */
-        in.pointattributelist = (REAL*)xmalloc(in.numberofpoints*in.numberofpointattributes*sizeof(REAL));
+        in.pointattributelist = xNew<REAL>(in.numberofpoints*in.numberofpointattributes);
         for (i=0;i<in.numberofpoints;i++) in.pointattributelist[i] = 0.0;
         
         /*fill in the point marker list: */
-        in.pointmarkerlist = (int *) xmalloc(in.numberofpoints * sizeof(int));
+        in.pointmarkerlist = xNew<int>(in.numberofpoints);
         for(i=0;i<in.numberofpoints;i++) in.pointmarkerlist[i] = 0;
 
@@ -97 +97 @@
         }
         
-        in.segmentlist = (int *) xmalloc(in.numberofsegments * 2 * sizeof(int));
-        in.segmentmarkerlist = (int *) xcalloc(in.numberofsegments,sizeof(int));
+        in.segmentlist = xNew<int>(in.numberofsegments*2);
+        in.segmentmarkerlist = xNewZeroInit<int>(in.numberofsegments);
         counter=0;
         backcounter=0;
@@ -135 +135 @@
         in.numberofholes = domain->Size()-1; /*everything is a hole, but for the first profile.*/
         if(in.numberofholes){
-                in.holelist = (REAL *) xmalloc(in.numberofholes * 2 * sizeof(REAL));
+                in.holelist = xNew<REAL>(in.numberofholes*2);
                 for (i=0;i<domain->Size()-1;i++){
                         contour=(Contour*)domain->GetObjectByOffset(i+1);
@@ -164 +164 @@
 
         /*Allocate index, x and y: */
-        index=(double*)xmalloc(3*out.numberoftriangles*sizeof(double));
-        x=(double*)xmalloc(out.numberofpoints*sizeof(double));
-        y=(double*)xmalloc(out.numberofpoints*sizeof(double));
-        segments=(double*)xmalloc(3*out.numberofsegments*sizeof(double));
-        segmentmarkerlist=(double*)xmalloc(out.numberofsegments*sizeof(double));
+        index=xNew<double>(3*out.numberoftriangles);
+        x=xNew<double>(out.numberofpoints);
+        y=xNew<double>(out.numberofpoints);
+        segments=xNew<double>(3*out.numberofsegments);
+        segmentmarkerlist=xNew<double>(out.numberofsegments);
 
         for (i = 0; i< out.numberoftriangles; i++) {
@@ -192 +192 @@
 
         /*Output : */
-        index_matrix=new Matrix(index,out.numberoftriangles,3,1); 
-        index_matrix->Convert(DENSE_SEQUENTIAL);
+        index_matrix=new Matrix(index,out.numberoftriangles,3,1,SeqMatType);
         *pindex=index_matrix;
         
-        segments_matrix=new Matrix(segments,out.numberofsegments,3,1); segments_matrix->Convert(DENSE_SEQUENTIAL);
+        segments_matrix=new Matrix(segments,out.numberofsegments,3,1,SeqMatType);
         *psegments=segments_matrix;
 
-        *px=new Vector(x,out.numberofpoints);
-        *py=new Vector(y,out.numberofpoints);
-        *psegmentmarkerlist=new Vector(segmentmarkerlist,out.numberofsegments);
+        *px=new Vector(x,out.numberofpoints,SeqMatType);
+        *py=new Vector(y,out.numberofpoints,SeqMatType);
+        *psegmentmarkerlist=new Vector(segmentmarkerlist,out.numberofsegments,SeqMatType);
 }