Changeset 13975 for issm/trunk/src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp (modified) (2 diffs)

issm/trunk/src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp

@@ -2 +2 @@
  * \brief: convert a sparse or dense Petsc matrix into a matlab matrix
  */
-
 
 #ifdef HAVE_CONFIG_H
@@ -13 +12 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 /*Petsc includes: */
 #include "../../../shared/shared.h"
 
-
 void PetscMatrixToDoubleMatrix(double** pmatrix, int* prows, int* pcols,Mat petsc_matrix){
 
-        int i,j,k;
-
         /*output: */
+        int     i;
         double* matrix=NULL;
         int     rows,cols;
-
-        /*intermediary: */
-        int*    idxm=NULL;
-        int*    idxn=NULL;
 
         /*Some needed information: */
         MatGetSize(petsc_matrix,&rows,&cols);
 
-        idxm=xNew<int>(rows);
-        idxn=xNew<int>(cols);
+        int* idxm=xNew<int>(rows);
+        int* idxn=xNew<int>(cols);
 
         for(i=0;i<rows;i++)idxm[i]=i;