Changeset 12429

Timestamp:

06/15/12 16:12:50 (13 years ago)

Author:

Mathieu Morlighem

Message:

changing xmalloc to xNew and xfree to xDelete

Location:

issm/trunk-jpl/src/c/toolkits

Files:

• issm/SeqMat.cpp (modified) (6 diffs)
• issm/SeqVec.cpp (modified) (4 diffs)
• metis/patches/METIS_PartMeshNodalPatch.cpp (modified) (4 diffs)
• mpi/patches/DetermineLocalSize.cpp (modified) (3 diffs)
• mpi/patches/MPI_Boundariesfromrange.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp

@@ -33 +33 @@
         this->N=pN;
         this->matrix=NULL;
-        if(M*N) this->matrix=(double*)xcalloc(pM*pN,sizeof(double));
+        if(M*N) this->matrix=xNewInit<double>(pM*pN,0.0);
 }
 /*}}}*/
@@ -42 +42 @@
         this->N=pN;
         this->matrix=NULL;
-        if(M*N) this->matrix=(double*)xcalloc(pM*pN,sizeof(double));
+        if(M*N) this->matrix=xNewInit<double>(pM*pN,0.0);
 }
 /*}}}*/
@@ -54 +54 @@
         this->matrix=NULL;
         if(M*N){
-                this->matrix=(double*)xcalloc(pM*pN,sizeof(double));
+                this->matrix=xNewInit<double>(pM*pN,0.0);
                 memcpy(this->matrix,serial_mat,pM*pN*sizeof(double));
         }
@@ -66 +66 @@
         this->N=pN;
         this->matrix=NULL;
-        if(M*N)this->matrix=(double*)xcalloc(pM*pN,sizeof(double));
+        if(M*N) this->matrix=xNewInit<double>(pM*pN,0.0);
 }
 /*}}}*/
@@ -72 +72 @@
 SeqMat::~SeqMat(){
 
-        xfree((void**)&this->matrix);
+        xDelete<double>(this->matrix);
         M=0;
         N=0;
@@ -178 +178 @@
 
         if(this->M*this->N){
-                buffer=(double*)xmalloc(this->M*this->N*sizeof(double));
+                buffer=xNew<double>(this->M*this->N);
                 memcpy(buffer,this->matrix,this->M*this->N*sizeof(double));
         }

issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp

@@ -31 +31 @@
         this->M=pM;
         this->vector=NULL;
-        if(this->M) this->vector=(double*)xcalloc(pM,sizeof(double));
+        if(this->M) this->vector=xNewInit<double>(pM,0.0);
 }
 /*}}}*/
@@ -42 +42 @@
         this->vector=NULL;
         if(this->M){
-                this->vector=(double*)xcalloc(pM,sizeof(double));
+                this->vector=xNewInit<double>(pM,0.0);
                 memcpy(this->vector,buffer,pM*sizeof(double));
         }
@@ -49 +49 @@
                 /*FUNCTION SeqVec::~SeqVec(){{{*/
 SeqVec::~SeqVec(){
-        xfree((void**)&this->vector);
+        xDelete<double>(this->vector);
         M=0;
 }
@@ -170 +170 @@
 
         if(this->M){
-                buffer=(double*)xmalloc(this->M*sizeof(double));
+                buffer=xNew<double>(this->M);
                 memcpy(buffer,this->vector,this->M*sizeof(double));
         }

issm/trunk-jpl/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp

@@ -13 +13 @@
         METIS_PartMeshNodal(pnumberofelements,pnumberofnodes, index, petype, pnumflag, pnum_procs, pedgecut, epart, npart); 
         #elif _METIS_VERSION_ == 5
-        /*This interface is heavily changed. More options, different way of meshing, etc ...: */ 
+        /*This interface is heavily changed. More options, different ways of meshing, etc ...: */ 
         int i;
 
@@ -21 +21 @@
         idx_t  k=0;
         real_t* tpwgts=NULL;
-
-
 
         /*setup options: */
@@ -40 +38 @@
         options[METIS_OPTION_NCUTS]   = 1;
 
-
         /*create eptr: */
-        eptr=(idx_t*)xmalloc((*pnumberofelements+1)*sizeof(idx_t));
+        eptr=xNew<idx_t>((*pnumberofelements+1));
         eptr[0]=0;
         for(i=0;i<*pnumberofelements;i++){
@@ -49 +46 @@
         }
 
-
         /*create tpwgts: */
-        tpwgts=(real_t*)xmalloc(*pnum_procs*sizeof(real_t));
+        tpwgts=xNew<real_t>(*pnum_procs);
         for(i=0;i<*pnum_procs;i++){
                 tpwgts[i]=1.0/(*pnum_procs);
         }
 
-
         METIS_PartMeshNodal(pnumberofelements,pnumberofnodes, eptr, index,
-                        NULL, NULL, pnum_procs, tpwgts, options, &objval,
-                        epart, npart);
-        
+                        NULL, NULL, pnum_procs, tpwgts, options, &objval,epart, npart);
 
         #else

issm/trunk-jpl/src/c/toolkits/mpi/patches/DetermineLocalSize.cpp

@@ -5 +5 @@
 #include <stdio.h>
 #include <math.h>
-
-
 #include "../../../shared/shared.h"
 
@@ -24 +22 @@
         
         /*We are  not bound by any library, just use what seems most logical*/
-        num_local_rows=(int*)xmalloc(num_procs*sizeof(int));    
+        num_local_rows=xNew<int>(num_procs);    
 
         for (i=0;i<num_procs;i++){
-
                 /*Here, we use floor. We under distribute rows. The rows 
                   left  are then redistributed, therefore resulting in a 
@@ -39 +36 @@
                 num_local_rows[i]++;
         }
-
         local_size=num_local_rows[my_rank];
         
         /*free ressources: */
-        xfree((void**)&num_local_rows);
+        xDelete<double>(num_local_rows);
 
         /*return size: */

issm/trunk-jpl/src/c/toolkits/mpi/patches/MPI_Boundariesfromrange.cpp

@@ -20 +20 @@
 
         /*Gather all range values into allranges, for all nodes*/
-        allranges=(int*)xmalloc(num_procs*sizeof(int));
+        allranges=xNew<int>(num_procs);
         MPI_Allgather(&range,1,MPI_INT,allranges,1,MPI_INT,MPI_COMM_WORLD);
-
 
         /*From all ranges, get lower row and upper row*/
@@ -31 +30 @@
                 upper_row=upper_row+allranges[i];
         }
-        
-        /*free: */
-        xfree((void**)&allranges);
 
         /*Assign output pointers: */
+        xDelete<double>(allranges);
         *plower_row=lower_row;
         *pupper_row=upper_row;
-
         return 1;
 }