Changeset 12330 for issm/trunk/src/c/solvers/solver_nonlinear.cpp

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

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

issm/trunk/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;
                 }