Changeset 13762


Ignore:
Timestamp:
10/19/12 17:31:29 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: some cleanup from cppcheck

Location:
issm/trunk-jpl/src/c/modules
Files:
48 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp

    r13622 r13762  
    2020void AverageOntoPartitionx(double** paverage, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vertex_response){
    2121
    22         int     i,j,k;
    2322        int     dummy;
    24 
    2523        int     npart;
    2624        double *qmu_part  = NULL;
     
    4846
    4947        /*loop on each element, and add contribution of the element to the partition (surface weighted average): */
    50         for(i=0;i<elements->Size();i++){
     48        for(int i=0;i<elements->Size();i++){
    5149                Element* element=(Element*)elements->GetObjectByOffset(i);
    5250                element->AverageOntoPartition(partition_contributions,partition_areas,vertex_response,qmu_part);
  • issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp

    r13255 r13762  
    2020
    2121        /*intermediary*/
     22        int i;
    2223        int noerr=1;
    23         int i,j,num;
    2424        double costheta=2;
    2525        double hminaniso=1e-100;
  • issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp

    r13622 r13762  
    4545        int num_unstable_constraints=0;
    4646        int converged=0;
    47         int potential;
    4847
    4948        RiftConstrain(&num_unstable_constraints,loads,configuration_type);
  • issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshx.cpp

    r13622 r13762  
    1111
    1212int ContourToMeshx(SeqVec<double>** pin_nod,SeqVec<double>** pin_elem, double* index, double* x, double* y,DataSet* contours,char* interptype,int nel,int nods, int edgevalue) {
    13 
    14         int noerr=1;
    15         int i;
    16         int m,n;
    1713
    1814        /*Contour:*/
     
    5248        /*Take care of the case where an element interpolation has been requested: */
    5349        if ((strcmp(interptype,"element")==0) || (strcmp(interptype,"element and node")==0)){
    54                 for (n=0;n<nel;n++){
     50                for(int n=0;n<nel;n++){
    5551                        if ( (in_nod_serial[ (int)*(index+3*n+0) -1] == 1) && (in_nod_serial[ (int)*(index+3*n+1) -1] == 1) && (in_nod_serial[ (int)*(index+3*n+2) -1] == 1) ){
    5652                                value=1; in_elem->SetValue(n,value,INS_VAL);
     
    6965        xDelete<double>(in_nod_serial);
    7066
    71         return noerr;
     67        return 1;
    7268}
  • issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp

    r13622 r13762  
    4040int ContourToNodesx(SeqVec<IssmPDouble>** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue){
    4141
    42         int i;
    43         int m,n;
    44 
    4542        /*Contour:*/
    4643        Contour<IssmPDouble>* contouri=NULL;
     
    5653        /*Loop through all contours: */
    5754        if(contours){
    58                 for (i=0;i<contours->Size();i++){
     55                for(int i=0;i<contours->Size();i++){
    5956                        Contour<IssmPDouble>* contour=(Contour<IssmPDouble>*)contours->GetObjectByOffset(i);
    6057                        IsInPoly(flags,contour->x,contour->y,contour->nods,x,y,0,nods,edgevalue);
  • issm/trunk-jpl/src/c/modules/HoleFillerx/HoleFillerx.cpp

    r13622 r13762  
    1111int HoleFillerx(double** pimageout,double* image, int lines,int samps,int smooth){
    1212
    13         FILE                    *fp1;
    14         unsigned long   filesize;
    1513        long                    infinit;
    1614        double          temp;
    17         long                    i, j, k, l, ii, jj, bytes;
     15        long                    i, j, k, l, ii, jj;
    1816        long                    iii, jjj;
    19         long                    test, prevlines, prevpix, test1, test2, thresh,counter;
    20         long                    bell, cycles, leftovers;
     17        long                    test;
    2118        float                   howlong;
    2219        float                   nsteps, ssteps, wsteps, esteps;
     
    3835        double*         image3=NULL;
    3936        double*         image4=NULL;
    40 
    41         /*Added to original routine: */
    42         int             imageoutsize;
    4337
    4438         /*^^^^^^^^^^^^^  Remove pixels close to the holes ^^^^^^^^^^^^^*/
  • issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

    r13622 r13762  
    3030        double areacoord[3];
    3131        double aa,bb;
    32         double data_value;
    3332        Icoor2 dete[3];
    3433
  • issm/trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp

    r13622 r13762  
    1414        /*intermediary: */
    1515        int     i,j;
    16         bool    transient     = false;
    17 
    18         FILE   *fid           = NULL;
    19         int     code          = 0;
    20         int     vector_layout = 0;
    21         int     counter;
    22         int     nods;
    23         IssmDouble* times=NULL;
    24         IssmDouble* values=NULL;
    25         bool    spcpresent=false;
    26         int     count=0;
    27         int     numberofvertices;
     16        bool        transient        = false;
     17        FILE       *fid              = NULL;
     18        int         code             = 0;
     19        int         vector_layout    = 0;
     20        IssmDouble *times            = NULL;
     21        IssmDouble *values           = NULL;
     22        bool        spcpresent       = false;
     23        int         count            = 0;
     24        int         numberofvertices;
    2825
    2926        /*variables being fetched: */
  • issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp

    r13622 r13762  
    2525                         int sgn,double cm,double sp){
    2626
    27         int     i,iret=0;
     27        int     iret=0;
    2828        double  *lat=NULL,*lon=NULL;
    2929
  • issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/ElementSegment.cpp

    r13622 r13762  
    99         * If they do, create a Segment object with the intersection, and add to segments_dataset dataset: */
    1010
    11         int i;
    12         double alpha;
    1311        double alpha1,alpha2;
    1412        double beta1,beta2;
  • issm/trunk-jpl/src/c/modules/MeshProfileIntersectionx/MeshProfileIntersectionx.cpp

    r13622 r13762  
    77
    88        int i,j,k;
    9         int m,n;
    109
    1110        /*Contour:*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp

    r13622 r13762  
    1010void    CreateConstraintsBalancethickness(Constraints** pconstraints, IoModel* iomodel){
    1111
     12        /*Fetch parameters: */
    1213        int    stabilization;   
    13 
    14         /*Fetch parameters: */
    1514        iomodel->Constant(&stabilization,BalancethicknessStabilizationEnum);
    1615
    17         /*Output*/
    18         Constraints* constraints = NULL;
    19 
    2016        /*Recover pointer: */
    21         constraints=*pconstraints;
     17        Constraints* constraints=*pconstraints;
    2218
    2319        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp

    r13622 r13762  
    1414
    1515        /*Intermediary*/
    16         int i;
    1716        int element;
    1817        int stabilization;
     
    2322        iomodel->Constant(&numberofedges,MeshNumberofedgesEnum);
    2423
    25         /*Output*/
    26         Loads*    loads    = NULL;
    27 
    2824        /*Recover pointer: */
    29         loads=*ploads;
     25        Loads* loads=*ploads;
    3026
    3127        /*Create loads if they do not exist yet*/
     
    3935
    4036                /*First load data:*/
    41                 for (i=0;i<numberofedges;i++){
     37                for (int i=0;i<numberofedges;i++){
    4238
    4339                        /*Get left and right elements*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp

    r13073 r13762  
    2626        int    stabilization;
    2727
    28         /*DataSets: */
    29         Nodes*    nodes = NULL;
    30 
    3128        /*Fetch parameters: */
    3229        iomodel->Constant(&dim,MeshDimensionEnum);
     
    3633
    3734        /*Recover pointer: */
    38         nodes=*pnodes;
     35        Nodes* nodes=*pnodes;
    3936
    4037        /*Create nodes if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp

    r13622 r13762  
    1313void    CreateConstraintsBedSlope(Constraints** pconstraints, IoModel* iomodel){
    1414
    15         /*Output*/
    16         Constraints* constraints = NULL;
    17 
    1815        /*Recover pointer: */
    19         constraints=*pconstraints;
     16        Constraints* constraints=*pconstraints;
    2017
    2118        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateLoadsBedSlope.cpp

    r12832 r13762  
    1313void    CreateLoadsBedSlope(Loads** ploads, IoModel* iomodel){
    1414
    15         /*DataSet*/
    16         Loads*    loads    = NULL;
    17 
    1815        /*Recover pointer: */
    19         loads=*ploads;
     16        Loads* loads=*ploads;
    2017
    2118        /*Create loads if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp

    r13622 r13762  
    1818        int i;
    1919        bool continuous_galerkin=true;
    20         int    numberofvertices;
    21 
    22         /*DataSets: */
    23         Nodes*    nodes = NULL;
    2420
    2521        /*Fetch parameters: */
     22        int    numberofvertices;
    2623        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
    2724
    2825        /*Recover pointer: */
    29         nodes=*pnodes;
     26        Nodes* nodes=*pnodes;
    3027
    3128        /*Create nodes if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

    r13622 r13762  
    1414
    1515        /*DataSets*/
    16         Loads     *loads     = NULL;
    1716        Icefront  *icefront  = NULL;
    1817        Riftfront *riftfront = NULL;
     
    4847
    4948        /*Recover pointer: */
    50         loads=*ploads;
     49        Loads* loads=*ploads;
    5150
    5251        /*Create loads if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

    r13622 r13762  
    2121        bool   isstokes,isl1l2,ismacayealpattyn;
    2222
    23         /*DataSets: */
    24         Nodes*    nodes = NULL;
    25 
    2623        /*Fetch parameters: */
    2724        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
     
    3128
    3229        /*Recover pointer: */
    33         nodes=*pnodes;
     30        Nodes* nodes=*pnodes;
    3431
    3532        /*First create nodes*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp

    r13622 r13762  
    1313void    CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel){
    1414
    15         /*DataSet*/
    16         Loads* loads=NULL;
    17 
    1815        /*Recover pointer: */
    19         loads=*ploads;
     16        Loads* loads=*ploads;
    2017
    2118        /*Create loads if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

    r12832 r13762  
    2121        bool   ishutter;
    2222
    23         /*DataSets: */
    24         Nodes*    nodes = NULL;
    25 
    2623        /*Fetch parameters: */
    2724        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
     
    2926
    3027        /*Recover pointer: */
    31         nodes=*pnodes;
     28        Nodes* nodes=*pnodes;
    3229
    3330        /*Create nodes if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp

    r13073 r13762  
    2020        int    numberofvertices;
    2121
    22         /*Output*/
    23         Constraints* constraints = NULL;
    24 
    2522        /*Fetch parameters: */
    2623        iomodel->Constant(&dim,MeshDimensionEnum);
     
    2926
    3027        /*Recover pointer: */
    31         constraints=*pconstraints;
     28        Constraints* constraints=*pconstraints;
    3229
    3330        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp

    r12832 r13762  
    1313void    CreateLoadsDiagnosticVert(Loads** ploads, IoModel* iomodel){
    1414
    15         /*DataSet*/
    16         Loads* loads=NULL;
    17 
    1815        /*Recover pointer: */
    19         loads=*ploads;
     16        Loads* loads=*ploads;
    2017
    2118        /*Create loads if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp

    r13622 r13762  
    2121        int    numberofvertices;
    2222
    23         /*DataSets: */
    24         Nodes*    nodes = NULL;
    25 
    2623        /*Fetch parameters: */
    2724        iomodel->Constant(&dim,MeshDimensionEnum);
     
    2926
    3027        /*Recover pointer: */
    31         nodes=*pnodes;
     28        Nodes* nodes=*pnodes;
    3229
    3330        /*Create nodes if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateConstraintsEnthalpy.cpp

    r13622 r13762  
    2828        IssmDouble* times=NULL;
    2929        IssmDouble* values=NULL;
    30         Constraints* constraints = NULL;
    3130
    3231        /*Fetch parameters: */
     
    3736
    3837        /*Recover pointer: */
    39         constraints=*pconstraints;
     38        Constraints* constraints=*pconstraints;
    4039
    4140        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateLoadsEnthalpy.cpp

    r13622 r13762  
    1313void    CreateLoadsEnthalpy(Loads** ploads, IoModel* iomodel){
    1414
    15         /*DataSet*/
    16         Loads* loads=NULL;
    17 
    1815        /*Recover pointer: */
    19         loads=*ploads;
     16        Loads* loads=*ploads;
    2017
    2118        /*Create loads if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp

    r13622 r13762  
    2020        int    numberofvertices;
    2121
    22         /*DataSets: */
    23         Nodes*    nodes = NULL;
    24 
    2522        /*Fetch parameters: */
    2623        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
    2724
    2825        /*Recover pointer: */
    29         nodes=*pnodes;
     26        Nodes* nodes=*pnodes;
    3027
    3128        /*Create nodes if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp

    r13622 r13762  
    1414void    CreateConstraintsHydrology(Constraints** pconstraints, IoModel* iomodel){
    1515
    16         /*Output*/
    17         Constraints *constraints = NULL;
    18 
    1916        /*Recover pointer: */
    20         constraints=*pconstraints;
     17        Constraints* constraints=*pconstraints;
    2118
    2219        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp

    r12832 r13762  
    1313void    CreateLoadsHydrology(Loads** ploads, IoModel* iomodel){
    1414
    15         /*Intermediary*/
    16         int i;
    17 
    18         /*DataSet*/
    19         Loads*    loads    = NULL;
    20 
    2115        /*Recover pointer: */
    22         loads=*ploads;
     16        Loads* loads=*ploads;
    2317
    2418        /*Create loads if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp

    r13622 r13762  
    2020        int    numberofvertices;
    2121
    22         /*DataSets: */
    23         Nodes*    nodes = NULL;
    24 
    2522        /*Fetch parameters: */
    2623        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
    2724
    2825        /*Recover pointer: */
    29         nodes=*pnodes;
     26        Nodes* nodes=*pnodes;
    3027
    3128        /*Create nodes if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp

    r13622 r13762  
    1313void    CreateConstraintsMelting(Constraints** pconstraints, IoModel* iomodel){
    1414
    15         /*Intermediary*/
    16         int i;
    17         int count;
    18 
    19         /*Intermediary*/
    20         Constraints* constraints = NULL;
    21 
    2215        /*Recover pointer: */
    23         constraints=*pconstraints;
     16        Constraints* constraints=*pconstraints;
    2417
    2518        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp

    r13073 r13762  
    1414
    1515        /*Intermediary*/
    16         int i;
    17         int    dim;
    18         int    numberofvertices;
    19 
    20         /*DataSet*/
    21         Loads*    loads    = NULL;
    22 
    23         /*Fetch parameters: */
     16        int dim;
     17        int numberofvertices;
    2418        iomodel->Constant(&dim,MeshDimensionEnum);
    2519        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
     
    2923
    3024        /*Recover pointer: */
    31         loads=*ploads;
     25        Loads* loads=*ploads;
    3226
    3327        /*Create loads if they do not exist yet*/
     
    3832        CreateSingleNodeToElementConnectivity(iomodel);
    3933
    40         for (i=0;i<numberofvertices;i++){
     34        for(int i=0;i<numberofvertices;i++){
    4135                if((iomodel->my_vertices[i]==1)){
    4236                        if (reCast<int>(iomodel->Data(MeshVertexonbedEnum)[i])){
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp

    r13622 r13762  
    2020        int    numberofvertices;
    2121
    22         /*DataSets: */
    23         Nodes*    nodes = NULL;
    24 
    2522        /*Fetch parameters: */
    2623        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
    2724
    2825        /*Recover pointer: */
    29         nodes=*pnodes;
     26        Nodes* nodes=*pnodes;
    3027
    3128        /*Create nodes if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

    r13622 r13762  
    1010void    CreateConstraintsPrognostic(Constraints** pconstraints, IoModel* iomodel){
    1111
     12        /*Fetch parameters: */
    1213        int stabilization;
    13 
    14         /*Fetch parameters: */
    1514        iomodel->Constant(&stabilization,PrognosticStabilizationEnum);
    1615
    17         /*Output*/
    18         Constraints *constraints = NULL;
    19 
    2016        /*Recover pointer: */
    21         constraints=*pconstraints;
     17        Constraints* constraints=*pconstraints;
    2218
    2319        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

    r13622 r13762  
    2323        int numberofelements;
    2424
    25         /*DataSet*/
    26         Loads*    loads    = NULL;
    27 
    2825        /*Fetch parameters: */
    2926        iomodel->Constant(&stabilization,PrognosticStabilizationEnum);
     
    3229
    3330        /*Recover pointer: */
    34         loads=*ploads;
     31        Loads* loads=*ploads;
    3532
    3633        /*Create loads if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp

    r13056 r13762  
    2626        int    stabilization;
    2727
    28         /*DataSets: */
    29         Nodes*    nodes = NULL;
    30 
    3128        /*Fetch parameters: */
    3229        iomodel->Constant(&dim,MeshDimensionEnum);
     
    3633
    3734        /*Recover pointer: */
    38         nodes=*pnodes;
     35        Nodes* nodes=*pnodes;
    3936
    4037        /*Create nodes if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp

    r13622 r13762  
    1313void    CreateConstraintsSurfaceSlope(Constraints** pconstraints, IoModel* iomodel){
    1414
    15         /*Output*/
    16         Constraints* constraints = NULL;
    17 
    1815        /*Recover pointer: */
    19         constraints=*pconstraints;
     16        Constraints* constraints=*pconstraints;
    2017
    2118        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp

    r12832 r13762  
    1313void    CreateLoadsSurfaceSlope(Loads** ploads, IoModel* iomodel){
    1414
    15         /*DataSet*/
    16         Loads*    loads    = NULL;
    17 
    1815        /*Recover pointer: */
    19         loads=*ploads;
     16        Loads* loads=*ploads;
    2017
    2118        /*Create loads if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp

    r13622 r13762  
    1616
    1717        /*Intermediary*/
    18         int i;
    1918        bool continuous_galerkin=true;
    2019        int    numberofvertices;
    21 
    22         /*DataSets: */
    23         Nodes*    nodes = NULL;
    2420
    2521        /*Fetch parameters: */
     
    2723
    2824        /*Recover pointer: */
    29         nodes=*pnodes;
     25        Nodes* nodes=*pnodes;
    3026
    3127        /*Create nodes if they do not exist yet*/
     
    3834        iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
    3935
    40         for (i=0;i<numberofvertices;i++){
    41 
     36        for(int i=0;i<numberofvertices;i++){
    4237                if(iomodel->my_vertices[i]){
    4338
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp

    r13622 r13762  
    1414void    CreateConstraintsThermal(Constraints** pconstraints, IoModel* iomodel){
    1515
    16         /*Intermediary*/
    17         int i;
    18         int count;
     16        /*Fetch parameters: */
    1917        int    dim;
    20 
    21         /*Output*/
    22         Constraints* constraints = NULL;
    23 
    24         /*Fetch parameters: */
    2518        iomodel->Constant(&dim,MeshDimensionEnum);
    2619
    2720        /*Recover pointer: */
    28         constraints=*pconstraints;
     21        Constraints* constraints=*pconstraints;
    2922
    3023        /*Create constraints if they do not exist yet*/
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

    r13622 r13762  
    1717        int    dim;
    1818        int    numberofvertices;
    19 
    20         /*DataSet*/
    21         Loads*    loads    = NULL;
    2219        Pengrid*    pengrid  = NULL;
    2320
    2421        /*Recover pointer: */
    25         loads=*ploads;
     22        Loads* loads=*ploads;
    2623
    2724        /*Fetch parameters: */
  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp

    r13622 r13762  
    1616
    1717        /*Intermediary*/
    18         int i;
    1918        bool continuous_galerkin=true;
    20         int    numberofvertices;
    21 
    22         /*DataSets: */
    23         Nodes*    nodes = NULL;
    2419
    2520        /*Fetch parameters: */
     21        int    numberofvertices;
    2622        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
    2723
    2824        /*Recover pointer: */
    29         nodes=*pnodes;
     25        Nodes* nodes=*pnodes;
    3026
    3127        /*Create nodes if they do not exist yet*/
     
    3834        iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
    3935
    40         for (i=0;i<numberofvertices;i++){
    41 
     36        for(int i=0;i<numberofvertices;i++){
    4237                if(iomodel->my_vertices[i]){
    4338                        /*Add node to nodes dataset: */
  • issm/trunk-jpl/src/c/modules/NodesDofx/NodesDofx.cpp

    r13622 r13762  
    1414        int noerr=1;
    1515        int found=0;
    16         int i;
    1716
    1817        /*Do we have any nodes for this analysis type? :*/
  • issm/trunk-jpl/src/c/modules/Orthx/Orthx.cpp

    r13622 r13762  
    1111
    1212        /*intermediary:*/
    13         IssmDouble norm_new,norm_old,dot_product;;
     13        IssmDouble norm_old,dot_product;;
    1414
    1515        /*Initialize output*/
  • issm/trunk-jpl/src/c/modules/Reduceloadx/Reduceloadx.cpp

    r13622 r13762  
    2020        int         global_m,global_n;
    2121        bool        fromlocalsize = true;
    22         int         verbose;
    2322
    2423        if(VerboseModule()) _pprintLine_("   Dirichlet lifting applied to load vector");
  • issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp

    r13216 r13762  
    1515
    1616void    Solverx(Vector<IssmDouble>** puf, Matrix<IssmDouble>* Kff, Vector<IssmDouble>* pf, Vector<IssmDouble>* uf0,Vector<IssmDouble>* df, Parameters* parameters){
    17 
    18         /*Intermediary: */
    19         int analysis_type;
    2017
    2118        /*output: */
  • issm/trunk-jpl/src/c/modules/Solverx/SolverxPetsc.cpp

    r13622 r13762  
    3636        /*Intermediary: */
    3737        int        local_m,local_n,global_m,global_n;
    38         int        analysis_type;
    3938
    4039        /*Solver */
  • issm/trunk-jpl/src/c/modules/TriaSearchx/TriaSearchx.cpp

    r13622 r13762  
    2424        R2     r;
    2525        I2     I;
    26         int    i,j,k;
    27         int    i0,i1,i2;
    28         double areacoord[3];
    29         double aa,bb;
    30         double data_value;
     26        int    i;
    3127        Icoor2 dete[3];
    32         int verbose=0;
    3328
    34         // read background mesh
     29        /* read background mesh */
    3530        Mesh Th(index,x,y,nods,nel);
    3631        Th.CreateSingleVertexToTriangleConnectivity();
Note: See TracChangeset for help on using the changeset viewer.