Changeset 12435

Timestamp:

06/15/12 16:44:01 (13 years ago)

Author:

Mathieu Morlighem

Message:

changing xmalloc to xNew and xfree to xDelete

Location:

issm/trunk-jpl/src/c/shared

Files:

• Elements/CoordinateSystemTransform.cpp (modified) (1 diff)
• Elements/TransformInvStiffnessMatrixCoord.cpp (modified) (4 diffs)
• Elements/TransformStiffnessMatrixCoord.cpp (modified) (4 diffs)
• Exp/DomainOutlineRead.cpp (modified) (4 diffs)
• Threads/LaunchThread.cpp (modified) (4 diffs)
• shared.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Elements/CoordinateSystemTransform.cpp

@@ -27 +27 @@
 
         /*Allocate and initialize transform matrix*/
-        transform=(double*)xmalloc(numdofs*numdofs*sizeof(double));
+        transform=xNew<double>(numdofs*numdofs);
         for(i=0;i<numdofs*numdofs;i++) transform[i]=0.0;
 

issm/trunk-jpl/src/c/shared/Elements/TransformInvStiffnessMatrixCoord.cpp

@@ -9 +9 @@
 
         /*All nodes have the same Coordinate System*/
-        cs_array=(int*)xmalloc(numnodes*sizeof(int));
+        cs_array=xNew<int>(numnodes);
         for(int i=0;i<numnodes;i++) cs_array[i]=cs_enum;
 
@@ -16 +16 @@
 
         /*Clean-up*/
-        xfree((void**)&cs_array);
+        xDelete<int>(cs_array);
 }
 
@@ -36 +36 @@
 
         /*Copy current stiffness matrix*/
-        values=(double*)xmalloc(Ke->nrows*Ke->ncols*sizeof(double));
+        values=xNew<double>(Ke->nrows*Ke->ncols);
         for(i=0;i<Ke->nrows;i++) for(j=0;j<Ke->ncols;j++) values[i*Ke->ncols+j]=Ke->values[i*Ke->ncols+j];
 
@@ -49 +49 @@
 
         /*Free Matrix*/
-        xfree((void**)&transform);
-        xfree((void**)&values);
+        xDelete<double>(transform);
+        xDelete<double>(values);
 }

issm/trunk-jpl/src/c/shared/Elements/TransformStiffnessMatrixCoord.cpp

@@ -9 +9 @@
 
         /*All nodes have the same Coordinate System*/
-        cs_array=(int*)xmalloc(numnodes*sizeof(int));
+        cs_array=xNew<int>(numnodes);
         for(int i=0;i<numnodes;i++) cs_array[i]=cs_enum;
 
@@ -16 +16 @@
 
         /*Clean-up*/
-        xfree((void**)&cs_array);
+        xDelete<int>(cs_array);
 }
 
@@ -36 +36 @@
 
         /*Copy current stiffness matrix*/
-        values=(double*)xmalloc(Ke->nrows*Ke->ncols*sizeof(double));
+        values=xNew<double>(Ke->nrows*Ke->ncols);
         for(i=0;i<Ke->nrows;i++) for(j=0;j<Ke->ncols;j++) values[i*Ke->ncols+j]=Ke->values[i*Ke->ncols+j];
 
@@ -49 +49 @@
 
         /*Free Matrix*/
-        xfree((void**)&transform);
-        xfree((void**)&values);
+        xDelete<double>(transform);
+        xDelete<double>(values);
 }

issm/trunk-jpl/src/c/shared/Exp/DomainOutlineRead.cpp

@@ -19 +19 @@
 
         /*I/O: */
-        FILE* fid=NULL;
-        char chardummy[256];
+        FILE   *fid = NULL;
+        char    chardummy[256];
         double  ddummy;
 
         /*output: */
-        int nprof; //number of profiles in the domainname file
-        int* profnvertices=NULL; //array holding the number of vertices for the nprof profiles
-        double** pprofx=NULL; //array of profiles x coordinates
-        double** pprofy=NULL; //array of profiles y coordinates
-        bool* closed=NULL; //array holding closed flags for the nprof profiles
+        int      nprof;                //number of profiles in the domainname file
+        int     *profnvertices = NULL; //array holding the number of vertices for the nprof profiles
+        double **pprofx        = NULL; //array of profiles x coordinates
+        double **pprofy        = NULL; //array of profiles y coordinates
+        bool    *closed        = NULL; //array holding closed flags for the nprof profiles
 
         /*For each profile: */
-        int n;
-        double* x=NULL;
-        double* y=NULL;
-        bool cl;
+        int     n;
+        double *x  = NULL;
+        double *y  = NULL;
+        bool    cl;
 
         /*open domain outline file for reading: */
@@ -61 +61 @@
         
         /*Allocate and initialize all the profiles: */
-        profnvertices=(int*)xmalloc(nprof*sizeof(int));
-        pprofx=(double**)xmalloc(nprof*sizeof(double*));
-        pprofy=(double**)xmalloc(nprof*sizeof(double*));
+        profnvertices=xNew<int>(nprof);
+        pprofx=xNew<double*>(nprof);
+        pprofy=xNew<double*>(nprof);
         for (i=0;i<nprof;i++){
                 pprofx[i]=NULL;
                 pprofy[i]=NULL;
         }
-        closed=(bool*)xmalloc(nprof*sizeof(bool));
+        closed=xNew<bool>(nprof);
 
         /*Reaset file pointer to beginning of file: */
@@ -91 +91 @@
                 y=(double*)xmalloc(n*sizeof(double));
                 
-
                 /*Read vertices: */
                 for (i=0;i<n;i++){
@@ -118 +117 @@
         *ppprofx=pprofx;
         *ppprofy=pprofy;
-        if(pclosed)*pclosed=closed;
-        else       xfree((void**)&closed);
+        if(pclosed)
+         *pclosed=closed;
+        else
+         xDelete<bool>(closed);
 }
 

issm/trunk-jpl/src/c/shared/Threads/LaunchThread.cpp

@@ -20 +20 @@
 
 #include "./issm_threads.h"
-#include "../Alloc/alloc.h"
+#include "../Alloc/xNewDelete.h"
 #include "../Exceptions/exceptions.h"
 #include "../../include/include.h"
@@ -28 +28 @@
         #ifdef _MULTITHREADING_
         int i;
-        int* status=NULL;
-
-        pthread_t* threads=NULL;
-        pthread_handle* handles=NULL;
+        int            *status  = NULL;
+        pthread_t      *threads = NULL;
+        pthread_handle *handles = NULL;
         
         /*dynamically allocate: */
-        threads=(pthread_t*)xmalloc(num_threads*sizeof(pthread_t));
-        handles=(pthread_handle*)xmalloc(num_threads*sizeof(pthread_handle));
+        threads=xNew<pthread_t>(num_threads);
+        handles=xNew<pthread_handle>(num_threads);
 
         for(i=0;i<num_threads;i++){
@@ -42 +41 @@
                 handles[i].num=num_threads;
         }
-        
         for(i=0;i<num_threads;i++){
 
@@ -56 +54 @@
         
         /*Free ressources:*/
-        xfree((void**)&threads);
-        xfree((void**)&handles);
+        xDelete<pthread_t>(threads);
+        xDelete<pthread_handle>(handles);
 
         #else

issm/trunk-jpl/src/c/shared/shared.h

@@ -17 +17 @@
 #include "Matrix/matrix.h"
 #include "Numerics/numerics.h"
-#include "Dofs/dofs.h"
 #include "Threads/issm_threads.h"
 #include "Bamg/shared.h"