Changeset 13038 for issm/trunk-jpl/src/modules/Chaco/Chaco.cpp

Timestamp:

08/14/12 17:12:51 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: getting rid of xmalloc

File:

• issm/trunk-jpl/src/modules/Chaco/Chaco.cpp (modified) (4 diffs)

issm/trunk-jpl/src/modules/Chaco/Chaco.cpp

@@ -54 +54 @@
         nvtxs = mxGetN(A_IN);
         mwstart = mxGetJc(A_IN);
-        start=(int*)xmalloc((nvtxs+1)*sizeof(int));
+        start=xNew<int>((nvtxs+1));
         for (i=0; i<nvtxs+1;i++)start[i]=(int)mwstart[i];
 
         mwadjacency = mxGetIr(A_IN);
-        adjacency = (int*)xmalloc(mxGetNzmax(A_IN)*sizeof(int));
+        adjacency = xNew<int>(mxGetNzmax(A_IN));
         for (i=0; i<mxGetNzmax(A_IN); i++) adjacency[i]= (int)mwadjacency[i];
 
         nedges = start[nvtxs];
         if(!mxIsEmpty(EWGTS_IN)){
-                ewgts = (float*)xcalloc(nedges, sizeof(float));
+                ewgts = xNewZeroInit<float>(nedges);
                 doublepointer=mxGetPr(A_IN);
                 for (i = 0; i < nedges; i++)ewgts[i] = (float)doublepointer[i];
@@ -77 +77 @@
         for (i=0;i<(nterms<10?nterms:10);i++) options[i]=in_options[i]; //copy in_options into default options
         FetchData(&npart,NPARTS_IN); 
-        nparts=(int*)xmalloc(sizeof(int)); nparts[0]=npart; //weird Chacox interface ain't it?
+        nparts=xNew<int>(1); nparts[0]=npart; //weird Chacox interface ain't it?
         FetchData(&goal,&nterms,GOAL_IN); 
         
@@ -104 +104 @@
         
         /*Allocate output: */
-        assignment = (short*)xcalloc(nvtxs, sizeof(short));
+        assignment = xNewZeroInit<short>(nvtxs);
         
     /*Call core: */
@@ -110 +110 @@
 
     /*Output data: */
-        doubleassignment=(double*)xmalloc(nvtxs*sizeof(double));
+        doubleassignment=xNew<double>(nvtxs);
         for(i=0;i<nvtxs;i++) doubleassignment[i]=(double)assignment[i];
         WriteData(ASSGN_OUT,doubleassignment,nvtxs);