Changeset 13758

Timestamp:

10/19/12 17:27:45 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: some cleanup from cppcheck

Location:

issm/trunk-jpl/src/c/shared

Files:

• Elements/Paterson.cpp (modified) (1 diff)
• Elements/PddSurfaceMassBalance.cpp (modified) (2 diffs)
• Elements/TransformLoadVectorCoord.cpp (modified) (1 diff)
• Elements/TransformSolutionCoord.cpp (modified) (1 diff)
• Exceptions/exprintf.cpp (modified) (1 diff)
• Exp/IsInPolySerial.cpp (modified) (1 diff)
• Exp/exp.h (modified) (2 diffs)
• Numerics/XZvectorsToCoordinateSystem.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Elements/Paterson.cpp

@@ -60 +60 @@
                 B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.003748937622487*pow(T+5,3)+0.015290593619213*pow(T+5,2)  -0.048160403003748*(T+5)+  0.854987973338348);
         }
-        else if(T>=-2.0){
+        else{
                 B=pow((IssmPDouble)10,(IssmPDouble)8)*(-0.003748937622488*pow(T+2,3)-0.018449844983174*pow(T+2,2)  -0.057638157095631*(T+2)+  0.746900791092860);
         }

issm/trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp

@@ -10 +10 @@
   IssmDouble B;    // surface mass balance, melt+accumulation
 
-  int    iqj,imonth, j;
+  int    iqj,imonth;
 
   IssmDouble saccu;     // yearly surface accumulation
@@ -20 +20 @@
   IssmDouble sconv; //rhow_rain/rhoi / 12 months
 
-  IssmDouble density;
   IssmDouble lapser=6.5/1000., sealev=0.;    // lapse rate. degrees per meter. 7.5 lev's 99 paper, 9 Marshall 99 paper
   IssmDouble desfac = 0.5;                 // desert elevation factor

issm/trunk-jpl/src/c/shared/Elements/TransformLoadVectorCoord.cpp

@@ -20 +20 @@
 void TransformLoadVectorCoord(ElementVector* pe,Node** nodes,int numnodes,int* cs_array){
 
-        int     i,j;
+        int     i;
         int     numdofs   = 0;
         IssmDouble *transform = NULL;

issm/trunk-jpl/src/c/shared/Elements/TransformSolutionCoord.cpp

@@ -21 +21 @@
 void TransformSolutionCoord(IssmDouble* solution,Node** nodes,int numnodes,int* cs_array){
 
-        int     i,j;
+        int     i;
         int     numdofs   = 0;
         IssmDouble *transform = NULL;

issm/trunk-jpl/src/c/shared/Exceptions/exprintf.cpp

@@ -16 +16 @@
         char *buffer = NULL;
         int   n,size = 100;
-        int   string_size;
 
         //variable list of arguments

issm/trunk-jpl/src/c/shared/Exp/IsInPolySerial.cpp

@@ -9 +9 @@
 int IsInPolySerial(double* in,double* xc,double* yc,int numvertices,double* x,double* y,int nods, int edgevalue){
 
-        int i,j;
         double x0,y0;
 
         /*Go through all vertices of the mesh:*/
-        for (i=0;i<nods;i++){
+        for(int i=0;i<nods;i++){
                 if (in[i]){
                         /*this vertex already is inside one of the contours, continue*/

issm/trunk-jpl/src/c/shared/Exp/exp.h

@@ -90 +90 @@
         nprof=1;
         for(;;){
-                fscanf(fid,"%256s %256s\n",chardummy,chardummy);
-                fscanf(fid,"%256s %256s\n",chardummy,chardummy);
-                fscanf(fid,"%256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy);
-                fscanf(fid,"%20u %256s\n",&n,chardummy);
-                fscanf(fid,"%256s %256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
+                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
+                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
+                fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy);
+                fscanf(fid,"%20u %255s\n",&n,chardummy);
+                fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
                 for (i=0;i<n;i++) fscanf(fid,"%20lf %20lf\n",&ddummy,&ddummy);
                 /*check whether we are at the end of the file, otherwise, keep reading next profile:*/
@@ -118 +118 @@
 
                 /*Skip header: */
-                fscanf(fid,"%256s %256s\n",chardummy,chardummy);
-                fscanf(fid,"%256s %256s\n",chardummy,chardummy);
-                fscanf(fid,"%256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy);
+                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
+                fscanf(fid,"%255s %255s\n",chardummy,chardummy);
+                fscanf(fid,"%255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy);
 
                 /*Get number of profile vertices: */
-                fscanf(fid,"%20u %256s\n",&n,chardummy);
+                fscanf(fid,"%20u %255s\n",&n,chardummy);
 
                 /*Skip next line: */
-                fscanf(fid,"%256s %256s %256s %256s %256s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
+                fscanf(fid,"%255s %255s %255s %255s %255s\n",chardummy,chardummy,chardummy,chardummy,chardummy);
 
                 /*Allocate vertices: */

issm/trunk-jpl/src/c/shared/Numerics/XZvectorsToCoordinateSystem.cpp

@@ -7 +7 @@
 void XZvectorsToCoordinateSystem(IssmDouble* T,IssmDouble* xzvectors){
 
-        int             i,j;
         IssmDouble      x[3],y[3],z[3];
         IssmDouble      x_norm, y_norm, z_norm;
 
-        for(i=0;i<6;i++){
+        for(int i=0;i<6;i++){
                 if(xIsNan<IssmDouble>(xzvectors[i])){
                         /*At least one NaN found: default to Id*/