Changeset 25836 for issm/trunk/src/c/solutionsequences/solutionsequence_nonlinear.cpp

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/solutionsequences/solutionsequence_nonlinear.cpp (modified) (4 diffs)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

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

@@ -21 +21 @@
         Vector<IssmDouble>* ys  = NULL;
 
-        Loads* savedloads=NULL;
-        bool converged;
         int constraints_converged;
         int num_unstable_constraints;
-        int count;
 
         /*parameters:*/
@@ -43 +40 @@
 
         /*Were loads requested as output? : */
+        Loads* savedloads=NULL;
         if(conserve_loads){
                 savedloads = static_cast<Loads*>(femmodel->loads->Copy());
         }
 
-        count=0;
-        converged=false;
+        int  count=0;
+        bool converged=false;
 
         /*Start non-linear iteration using input velocity: */
@@ -104 +102 @@
                 count++;
                 if(converged==true){
-                        femmodel->results->AddResult(new GenericExternalResult<IssmDouble>(femmodel->results->Size()+1,StressbalanceConvergenceNumStepsEnum,count));
+                        femmodel->results->AddResult(new GenericExternalResult<int>(femmodel->results->Size()+1,StressbalanceConvergenceNumStepsEnum,count));
                         break;
                 }
@@ -110 +108 @@
                         _printf0_("   maximum number of nonlinear iterations (" << max_nonlinear_iterations << ") exceeded\n"); 
                         converged=true;
-                        femmodel->results->AddResult(new GenericExternalResult<IssmDouble>(femmodel->results->Size()+1,StressbalanceConvergenceNumStepsEnum,max_nonlinear_iterations));
+                        femmodel->results->AddResult(new GenericExternalResult<int>(femmodel->results->Size()+1,StressbalanceConvergenceNumStepsEnum,max_nonlinear_iterations));
                         InputUpdateFromConstantx(femmodel,converged,ConvergedEnum);
                         InputUpdateFromSolutionx(femmodel,ug);          

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post