Changeset 12350

Timestamp:

06/04/12 09:44:23 (13 years ago)

Author:

utke

Message:

replace the other xmallocs for floats

File:

• issm/trunk-jpl/src/c/objects/Node.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/objects/Node.cpp

@@ -802 +802 @@
                 if(this->indexing.fsize){
                         indices=(int*)xmalloc(this->indexing.fsize*sizeof(int));
-                        values=(IssmDouble*)xmalloc(this->indexing.fsize*sizeof(IssmDouble));
+                        values=xNew<IssmDouble>(this->indexing.fsize);
 
                         for(i=0;i<this->indexing.gsize;i++){
@@ -820 +820 @@
                 if(this->indexing.ssize){
                         indices=(int*)xmalloc(this->indexing.ssize*sizeof(int));
-                        values=(IssmDouble*)xmalloc(this->indexing.ssize*sizeof(IssmDouble));
+                        values=xNew<IssmDouble>(this->indexing.ssize);
 
                         for(i=0;i<this->indexing.gsize;i++){
@@ -838 +838 @@
 
         /*Free ressources:*/
-        xfree((void**)&values);
+        xDelete<IssmDouble>(values);
         xfree((void**)&indices);
 }
@@ -851 +851 @@
         if(setenum==FsetEnum){
                 if(this->indexing.fsize){
-                        values=(IssmDouble*)xmalloc(this->indexing.fsize*sizeof(IssmDouble));
+                        values=xNew<IssmDouble>(this->indexing.fsize);
 
                         for(i=0;i<this->indexing.gsize;i++){
@@ -867 +867 @@
         else if(setenum==SsetEnum){
                 if(this->indexing.ssize){
-                        values=(IssmDouble*)xmalloc(this->indexing.ssize*sizeof(IssmDouble));
+                        values=xNew<IssmDouble>(this->indexing.ssize);
 
                         for(i=0;i<this->indexing.gsize;i++){
@@ -884 +884 @@
 
         /*Free ressources:*/
-        xfree((void**)&values);
+        xDelete<IssmDouble>(values);
 }
 /*}}}*/