Changeset 27656

Timestamp:

03/24/23 12:32:46 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: updated counter

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp

@@ -40 +40 @@
         femmodel->UpdateConstraintsx();
 
-        count=1;
+        count=0;
         converged=false;
 
@@ -57 +57 @@
 
                 /*Solver forward model*/
-                if(count==1 || newton==2){
+                if(count==0 || newton==2){
                         SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
                         CreateNodalConstraintsx(&ys,femmodel->nodes);
@@ -87 +87 @@
                 Mergesolutionfromftogx(&ug,uf,ys,femmodel->nodes,femmodel->parameters);delete ys;
                 InputUpdateFromSolutionx(femmodel,ug);
+                count++;
 
                 /*Check convergence*/
                 convergence(&converged,Kff,pf,uf,old_uf,eps_res,eps_rel,eps_abs); 
                 delete Kff; delete pf;
-                if(converged==true){    
-                        break;
-                }
+                if(converged==true) break;
                 if(count>=max_nonlinear_iterations){
                         _printf0_("   maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded\n"); 
                         break;
                 }
-
-                count++;
         }
 
-        if(VerboseConvergence()) _printf0_("\n   total number of iterations: " << count-1 << "\n");
+        if(VerboseConvergence()) _printf0_("\n   total number of iterations: " << count << "\n");
 
         /*clean-up*/