Ignore:
Timestamp:
04/16/12 14:57:18 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 11994M

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/src/c/solutions/bedslope_core.cpp

    r9761 r11995  
    1414
    1515        /*parameters: */
    16         int  dim;
    17         bool isstokes;
    18         bool ishutter;
    19         bool control_analysis;
    20         int  solution_type;
     16        bool save_results;
    2117
    2218        /*Recover some parameters: */
    23         femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
    24         femmodel->parameters->FindParam(&control_analysis,InversionIscontrolEnum);
    25         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
     19        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
    2620
    2721        _printf_(VerboseSolution(),"%s\n","   computing slope");
    … …  
    3327        solver_linear(femmodel);
    3428       
    35         if(solution_type==BedSlopeSolutionEnum && !control_analysis){
     29        if(save_results){
    3630                _printf_(VerboseSolution(),"   saving results\n");
    3731                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeXEnum);
Note: See TracChangeset for help on using the changeset viewer.