Changeset 12440

Timestamp:

06/18/12 08:48:43 (13 years ago)

Author:

Mathieu Morlighem

Message:

changing xmalloc to xNew and xfree to xDelete

Location:

issm/trunk-jpl/src/c/shared

Files:

• Matrix/MatrixUtils.cpp (modified) (4 diffs)
• Numerics/OptionsFromAnalysis.cpp (modified) (1 diff)
• TriMesh/SplitMeshForRifts.cpp (modified) (2 diffs)
• TriMesh/TriMeshUtils.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

@@ -171 +171 @@
         int noerr=1;
         int i,j,k,ipt,jpt,irow,icol,ipiv,ncol;
-        int (*pivrc)[2],*pindx;
+        int *pivrc1,*pivrc2,*pindx;
         double pivot,det,dtemp;
 
@@ -217 +217 @@
                 }
 
-                pivrc[i][0]=irow;
-                pivrc[i][1]=icol;
+                pivrc1[i]=irow;
+                pivrc2[i]=icol;
 
                 ipiv=icol;
@@ -308 +308 @@
                 j=(nrow-1)-i;
 
-                if (pivrc[j][0] != pivrc[j][1]) {
-                        irow=pivrc[j][0];
-                        icol=pivrc[j][1];
+                if (pivrc1[j] != pivrc2[j]) {
+                        irow=pivrc1[j];
+                        icol=pivrc2[j];
 
 //                      _printf_(true,"column switch back for j=%d: irow=%d, icol=%d\n",
@@ -330 +330 @@
         xfree((void**)&pivrc);
         xDelete<int>(pindx);
-
         return noerr;
 }/*}}}*/

issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp

@@ -61 +61 @@
 
         /*ok, grab the option string: */
-        outstring=(char*)xmalloc((strlen(strings[found])+1)*sizeof(char));
+        outstring=xNew<char>(strlen(strings[found])+1);
         strcpy(outstring,strings[found]);
 

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

@@ -3 +3 @@
  */
 #include "./trimesh.h"
-
+#include "../Alloc/xNewDelete.h"
 #include "../Alloc/alloc.h"
 
@@ -52 +52 @@
 
         /*Go through all nodes of the rift segments, and start splitting the mesh: */
-        flags=(int*)xcalloc(nods,sizeof(int)); //to make sure we don't split the same nodes twice!
+        flags=xNewInit<int>(nods,0); //to make sure we don't split the same nodes twice!
         for (i=0;i<nriftsegs;i++){
                 for (j=0;j<2;j++){

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

@@ -129 +129 @@
 
         /*Allocate segmentflags: */
-        riftsegments_uncompressed=(int*)xcalloc(nsegs*5,sizeof(int));
+        riftsegments_uncompressed=xNewInit<int>(nsegs*5,0);
 
         /*Find the segments that belong to a rift: they are the ones that see two elements. The other ones belong to a boundary