Changeset 13784

Timestamp:

10/22/12 10:35:47 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed some problems reported by cppcheck

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (2 diffs)
• toolkits/petsc/objects/PetscMat.cpp (modified) (1 diff)
• toolkits/petsc/objects/PetscVec.cpp (modified) (1 diff)
• toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp (modified) (2 diffs)
• toolkits/petsc/patches/KSPFree.cpp (modified) (1 diff)
• toolkits/petsc/patches/MatFree.cpp (modified) (1 diff)
• toolkits/petsc/patches/MatMultPatch.cpp (modified) (1 diff)
• toolkits/petsc/patches/NewMat.cpp (modified) (1 diff)
• toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp (modified) (2 diffs)
• toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp (modified) (2 diffs)
• toolkits/petsc/patches/PetscVectorToDoubleVector.cpp (modified) (3 diffs)
• toolkits/petsc/patches/VecDuplicatePatch.cpp (modified) (1 diff)
• toolkits/petsc/patches/VecFree.cpp (modified) (1 diff)
• toolkits/petsc/patches/VecMerge.cpp (modified) (4 diffs)
• toolkits/plapack/patches/CyclicalFactorization.cpp (modified) (1 diff)
• toolkits/plapack/patches/PlapackInvertMatrix.cpp (modified) (3 diffs)
• toolkits/plapack/patches/PlapackToPetsc.cpp (modified) (2 diffs)
• toolkits/plapack/plapackincludes.h (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -333 +333 @@
                 results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentFlopsEnum, solution_flops, 1, 0));
         }
-
 }
 /*}}}*/
@@ -857 +856 @@
 
 
-        int        i,j,k;
+        int        i,j;
         int        my_rank;
         bool       process_units = true;

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp

@@ -133 +133 @@
 PetscMat* PetscMat::Duplicate(void){
 
-        PetscMat* output=NULL;
-
-        output=new PetscMat();
+        PetscMat* output=new PetscMat();
         _assert_(this->matrix);
         MatDuplicate(this->matrix,MAT_COPY_VALUES,&output->matrix);

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp

@@ -129 +129 @@
 PetscVec* PetscVec::Duplicate(void){
 
-        PetscVec* output=NULL;
         _assert_(this->vector);
         Vec vec_output=NULL;
         VecDuplicate(this->vector,&vec_output);
-        output=new PetscVec(vec_output);
+        PetscVec* output=new PetscVec(vec_output);
         VecFree(&vec_output);
 

issm/trunk-jpl/src/c/toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp

@@ -26 +26 @@
         int lower_row,upper_row;
 
-        /*intermediary :*/
-        int i;
-        int* allranges=NULL;
-
         /*Gather all range values into allranges, for all nodes*/
-        allranges=xNew<int>(num_procs);
+        int* allranges=xNew<int>(num_procs);
         MPI_Allgather(&range,1,MPI_INT,allranges,1,MPI_INT,comm);
 
@@ -37 +33 @@
         lower_row=0;
         upper_row=lower_row+allranges[0];
-        for (i=1;i<=my_rank;i++){
+        for(int i=1;i<=my_rank;i++){
                 lower_row=lower_row+allranges[i-1];
                 upper_row=upper_row+allranges[i];

issm/trunk-jpl/src/c/toolkits/petsc/patches/KSPFree.cpp

@@ -10 +10 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 void KSPFree(KSP* pksp){

issm/trunk-jpl/src/c/toolkits/petsc/patches/MatFree.cpp

@@ -10 +10 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscmat.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscmat.h>
+#include <petscksp.h>
 
 void MatFree(Mat* pmat){

issm/trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp

@@ -10 +10 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "../../../shared/shared.h"

issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp

@@ -10 +10 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "./petscpatches.h"

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

@@ -12 +12 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 /*Petsc includes: */
@@ -22 +22 @@
 
         /*output: */
+        int     i;
         double* matrix=NULL;
         int     rows,cols;
-
-        /*intermediary: */
-        int     i;
-        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;

issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp

@@ -10 +10 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "./petscpatches.h"
@@ -29 +29 @@
         char* first=NULL;
         char* second=NULL;
-        char* final=NULL;
         size_t len;
         int first_token=1;

issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscVectorToDoubleVector.cpp

@@ -11 +11 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "../../../shared/shared.h"
@@ -19 +19 @@
 void PetscVectorToDoubleVector(double** pvector, int* prows, Vec petsc_vector){
 
-        int     i;
         int     rows;
-        int    *idxm   = NULL;
         double *vector = NULL;
 
@@ -28 +26 @@
                 VecGetSize(petsc_vector,&rows);
                 if(rows){
-                        idxm=xNew<int>(rows);
+                        int* idxm=xNew<int>(rows);
                         vector=xNew<double>(rows);
-                        for(i=0;i<rows;i++)idxm[i]=i;
+                        for(int i=0;i<rows;i++)idxm[i]=i;
                         VecGetValues(petsc_vector,rows,idxm,vector);
                         xDelete<int>(idxm);

issm/trunk-jpl/src/c/toolkits/petsc/patches/VecDuplicatePatch.cpp

@@ -10 +10 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 void VecDuplicatePatch(Vec* output, Vec input){

issm/trunk-jpl/src/c/toolkits/petsc/patches/VecFree.cpp

@@ -10 +10 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 void VecFree(Vec* pvec){

issm/trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp

@@ -10 +10 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "./petscpatches.h"
@@ -20 +20 @@
 
 void VecMerge(Vec A, Vec B, double* row_partition_vector,int row_partition_size){
-
-        int i;
 
         /*Petsc matrix*/
@@ -34 +32 @@
 
         /*If the dimension of the partitioning vector is not the same as that of vector B, we have a problem: */
-        if ( (row_partition_size !=MB) ){
+        if ((row_partition_size !=MB) ){
                 _error_("Dimensions of partitioning vector incompatible with dimensions of input vector\n");
         }
@@ -47 +45 @@
                 idxm=xNew<int>(range);
                 values=xNew<double>(range);
-                for (i=0;i<range;i++){
-                        *(idxm+i)=lower_row+i;
+                for(int i=0;i<range;i++){
+                        idxm[i]=lower_row+i;
                 }
                 VecGetValues(B,range,idxm,values);
                 /*Now, modify idxm using the partition vector, and plug values into A*/
-                for (i=0;i<range;i++){
-                        *(idxm+i)=(int)*(row_partition_vector+lower_row+i)-1; //-1 because partition vector comes from Matlab, where indices start at 1.
+                for(int i=0;i<range;i++){
+                        idxm[i]=int(row_partition_vector[lower_row+i])-1; //-1 because partition vector comes from Matlab, where indices start at 1.
                 }
                 VecSetValues(A,range,idxm,values,INSERT_VALUES);

issm/trunk-jpl/src/c/toolkits/plapack/patches/CyclicalFactorization.cpp

@@ -39 +39 @@
 int PrimeDecomp(int** pdecomp,int* pdecomp_size,int input){
 
-        int* decomp=NULL;
         int prime_factor;
         int i;
 
-        decomp=xNew<int>(input);
+        int* decomp=xNew<int>(input);
         *decomp=input;
         for (i=0;i<input;i++){

issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp

@@ -24 +24 @@
         int mA,nA;
         int local_mA,local_nA;
-        int lower_row,upper_row,range;
+        int lower_row,upper_row;
         MatType type;
 
@@ -36 +36 @@
         int nb,nb_alg;
         int nprows,npcols;
-        int initialized=0;
 
         /*Petsc to Plapack: */
@@ -96 +95 @@
         MatGetOwnershipRange(*A,&lower_row,&upper_row);
         upper_row--; 
-        range=upper_row-lower_row+1;
         arrayA = xNew<double>(nA);
         idxnA  = xNew<int>(nA);

issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackToPetsc.cpp

@@ -10 +10 @@
         int i;
 
-        int lower_row,upper_row,range;
+        int lower_row,upper_row;
         int* row_nodes=NULL;
         int* col_nodes=NULL;
@@ -34 +34 @@
         MatGetOwnershipRange(*A,&lower_row,&upper_row);
         upper_row--;
-        range=upper_row-lower_row+1;
 
         /*Build the Plapack row and column indices corresponding to the local_buffer stored in a. 

issm/trunk-jpl/src/c/toolkits/plapack/plapackincludes.h

@@ -12 +12 @@
 #endif
 
-#include "PLA.h"
+#include <PLA.h>
 
 /* missing Plapack prototypes: */
@@ -19 +19 @@
 /*our own patches: */
 #ifdef _HAVE_PETSC_
-#include "patches/petscpatches.h"
+#include "./patches/petscpatches.h"
 #endif