Changeset 14576

Timestamp:

04/15/13 13:19:09 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cppcheck changes

Location:

issm/trunk-jpl/src/c/classes

Files:

• IoModel.cpp (modified) (3 diffs)
• objects/Elements/Penta.cpp (modified) (5 diffs)

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

@@ -207 +207 @@
 void IoModel::DeclareIndependents(void){
 
-        int         i;
-        bool        autodiff                = false;
-        int         num_independent_objects;
+        int  i;
+        bool autodiff = false;
+        int  num_independent_objects;
 
         int *names = NULL;
         int *types = NULL;
 
-        int         numberofvertices;
-        int         dummy;
-        bool        keep=false;
+        int  numberofvertices,dummy;
+        bool keep=false;
 
         /*Initialize array detecting whether data[i] is an independent AD mode variable: */
@@ -228 +227 @@
 
                 #ifdef _HAVE_ADOLC_
-
-                /*Start trace: {{{*/
+                /*Start trace*/
                 this->FetchData(&keep,AutodiffKeepEnum);
                 if(keep)trace_on(1,1);
                 else    trace_on(1);
 
-                /*}}}*/
-                /*build dataset made of independent objects: {{{*/
+                /*build dataset made of independent objects:*/
                 this->independent_objects=new DataSet();
                 this->FetchData(&num_independent_objects,AutodiffNumIndependentObjectsEnum);
@@ -257 +254 @@
                         xDelete<int>(names);
                         xDelete<int>(types);
-                } /*}}}*/
-
+                }
                 #else
                 /*if we asked for AD computations, we have a problem!: */

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

@@ -1578 +1578 @@
 void  Penta::InputToResult(int enum_type,int step,IssmDouble time){
 
-        int    i;
         bool   found = false;
         Input *input = NULL;
@@ -2180 +2179 @@
 void  Penta::MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding){
 
-        int     i,migration_style,unground;
+        int     i,migration_style;
         bool    floatingelement = false;
         IssmDouble  bed_hydro,yts,gl_melting_rate;
@@ -2684 +2683 @@
 Tria*  Penta::SpawnTria(int g0, int g1, int g2){
 
-        int   i,analysis_counter;
+        int   analysis_counter;
         int   indices[3];
         int   zero=0;
@@ -2732 +2731 @@
    IssmDouble h[NUMVERTICES];                                   // ice thickness (m)            
         IssmDouble s[NUMVERTICES];                                      // surface elevation (m)
-        IssmDouble a_pos[NUMVERTICES];                          // Hs-SMB relation parameter 
         IssmDouble b_pos[NUMVERTICES];                          // Hs-SMB relation parameter
-        IssmDouble a_neg[NUMVERTICES];                          // Hs-SMB relation parameter
         IssmDouble b_neg[NUMVERTICES];                          // Hs-SMB relation paremeter
-        IssmDouble Hc[NUMVERTICES];                                     // elevation of transition between accumulation regime and ablation regime
         IssmDouble Href[NUMVERTICES];                                   // reference elevation from which deviations are used to calculate the SMB adjustment
         IssmDouble Smbref[NUMVERTICES];                         // reference SMB to which deviations are added
-        IssmDouble smb_pos_max[NUMVERTICES];            // maximum SMB value in the accumulation regime
-        IssmDouble smb_pos_min[NUMVERTICES];            // minimum SMB value in the accumulation regime
    IssmDouble rho_water;                   // density of fresh water
         IssmDouble rho_ice;                     // density of ice
@@ -2884 +2878 @@
 
         /*Intermediaries*/
-        IssmInt    i,j;
+        int        i;
         int        penta_type;
         int        penta_node_ids[6];