Changeset 17924

Timestamp:

05/04/14 14:18:34 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some CPPcheck errors

Location:

issm/trunk-jpl/src/c

Files:

• analyses/LsfReinitializationAnalysis.cpp (modified) (2 diffs)
• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• analyses/SmoothedSurfaceSlopeYAnalysis.cpp (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• classes/Elements/Element.cpp (modified) (1 diff)
• classes/IoModel.cpp (modified) (1 diff)
• classes/Loads/Riftfront.cpp (modified) (1 diff)
• classes/Massfluxatgate.h (modified) (1 diff)
• classes/Materials/Matpar.cpp (modified) (1 diff)
• classes/kriging/Observations.cpp (modified) (1 diff)
• cores/controlm1qn3_core.cpp (modified) (1 diff)
• cores/masstransport_core.cpp (modified) (1 diff)
• cores/steadystate_core.cpp (modified) (1 diff)
• cores/transient_core.cpp (modified) (1 diff)
• modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (modified) (2 diffs)
• modules/ModelProcessorx/CreateEdges.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• toolkits/issm/IssmMpiSparseMat.h (modified) (5 diffs)
• toolkits/mumps/MumpsSolve.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp ¶

@@ -112 +112 @@
         /*Intermediaries */
         const int dim = 2;
-        int        i,row,col,stabilization;
+        int        row,col,stabilization;
         IssmDouble Jdet,D_scalar;
         IssmDouble dtau = 1.;
@@ -399 +399 @@
 
         /* Intermediaries */
-        int i,k;
+        int i;
         IssmDouble dmaxp,dmaxm,val;
         Element* element;

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp ¶

@@ -32 +32 @@
         int    stabilization,finiteelement,smb_model;
         bool   dakota_analysis;
-        bool   issmbgradients;
-        bool   ispdd;
         bool   isdelta18o;
         bool   isgroundingline;

issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp ¶

@@ -119 +119 @@
 
         /*Intermediaries */
-        int         input_enum;
         IssmDouble  Jdet,thickness,slope[2];
         IssmDouble  taud_y,norms,normv,vx,vy;

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp ¶

@@ -3198 +3198 @@
         /*Intermediaries*/
         bool        mainlyfloating;
-        int         i,dim,domaintype,epssize;
+        int         dim,domaintype;
         int         migration_style,point1;
         IssmDouble  alpha2,Jdet,fraction1,fraction2;
@@ -5260 +5260 @@
 
         /*Intermediaries*/
-        int         i,j,approximation;
+        int         i,approximation;
         int         dim=3;
         IssmDouble  Jdet,Jdet2d,FSreconditioning;

issm/trunk-jpl/src/c/classes/Elements/Element.cpp ¶

@@ -593 +593 @@
 
         /*Intermediaries*/
-        int        i,t,row;
+        int        i,t;
         IssmDouble time;
 

issm/trunk-jpl/src/c/classes/IoModel.cpp ¶

@@ -286 +286 @@
 void IoModel::StartTrace(void){
 
-        int  i;
         bool autodiff = false;
         bool keep=false;

issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp ¶

@@ -39 +39 @@
         int    riftfront_elem_ids[2];
         int    riftfront_matpar_id;
-        int    riftfront_type;
-        int    riftfront_fill;
         IssmDouble riftfront_friction;
         IssmDouble riftfront_fractionincrement;
-        bool   riftfront_shelf;
         int    penalty_lock;
 

issm/trunk-jpl/src/c/classes/Massfluxatgate.h ¶

@@ -31 +31 @@
                 /*FUNCTION Massfluxatgate() {{{*/
                 Massfluxatgate(){
-                        this->name     = 0;
-                        this->numsegments     = 0;
-                        this->segments   = 0;
+                        this->name        = 0;
+                        this->numsegments = 0;
+                        this->segments    = 0;
                 }
                 /*}}}*/

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp ¶

@@ -21 +21 @@
 Matpar::Matpar(int matpar_mid, IoModel* iomodel){
 
-        bool ispdd;
         bool isefficientlayer;
         int  hydrology_model,smb_model;

issm/trunk-jpl/src/c/classes/kriging/Observations.cpp ¶

@@ -353 +353 @@
         int           i,j,n_obs;
         IssmPDouble   prediction,error;
-        IssmPDouble   numerator,denominator,ratio;
         IssmPDouble  *x      = NULL;
         IssmPDouble  *y      = NULL;

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp ¶

@@ -128 +128 @@
 
         /*Recover Femmodel*/
-        double      f;
-        int         intn,solution_type;
+        int         solution_type;
         FemModel   *femmodel  = (FemModel*)dzs;
 

issm/trunk-jpl/src/c/cores/masstransport_core.cpp ¶

@@ -13 +13 @@
 
         /*parameters: */
-        int    i;
         int    numoutputs,domaintype;
         bool   save_results;
-        bool   issmbgradients,ispdd,isdelta18o,isFS,isfreesurface,dakota_analysis;
+        bool   isFS,isfreesurface,dakota_analysis;
         int    solution_type;
         char** requested_outputs = NULL;

issm/trunk-jpl/src/c/cores/steadystate_core.cpp ¶

@@ -21 +21 @@
 
         /*intermediary: */
-        int i;
         int step; 
         Vector<IssmDouble>* ug     = NULL;

issm/trunk-jpl/src/c/cores/transient_core.cpp ¶

@@ -20 +20 @@
 
         /*parameters: */
-        int    i;
         IssmDouble starttime,finaltime,dt,yts;
-        bool   isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution,ishydrology;
-        bool   save_results,dakota_analysis;
-        bool   time_adapt=false;
-        int    output_frequency;
-        int    domaintype,groundingline_migration,smb_model;
-        int    numoutputs         = 0;
-  Analysis *analysis = NULL;
-        char** requested_outputs = NULL;
+        bool       isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution,ishydrology;
+        bool       save_results,dakota_analysis;
+        bool       time_adapt=false;
+        int        output_frequency;
+        int        domaintype,groundingline_migration;
+        int        numoutputs         = 0;
+        Analysis  *analysis = NULL;
+        char**     requested_outputs = NULL;
 
 

issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp ¶

@@ -33 +33 @@
 
         /*intermediary: */
-        bool        isnan;
         int         i,j,count,elementnbv,numfacevertices;
         IssmDouble  value;
@@ -41 +40 @@
 
         /*Higher-order finite elements*/
-        int   v1,v2,v3,v4;
+        int   v1,v2;
         bool *my_edges = NULL;
         bool *my_faces = NULL;

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp ¶

@@ -149 +149 @@
         bool isv1,isv2;
         int  facenbv,v1,v2;
-        int  id_edge,id_element,id_face;
+        int  id_edge,id_element;
         int  elementnbe;
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp ¶

@@ -19 +19 @@
 
         int         i,j,m,k;
-        int         numoutputs,domaintype,materialtype,smb_model;
+        int         numoutputs,materialtype,smb_model;
         char**      requestedoutputs = NULL;
         IssmDouble  time;
-        bool        ispdd,isdelta18o;
+        bool        isdelta18o;
 
         /*parameters for mass flux:*/

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiSparseMat.h ¶

@@ -141 +141 @@
                 void Echo(void){
 
-                        int my_rank;
-                        int i,j,k;
-
                         /*Do a synchronized dump across all the rows: */
-                        my_rank=IssmComm::GetRank();
-                        for(i=0;i<IssmComm::GetSize();i++){
-                                if (my_rank==i){
+                        int my_rank=IssmComm::GetRank();
+                        for(int i=0;i<IssmComm::GetSize();i++){
+                                if(my_rank==i){
                                         _printf_("cpu " << i << " #rows: " << this->m << "\n");
-                                        for (j=0;j<this->m;j++){
+                                        for(int j=0;j<this->m;j++){
                                                 _printf_("row " << j << ":");
                                                 this->matrix[j]->Echo();
@@ -190 +187 @@
                         int*          this_row_cols       = NULL;
                         int*          this_row_mods       = NULL;
-                        doubletype*   this_row_values     = NULL;
                         int*          numvalues_perrow    = NULL;
                         int           row;
@@ -378 +374 @@
                         doubletype norm,local_norm;
                         doubletype absolute;
-                        int i,j;
+                        int i;
 
                         switch(mode){
@@ -421 +417 @@
                 void MatMult(IssmAbsVec<doubletype>* Xin,IssmAbsVec<doubletype>* AXin){
 
-                        int         i,j;
-                        doubletype *X_serial  = NULL;
-
                         /*A check on the types: */
                         if(IssmVecTypeFromToolkitOptions()!=MpiEnum)_error_("MatMult operation only possible with 'mpi' vectors");
@@ -432 +425 @@
 
                         /*Serialize input Xin: */
-                        X_serial=X->ToMPISerial();
+                        doubletype* X_serial=X->ToMPISerial();
 
                         /*Every cpu has a serial version of the input vector. Use it to do the Matrix-Vector multiply 
                          *locally and plug it into AXin: */
-                        for(i=0;i<this->m;i++){
+                        for(int i=0;i<this->m;i++){
                                 AX->vector[i]=this->matrix[i]->Mult(X_serial);
                         }

issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp ¶

@@ -200 +200 @@
         ISSM_MPI_Comm  comm;
         int            num_procs;
-        int            i,j;
+        int            i;
         int            nnz,local_nnz;
         int           *irn_loc    = NULL;
@@ -217 +217 @@
 
         /*First, some checks*/
-        if (Kff_M!=Kff_N)_error_("stiffness matrix Kff should be square");
-        if (uf_M!=Kff_M || uf_M!=pf_M)_error_("solution vector should be the same size as stiffness matrix Kff and load vector pf");
-        if (uf_m!=Kff_m || uf_m!=pf_m)_error_("solution vector should be locally the same size as stiffness matrix Kff and load vector pf");
+        if(Kff_M!=Kff_N)_error_("stiffness matrix Kff should be square");
+        if(uf_M!=Kff_M || uf_M!=pf_M)_error_("solution vector should be the same size as stiffness matrix Kff and load vector pf");
+        if(uf_m!=Kff_m || uf_m!=pf_m)_error_("solution vector should be locally the same size as stiffness matrix Kff and load vector pf");
 
         /*Initialize matrix */