Changeset 11293


Ignore:
Timestamp:
02/01/12 14:55:56 (13 years ago)
Author:
seroussi
Message:

in solver_nonlinear, should compute convergence before updating the solution

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp

    r11284 r11293  
    6464                Solverx(&uf, Kff, pf, old_uf, df, femmodel->parameters);
    6565                Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys);
     66
     67                convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); MatFree(&Kff);VecFree(&pf); VecFree(&df);
     68                InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);
    6669                InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
    6770
    6871                ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
    6972                _printf_(VerboseConvergence(),"   number of unstable constraints: %i\n",num_unstable_constraints);
    70 
    71                 convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); MatFree(&Kff);VecFree(&pf); VecFree(&df);
    72                 InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);
    7373
    7474                //rift convergence
Note: See TracChangeset for help on using the changeset viewer.