Changeset 12441 for issm/trunk-jpl/src/c/objects/Numerics/ElementVector.cpp

Timestamp:

06/18/12 09:17:08 (13 years ago)

Author:

Mathieu Morlighem

Message:

changing xmalloc to xNew and xfree to xDelete

File:

• issm/trunk-jpl/src/c/objects/Numerics/ElementVector.cpp (modified) (11 diffs)

issm/trunk-jpl/src/c/objects/Numerics/ElementVector.cpp

@@ -54 +54 @@
 
         /*Initialize itransformation matrix pe[P[i]] = pe2[i]*/
-        P=(int*)xmalloc(pe2->nrows*sizeof(int));
+        P=xNew<int>(pe2->nrows);
 
         /*1: Get the new numbering of pe2 and get size of the new matrix*/
@@ -74 +74 @@
 
         /*Gset and values*/
-        this->gglobaldoflist=(int*)xmalloc(this->nrows*sizeof(int));
-        this->values=(double*)xcalloc(this->nrows,sizeof(double));
+        this->gglobaldoflist=xNew<int>(this->nrows);
+        this->values=xNewInit<double>(this->nrows,0.0);
         for(i=0;i<pe1->nrows;i++){
                 this->values[i] += pe1->values[i];
@@ -92 +92 @@
         this->fsize=fsize;
         if(fsize){
-                this->flocaldoflist =(int*)xmalloc(fsize*sizeof(int));
-                this->fglobaldoflist=(int*)xmalloc(fsize*sizeof(int));
+                this->flocaldoflist =xNew<int>(fsize);
+                this->fglobaldoflist=xNew<int>(fsize);
                 for(i=0;i<pe1->fsize;i++){
                         this->flocaldoflist[i] =pe1->flocaldoflist[i];
@@ -113 +113 @@
 
         /*clean-up*/
-        xfree((void**)&P);
+        xDelete<int>(P);
 }
 /*}}}*/
@@ -138 +138 @@
 
         /*fill values with 0: */
-        this->values=(double*)xcalloc(this->nrows,sizeof(double));
+        this->values=xNewInit<double>(this->nrows,0.0);
         
         /*g list*/
@@ -152 +152 @@
 ElementVector::~ElementVector(){
         
-        xfree((void**)&this->values);
-        xfree((void**)&this->gglobaldoflist);
-        xfree((void**)&this->flocaldoflist);
-        xfree((void**)&this->fglobaldoflist);
+        xDelete<double>(this->values);
+        xDelete<int>(this->gglobaldoflist);
+        xDelete<int>(this->flocaldoflist);
+        xDelete<int>(this->fglobaldoflist);
 }
 /*}}}*/
@@ -171 +171 @@
         if(this->fsize){
                 /*first, retrieve values that are in the f-set from the g-set values vector: */
-                localvalues=(double*)xmalloc(this->fsize*sizeof(double));
+                localvalues=xNew<double>(this->fsize);
                 for(i=0;i<this->fsize;i++){
                         localvalues[i]=this->values[this->flocaldoflist[i]];
@@ -179 +179 @@
 
                 /*Free ressources:*/
-                xfree((void**)&localvalues);
+                xDelete<double>(localvalues);
         }
         
@@ -192 +192 @@
         if(this->fsize){
                 /*first, retrieve values that are in the f-set from the g-set values vector: */
-                localvalues=(double*)xmalloc(this->fsize*sizeof(double));
+                localvalues=xNew<double>(this->fsize);
                 for(i=0;i<this->fsize;i++){
                         localvalues[i]=this->values[this->flocaldoflist[i]];
@@ -200 +200 @@
 
                 /*Free ressources:*/
-                xfree((void**)&localvalues);
+                xDelete<double>(localvalues);
         }
 
@@ -245 +245 @@
         this->nrows =pe->nrows;
 
-        this->values=(double*)xmalloc(this->nrows*sizeof(double));
+        this->values=xNew<double>(this->nrows);
         memcpy(this->values,pe->values,this->nrows*sizeof(double));
 
-        this->gglobaldoflist=(int*)xmalloc(this->nrows*sizeof(int));
+        this->gglobaldoflist=xNew<int>(this->nrows);
         memcpy(this->gglobaldoflist,pe->gglobaldoflist,this->nrows*sizeof(int));
 
         this->fsize=pe->fsize;
         if(this->fsize){
-                this->flocaldoflist=(int*)xmalloc(this->fsize*sizeof(int));
+                this->flocaldoflist=xNew<int>(this->fsize);
                 memcpy(this->flocaldoflist,pe->flocaldoflist,this->fsize*sizeof(int));
-                this->fglobaldoflist=(int*)xmalloc(this->fsize*sizeof(int));
+                this->fglobaldoflist=xNew<int>(this->fsize);
                 memcpy(this->fglobaldoflist,pe->fglobaldoflist,this->fsize*sizeof(int));
         }