Changeset 16158

Timestamp:

09/17/13 16:00:44 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cppcheck errors

Location:

issm/trunk-jpl/src/c

Files:

• analyses/ResetBoundaryConditions.cpp (modified) (1 diff)
• analyses/controltao_core.cpp (modified) (2 diffs)
• analyses/dakota_core.cpp (modified) (1 diff)
• analyses/gia_core.cpp (modified) (1 diff)
• analyses/stressbalance_core.cpp (modified) (1 diff)
• bamg/BamgQuadtree.cpp (modified) (3 diffs)
• bamg/Direction.cpp (modified) (1 diff)
• bamg/Geometry.cpp (modified) (4 diffs)
• bamg/ListofIntersectionTriangles.cpp (modified) (3 diffs)
• bamg/Mesh.cpp (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (5 diffs)
• classes/Elements/PentaRef.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• toolkits/issm/Bucket.h (modified) (2 diffs)
• toolkits/issm/IssmMpiVec.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/ResetBoundaryConditions.cpp

@@ -10 +10 @@
 
         /*variables: */
-        Vector<IssmDouble>*    yg    = NULL;
-        Nodes *nodes = NULL;
+        Vector<IssmDouble>* yg = NULL;
 
         if(VerboseSolution()) _printf0_("   updating boundary conditions...\n");

issm/trunk-jpl/src/c/analyses/controltao_core.cpp

@@ -29 +29 @@
         AppCtx              user;
         TaoSolver           tao = 0;
-        IssmDouble         *dummy        = NULL;
         int                *control_list = NULL;
         Vector<IssmDouble> *X            = NULL;
@@ -163 +162 @@
         AppCtx   *user      = (AppCtx *)userCtx;
         FemModel *femmodel  = user->femmodel;
-        Element  *element   = NULL;
         int      *responses = NULL;
 

issm/trunk-jpl/src/c/analyses/dakota_core.cpp

@@ -161 +161 @@
         char              *dakota_output_file = NULL;
         char              *dakota_error_file  = NULL;
-        int                status             = 0;
         Dakota::ModelLIter ml_iter;
-        Parameters        *parameters         = NULL;
 
         /*Recover dakota_input_file, dakota_output_file and dakota_error_file, in the parameters dataset in parallel */

issm/trunk-jpl/src/c/analyses/gia_core.cpp

@@ -11 +11 @@
 void gia_core(FemModel* femmodel){
 
-        int i;
-        Vector<IssmDouble>*  wg  = NULL;
-        Vector<IssmDouble>*  dwdtg  = NULL;
-        IssmDouble*          x   = NULL;
-        IssmDouble*          y   = NULL;
+        Vector<IssmDouble> *wg    = NULL;
+        Vector<IssmDouble> *dwdtg = NULL;
+        IssmDouble          *x    = NULL;
+        IssmDouble          *y    = NULL;
 
         /*parameters: */

issm/trunk-jpl/src/c/analyses/stressbalance_core.cpp

@@ -78 +78 @@
         }
 
-        if (dim==3 & (isSIA || isSSA || isL1L2 || isHO)){
+        if (dim==3 && (isSIA || isSSA || isL1L2 || isHO)){
                 if(VerboseSolution()) _printf0_("   computing vertical velocities\n");
                 femmodel->SetCurrentConfiguration(StressbalanceVerticalAnalysisEnum);

issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp

@@ -535 +535 @@
                 register int l=0; // level
                 register BamgQuadtreeBox * b;
-                Icoor1 h=MaxISize;
                 Icoor1 hb =  MaxISize;
                 Icoor1 i0=0,j0=0;
@@ -549 +548 @@
                 ii[0]=i0;
                 jj[0]=j0;
-                h=hb;
                 do {    
                         b= pb[l];
@@ -560 +558 @@
                                           {
                                                 R2 XY(X,b->v[k]->r);
-                                                double dd;
-                                                if( (dd= LengthInterpole(Mx(XY), b->v[k]->m(XY)))  < seuil ){
+                                                if(LengthInterpole(Mx(XY), b->v[k]->m(XY)) < seuil){
                                                         return b->v[k]; 
                                                 }

issm/trunk-jpl/src/c/bamg/Direction.cpp

@@ -27 +27 @@
                 int r =1; 
                 if (dir!= MaxICoor) {
-                        Icoor2 x(dir/2),y1(MaxICoor/2-Abs(x)),y(dir%2?-y1:y1);
+                        Icoor2 x(dir/2),y1(MaxICoor/2-Abs(x)),y((dir%2)?-y1:y1);
                         r = (x*i + y*j) >=0;
                 }

issm/trunk-jpl/src/c/bamg/Geometry.cpp

@@ -62 +62 @@
 
                 int verbose;
-                nbv=0;
-                nbe=0;
                 nbcurves=0;
 
@@ -286 +284 @@
                 int nbreqv=0;
                 int nbtan=0;
-                int nbcracked=0;
                 int i,count;
 
@@ -378 +375 @@
                 if (nbtan){
                         bamggeom->TangentAtEdges=xNew<double>(4*nbtan);
-                        count=0;
                         for (i=0;i<nbe;i++){
                                 if (edges[i].TgA() && edges[i][0].Corner()){
@@ -392 +388 @@
                                         bamggeom->TangentAtEdges[4*i+3]=edges[i].tg[1].y;
                                 }
-                                count=count+1;
                         }
                 }

issm/trunk-jpl/src/c/bamg/ListofIntersectionTriangles.cpp

@@ -48 +48 @@
 
                 SegInterpolation* SegI=lSegsI;
-                SegI=lSegsI;
                 lSegsI[NbSeg].last=Size;
                 int EndSeg=Size;
@@ -225 +224 @@
                 Triangle *tbegin, *t;
 
-                long int verbose=2;
                 Icoor2 deta[3], deti,detj;
                 double ba[3];
-                int nbt =0,ifirst=-1,ilast;
+                int ifirst=-1,ilast;
                 int i0,i1,i2;
                 int ocut,i,j,k=-1;
@@ -288 +286 @@
                                 if (t == tbegin) { // 
                                         double ba,bb;
-                                        long int verbose=2;
                                         AdjacentTriangle edge=CloseBoundaryEdge(a,t,ba,bb);
                                         BamgVertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);

issm/trunk-jpl/src/c/bamg/Mesh.cpp

@@ -269 +269 @@
         void Mesh::ReadMesh(int* index,double* x,double* y,int nods,int nels){
 
-                double Hmin = HUGE_VAL;// the infinie value 
                 long i1,i2,i3;
                 long i;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -43 +43 @@
 Penta::Penta(int penta_id, int penta_sid, int index, IoModel* iomodel,int nummodels)
         :PentaRef(nummodels)
-        ,ElementHook(nummodels,index+1,6,iomodel) //index+1: material id, iomodel->numberofelements+1: matpar id
-                                                                      { //i is the element index
-
-        int i;
+        ,ElementHook(nummodels,index+1,6,iomodel){
+
         int penta_elements_ids[2];
 
         /*Checks in debugging mode*/
-        /*{{{*/
         _assert_(iomodel->Data(MeshUpperelementsEnum));
         _assert_(iomodel->Data(MeshLowerelementsEnum));
-        /*}}}*/
 
         /*id: */
@@ -4544 +4540 @@
 
         /*Intermediaries*/
-        int        i,j,found=0;
+        int        i,found=0;
         int        stabilization;
         IssmDouble Jdet,phi,dt;
@@ -6526 +6522 @@
         int*         pdoflist=NULL;
         IssmDouble   FSreconditioning;
-        GaussPenta  *gauss;
 
         /*Fetch number of nodes and dof for this finite element*/
@@ -8586 +8581 @@
 
         /*Intermediaries */
-        int         i,j;
         int         approximation;
         IssmDouble  viscosity,Jdet;
@@ -8632 +8626 @@
                 material->GetViscosity3dFS(&viscosity,&epsilon[0]);
 
-                for(i=0;i<NUMVERTICES;i++){
+                for(int i=0;i<NUMVERTICES;i++){
                         pe->values[i*NDOF3+0]+=-Jdet*gauss->weight*viscosity*dw[0]*dbasis[2][i];
                         pe->values[i*NDOF3+1]+=-Jdet*gauss->weight*viscosity*dw[1]*dbasis[2][i];

issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp

@@ -846 +846 @@
          * where h is the interpolation function for node i.
          */
-        int i;
-        int num_dof=4;
-
+
+        int        num_dof=4;
         IssmDouble L1L2l3[NUMNODESP1_2d];
         IssmDouble dbasis[3][NUMNODESP1];

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -24 +24 @@
 /*FUNCTION Tria::Tria(){{{*/
 Tria::Tria(){
-
-        int i;
-
         this->nodes    = NULL;
         this->vertices = NULL;

issm/trunk-jpl/src/c/toolkits/issm/Bucket.h

@@ -131 +131 @@
                 void SpawnBucketsPerCpu(DataSet* bucketsofcpu_i,int rank_i,int* rowranks){ /*{{{*/
 
-                        int i,j;
-
                         /*go through our idxm index of rows this bucket owns, and spawn buckets  
                          *if these rows belong to cpu rank_i. Use rowranks to determine this.*/
-                        for(i=0;i<m;i++){
+                        for(int i=0;i<m;i++){
                                 if (rowranks[idxm[i]]==rank_i){
                                         /*This row belongs to cpu rank_i, so spawn a bucket with this row, and add it to the bucketsofcpu_i dataset: */
@@ -147 +145 @@
                         }
 
-                };
-                /*}}}*/
+                }; /*}}}*/
                 int BucketType(void){ /*{{{*/
 

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h

@@ -149 +149 @@
 
                         int        *row_indices_forcpu = NULL;
-                        int        *col_indices_forcpu = NULL;
                         int        *modes_forcpu       = NULL;
                         doubletype *values_forcpu      = NULL;