Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/toolkits/petsc/patches/VecPartition.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/toolkits/petsc/patches/VecPartition.cpp (modified) (3 diffs)

issm/branches/trunk-jpl-damage/src/c/toolkits/petsc/patches/VecPartition.cpp

@@ -56 +56 @@
 
                 if (range){
-                        node_rows=(int*)xmalloc(range*sizeof(int)); //this is the maximum number of rows one node can extract.
+                        node_rows=xNew<int>(range); //this is the maximum number of rows one node can extract.
                 
                         count=0;
@@ -71 +71 @@
                                         
         if (count){
-                        values=(double*)xmalloc(count*sizeof(double)); //holder for the values to be extracted from vectorA
+                        values=xNew<double>(count); //holder for the values to be extracted from vectorA
                 }
                 else{
-                        xfree((void**)&node_rows); //count=0 means no values was condensed out for this node. null node_rows for use in VecGetValues.
+                        xDelete<int>(node_rows); //count=0 means no values was condensed out for this node. null node_rows for use in VecGetValues.
                         values=NULL;
                 }
@@ -110 +110 @@
                 VecAssemblyBegin(outvector);
                 VecAssemblyEnd(outvector);
-                
         }
         
         /*Assign output pointers:*/
         *poutvector=outvector;
-
-        /*Free ressources:*/
-        xfree((void**)&node_rows);
-        xfree((void**)&values);
-
+        xDelete<int>(node_rows);
+        xDelete<double>(values);
 }