Changeset 11197


Ignore:
Timestamp:
01/25/12 08:36:48 (13 years ago)
Author:
Mathieu Morlighem
Message:

Fixed many warnings on pleiades: missing return statement, uninitialized
values, wrong print argument,... etc

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

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/include/types.h

    r9320 r11197  
    2727
    2828/*here are our abstracted types: inspired on petsc */
    29 #if defined(ISSM_USE_64BIT_INDICES)
     29#if ISSM_USE_64BIT_INDICES == 1
    3030typedef long long IssmInt;
    3131//#define MPIU_INT MPI_LONG_LONG_INT already define in petsc

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp

    r10522 r11197  
    6868        iomodel->DeleteData(2,DiagnosticSpcvzEnum,FlowequationBorderstokesEnum);
    6969
    70         cleanup_and_return:
    71 
    7270        /*Assign output pointer: */
    7371        *pconstraints=constraints;

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

    r4573 r11197  
    3030        xfree((void**)&thickness);
    3131        xfree((void**)&bed);
     32        return 1;
    3233}

  • issm/trunk-jpl/src/c/objects/Inputs/TransientInput.cpp

    r10135 r11197  
    352352        infnorm=input->InfinityNorm();
    353353                           
    354         delete input;
    355 
     354        /*Clean-up and return*/
     355        delete input;
     356        return infnorm;
    356357}
    357358/*}}}*/
    … …  
    391392        maxabs=input->MaxAbs();
    392393
    393         delete input;
    394 
     394        /*Clean-up and return*/
     395        delete input;
    395396        return maxabs;
    396397
    … …  
    412413        min=input->Min();
    413414
    414         delete input;
    415 
     415        /*Clean-up and return*/
     416        delete input;
    416417        return min;
    417418
    … …  
    433434        minabs=input->MinAbs();
    434435                           
    435         delete input;
    436 
     436        /*Clean-up and return*/
     437        delete input;
    437438        return minabs;
    438439}

  • issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp

    r11196 r11197  
    162162        printf("   friction: %g\n",friction);
    163163        printf("   fraction: %g\n",fraction);
    164         printf("   fractionincrement: %i\n",fractionincrement);
     164        printf("   fractionincrement: %g\n",fractionincrement);
    165165        printf("   state: %i\n",state);
    166166        printf("   frozen: %s\n",frozen ? "true":"false");
    … …  
    771771        /*assign output pointer: */
    772772        *punstable=unstable;
     773        return 1;
    773774}
    774775/*}}}1*/
    … …  
    850851        /*assign output pointer: */
    851852        *ppenetration=penetration;
    852 
     853        return 1;
    853854}
    854855/*}}}1*/
    … …  
    889890        /*assign output pointer: */
    890891        *ppenetration=penetration;
    891 
     892        return 1;
    892893}
    893894/*}}}1*/
    … …  
    942943        /*assign output pointer: */
    943944        *punstable=unstable;
     945        return 1;
    944946}
    945947/*}}}1*/
    … …  
    10061008        /*assign output pointer: */
    10071009        *punstable=unstable;
     1010        return 1;
    10081011}
    10091012/*}}}1*/

  • issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp

    r9883 r11197  
    6464        for(i=0;i<this->M;i++){
    6565                for(i=0;i<this->N;i++){
    66                         printf("%i %i %g\n",i,j,*(this->value+N*i+j));
     66                        printf("(%i,%i) %i\n",i,j,*(this->value+N*i+j));
    6767                }
    6868        }

  • issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp

    r9883 r11197  
    7878        printf("   vector size: %i\n",this->M);
    7979        for(i=0;i<this->M;i++){
    80                 printf("%i %g\n",i,this->values[i]);
     80                printf("%i %i\n",i,this->values[i]);
    8181        }
    8282}

  • issm/trunk-jpl/src/c/objects/Vertex.cpp

    r11001 r11197  
    7171        printf("   z: %g\n",z);
    7272        printf("   sigma: %g\n",sigma);
    73         printf("   connectivity: %g\n",connectivity);
     73        printf("   connectivity: %i\n",connectivity);
    7474        printf("   dof: %i\n",dof);
    7575        printf("   clone: %i\n",clone);

  • issm/trunk-jpl/src/c/shared/Elements/GetVerticesCoordinates.cpp

    r6412 r11197  
    55#include "./elements.h"
    66
    7 int GetVerticesCoordinates(double* xyz,  Node** nodes, int numvertices){
     7void GetVerticesCoordinates(double* xyz,  Node** nodes, int numvertices){
    88
    99        /*In debugging mode, check that nodes is not a NULL pointer*/

  • issm/trunk-jpl/src/c/shared/Elements/elements.h

    r10529 r11197  
    1313double Paterson(double temperature);
    1414double Arrhenius(double temperature,double depth,double n);
    15 int    GetVerticesCoordinates(double* xyz,  Node** nodes, int numvertices);
     15void   GetVerticesCoordinates(double* xyz,  Node** nodes, int numvertices);
    1616int    GetNumberOfDofs( Node** nodes,int numnodes,int setenum,int approximation_enum);
    1717int*   GetLocalDofList( Node** nodes,int numnodes,int setenum,int approximation_enum);

  • issm/trunk-jpl/src/c/solvers/solver_thermal_nonlinear.cpp

    r10601 r11197  
    3030        int thermal_penalty_threshold;
    3131        int thermal_maxiter;
    32         bool reset_penalties;
    3332
    3433        /*parameters:*/
    … …  
    4948
    5049        _printf_(VerboseSolution(),"%s\n","starting direct shooting method");
    51         InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,reset_penalties,ResetPenaltiesEnum);
    52         InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,false,ConvergedEnum);
     50        InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,true,ResetPenaltiesEnum);
     51        InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,false,ConvergedEnum);
    5352        UpdateConstraintsx(femmodel->nodes,femmodel->constraints,femmodel->parameters);
    5453
    … …  
    6261                MatFree(&Kff);VecFree(&pf);VecFree(&tg); VecFree(&df);
    6362                Mergesolutionfromftogx(&tg, tf,ys,femmodel->nodes,femmodel->parameters); VecFree(&ys);
    64                 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,tg);
     63                InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,tg);
    6564
    6665                ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);

  • issm/trunk-jpl/src/c/toolkits/petsc/patches/MatPartition.cpp

    r9826 r11197  
    123123        /*Assign output pointers:*/
    124124        *poutmatrix=outmatrix;
     125        return 1;
    125126}
Note: See TracChangeset for help on using the changeset viewer.