Changeset 21915


Ignore:
Timestamp:
08/08/17 13:29:38 (8 years ago)
Author:
Mathieu Morlighem
Message:

CHG: some cppcheck changes

Location:
issm/trunk-jpl/src/c
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

    r21572 r21915  
    5959
    6060        bool   isefficientlayer;
    61         bool   element_active;
    6261        int    hydrology_model;
    6362       

  • issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp

    r20690 r21915  
    3838}/*}}}*/
    3939void MeltingAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
    40 
    41         int frictionlaw;
    4240
    4341        /*Now, is the model 3d? otherwise, do nothing: */

  • issm/trunk-jpl/src/c/bamg/BamgVertex.cpp

    r21865 r21915  
    194194                                tria->det =  bamg::det( (*tria)[0],(*tria)[1]  ,(*tria)[2]);
    195195                                if (loop) {
    196                                         BamgVertex *v0,*v1,*v2,*v3;
    197196                                        if (tria->det<0) ok =1;                       
    198197                                        else if ( (double)tria->det < detold/2 ) ok=1;

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

    r21865 r21915  
    133133                                nbt++;           
    134134                          }
    135                   if (nbt==0 && nbv==0) {
     135                  if (nbt==0 && nbv==0){
     136                          delete [] refv;
    136137                          _error_("All triangles have been removed");
    137138                  }

  • issm/trunk-jpl/src/c/classes/ExternalResults/GenericExternalResult.h

    r21845 r21915  
    321321template <> inline void GenericExternalResult<char*>::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
    322322
    323         int size;
     323        int size = 0;
    324324
    325325        if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE)size=strlen(value)+1;

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

    r21908 r21915  
    152152        #ifndef _HAVE_JAVASCRIPT_
    153153        if(this->parameters->Exist(OutputFileNameEnum)) this->parameters->FindParam(&outbinfilename,OutputFileNameEnum);
    154         if(this-parameters->Exist(LockFileNameEnum)) this->parameters->FindParam(&lockfilename,LockFileNameEnum);
     154        if(this->parameters->Exist(LockFileNameEnum)) this->parameters->FindParam(&lockfilename,LockFileNameEnum);
    155155        #endif
    156156
    … …  
    178178        /*Now delete: */
    179179        if(profiler)delete profiler;
    180        
    181        
    182 }
    183 /*}}}*/
     180}/*}}}*/
    184181
    185182/*Object management*/

  • issm/trunk-jpl/src/c/classes/Loads/Pengrid.h

    r21213 r21915  
    4646                /*Pengrid constructors, destructors {{{*/
    4747                Pengrid();
    48                 Pengrid(int index, int id, IoModel* iomodel,int analysis_type);
     48                Pengrid(int id, int index, IoModel* iomodel,int analysis_type);
    4949                ~Pengrid();
    5050                /*}}}*/

  • issm/trunk-jpl/src/c/classes/Params/StringParam.cpp

    r20827 r21915  
    5252void StringParam::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
    5353
    54         int size;
     54        int size = 0;
    5555
    5656        if(marshall_direction==MARSHALLING_FORWARD || marshall_direction == MARSHALLING_SIZE)size=strlen(value)+1;

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

    r20827 r21915  
    256256        /*If radius is not provided or is 0, return all observations*/
    257257        if(radius==0) radius=this->quadtree->root->length;
     258
     259        /*For CPPcheck*/
     260        hmin = 2*radius;
    258261
    259262        /*First, find closest point in Quadtree (fast but might not be the true closest obs)*/

  • issm/trunk-jpl/src/c/modules/ExpToLevelSetx/ExpToLevelSetx.cpp

    r21314 r21915  
    1212int ExpToLevelSetx(double** pdistance,double* x, double* y, int nods, Contours* contours){
    1313
    14         /*Contour:*/
    15         double value;
    16 
    1714        /*output: */
    18         double*  distance;
    19         distance = xNew<double>(nods);
     15        double* distance = xNew<double>(nods);
    2016        for(int i=0;i<nods;i++) distance[i]=1e50;
    2117

  • issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp

    r19332 r21915  
    149149
    150150        double xel[2],yel[2];
    151         double coord1,coord2;
     151        double coord1 = 0.;
     152        double coord2 = 0.;
    152153        double xfinal[2],yfinal[2];
    153154

  • issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp

    r21232 r21915  
    3333
    3434        /*output: */
    35         int m;
    3635        IssmDouble* dz=NULL;
    3736

  • issm/trunk-jpl/src/c/shared/Sorting/binary_search.cpp

    r14914 r21915  
    1515
    1616        /*output: */
    17         int offset;  //offset, if found
    18         int found=0; //found=0 if target is not found, 1 otherwise.
     17        int offset=0;  //offset, if found
     18        int found=0;   //found=0 if target is not found, 1 otherwise.
    1919
    2020        /*intermediary: */
Note: See TracChangeset for help on using the changeset viewer.