Changeset 14414

Timestamp:

02/28/13 08:44:45 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: newton is now an integer

Location:

issm/trunk-jpl/src/c

Files:

• solutions/diagnostic_core.cpp (modified) (3 diffs)
• solvers/solver_newton.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp

@@ -22 +22 @@
         bool  isl1l2            = false;
         bool  isstokes          = false;
-        bool  isnewton          = false;
         bool  conserve_loads    = true;
         bool  modify_loads      = true;
         bool  save_results;
+        int   newton;
         int   solution_type;
         int   numoutputs        = 0;
@@ -36 +36 @@
         femmodel->parameters->FindParam(&isl1l2,FlowequationIsl1l2Enum);
         femmodel->parameters->FindParam(&isstokes,FlowequationIsstokesEnum);
-        femmodel->parameters->FindParam(&isnewton,DiagnosticIsnewtonEnum);
+        femmodel->parameters->FindParam(&newton,DiagnosticIsnewtonEnum);
         femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
@@ -76 +76 @@
                 if(VerboseSolution()) _pprintLine_("   computing velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-                if(isnewton)
-                 solver_newton(femmodel); 
+                if(newton>0)
+                 solver_newton(femmodel);
                 else
                  solver_nonlinear(femmodel,conserve_loads); 

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

@@ -15 +15 @@
         /*intermediary: */
         bool   converged;
-        int    count;
+        int    count,newton;
         IssmDouble kmax;
         Matrix<IssmDouble>* Kff = NULL;
@@ -37 +37 @@
         femmodel->parameters->FindParam(&max_nonlinear_iterations,DiagnosticMaxiterEnum);
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
+        femmodel->parameters->FindParam(&newton,DiagnosticIsnewtonEnum);
         femmodel->UpdateConstraintsx();