Changeset 11332 for issm/trunk-jpl/src/c/solvers/solver_newton.cpp

Timestamp:

02/06/12 10:55:48 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added Newton's method for MacAyeal

File:

• issm/trunk-jpl/src/c/solvers/solver_newton.cpp (modified) (3 diffs)

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

@@ -61 +61 @@
                 convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); 
                 MatFree(&Kff);VecFree(&pf);
-                count++;
-                if(converged==true)break;
+                if(converged==true) break;
                 if(count>=max_nonlinear_iterations){
                         _printf_(true,"   maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); 
@@ -71 +70 @@
                 SystemMatricesx(&Kff,NULL,&pf,NULL,&kmax,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
                 CreateJacobianMatrixx(&Jff,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,kmax);
-                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
+                CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);VecScale(ys,0.);
                 VecDuplicate(pf,&pJf);
                 MatMultPatch(Kff,uf,pJf); MatFree(&Kff);
@@ -81 +80 @@
                 Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);VecFree(&ys);
                 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug);
+
+                count++;
         }