Ignore:
Timestamp:
01/27/12 08:19:58 (13 years ago)
Author:
Eric.Larour
Message:

merged trunk-jpl and trunk for revision 11236

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

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

    r10601 r11237  
    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);
Note: See TracChangeset for help on using the changeset viewer.