Changeset 19150

Timestamp:

02/24/15 11:51:44 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed MaxIterationConvergenceFlagEnum from results to avoid having a results for each step even though output_frequency is not 1

Location:

issm/trunk-jpl/src/c/solutionsequences

Files:

• solutionsequence_newton.cpp (modified) (1 diff)
• solutionsequence_nonlinear.cpp (modified) (2 diffs)
• solutionsequence_thermal_nonlinear.cpp (modified) (1 diff)

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

@@ -90 +90 @@
                 delete Kff; delete pf;
                 if(converged==true){    
-                        int step; IssmDouble time;
-                        bool max_iteration_state=false;
-                        femmodel->parameters->FindParam(&time,TimeEnum);
-                        femmodel->parameters->FindParam(&step,StepEnum);
-                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step,time));
                         break;
                 }
                 if(count>=max_nonlinear_iterations){
                         _printf0_("   maximum number of Newton iterations (" << max_nonlinear_iterations << ") exceeded\n"); 
-                        int step; IssmDouble time;
-                        bool max_iteration_state=true;
-                        femmodel->parameters->FindParam(&time,TimeEnum);
-                        femmodel->parameters->FindParam(&step,StepEnum);
-                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
                         break;
                 }

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

@@ -89 +89 @@
                 count++;
                 if(converged==true){
-                        bool max_iteration_state=false;
-                        int step; IssmDouble time;
-                        femmodel->parameters->FindParam(&time,TimeEnum);
-                        femmodel->parameters->FindParam(&step,StepEnum);
-                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
                         break;
                 }
@@ -101 +96 @@
                         InputUpdateFromConstantx(femmodel,converged,ConvergedEnum);
                         InputUpdateFromSolutionx(femmodel,ug);          
-                        bool max_iteration_state=true;
-                        int step; IssmDouble time;
-                        femmodel->parameters->FindParam(&time,TimeEnum);
-                        femmodel->parameters->FindParam(&step,StepEnum);
-                        femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
                         break;
                 }

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

@@ -102 +102 @@
                         }
                         if(converged==true){
-                                int step; IssmDouble time;
-                                femmodel->parameters->FindParam(&time,TimeEnum);
-                                femmodel->parameters->FindParam(&step,StepEnum);
-                                femmodel->results->AddObject(new GenericExternalResult<bool>(femmodel->results->Size()+1, MaxIterationConvergenceFlagEnum, max_iteration_state, step, time));
                                 break;
                         }