Changeset 12271

Timestamp:

05/18/12 16:42:13 (13 years ago)

Author:

habbalf

Message:

First attempt at adding convergence flag: (i.e. whether loop exited due to convergence criteria or maximum number of iterations). Not sure if Addobject( new BoolExternalResults _ ) is correct or will it end up duplicating this field in the results in multiple solves within a solution sequence? I have not checked-in thermal_nonlinear.cpp or stokescoupling_nonlinear.cpp since I am not using these yet...Will be testing, but feel free to change

Location:

issm/trunk-jpl/src/c/solvers

Files:

• solver_newton.cpp (modified) (1 diff)
• solver_nonlinear.cpp (modified) (1 diff)

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

@@ -67 +67 @@
                 convergence(&converged,Kff,pf,uf,old_uf,femmodel->parameters); 
                 xdelete(&Kff); xdelete(&pf);
-                if(converged==true) break;
+                if(converged==true){    
+                        bool max_iteration_state=false;
+                        int tempStep=1;
+                        double tempTime=1.0;
+                        femmodel->results->AddObject(new BoolExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime));
+                        break;
+                }
                 if(count>=max_nonlinear_iterations){
-                        _printf_(true,"   maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); 
+                        _printf_(true,"   maximum number of Newton iterations (%i) exceeded\n",max_nonlinear_iterations); 
+                        bool max_iteration_state=true;
+                        int tempStep=1;
+                        double tempTime=1.0;
+                        femmodel->results->AddObject(new BoolExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime));
                         break;
                 }

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

@@ -85 +85 @@
                 /*Increase count: */
                 count++;
-                if(converged==true)break;
+                if(converged==true){
+                        bool max_iteration_state=false;
+                        int tempStep=1;
+                        double tempTime=1.0;
+                        femmodel->results->AddObject(new BoolExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime));
+                        break;
+                }
                 if(count>=max_nonlinear_iterations){
-                        _printf_(true,"   maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); 
+                        _printf_(true,"   maximum number of nonlinear iterations (%i) exceeded\n",max_nonlinear_iterations); 
                         converged=true;
-                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);
+                        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);               
+                        bool max_iteration_state=true;
+                        int tempStep=1;
+                        double tempTime=1.0;
+                        femmodel->results->AddObject(new BoolExternalResult(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, tempStep, tempTime));
                         break;
                 }