Changeset 11293

Timestamp:

02/01/12 14:55:56 (13 years ago)

Author:

seroussi

Message:

in solver_nonlinear, should compute convergence before updating the solution

File:

• issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp

@@ -64 +64 @@
                 Solverx(&uf, Kff, pf, old_uf, df, femmodel->parameters);
                 Mergesolutionfromftogx(&ug, uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys);
+
+                convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); MatFree(&Kff);VecFree(&pf); VecFree(&df);
+                InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);
                 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug);
 
                 ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);
                 _printf_(VerboseConvergence(),"   number of unstable constraints: %i\n",num_unstable_constraints);
-
-                convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); MatFree(&Kff);VecFree(&pf); VecFree(&df);
-                InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,converged,ConvergedEnum);
 
                 //rift convergence