Changeset 11284

Timestamp:

02/01/12 13:24:45 (13 years ago)

Author:

seroussi

Message:

minor ConvergedEnum should always be a bool

Location:

issm/trunk-jpl/src/c/solvers

Files:

• solver_nonlinear.cpp (modified) (5 diffs)
• solver_stokescoupling_nonlinear.cpp (modified) (3 diffs)

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

@@ -22 +22 @@
         
         Loads* loads=NULL;
-        int converged;
+        bool converged;
         int constraints_converged;
         int num_unstable_constraints;
@@ -43 +43 @@
 
         count=1;
-        converged=0;
+        converged=false;
 
         /*Start non-linear iteration using input velocity: */
@@ -50 +50 @@
 
         //Update once again the solution to make sure that vx and vxold are similar (for next step in transient or steadystate)
+        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);
 
@@ -74 +75 @@
                 if (!constraints_converged) {
                         if (converged){
-                                if (num_unstable_constraints <= min_mechanical_constraints) converged=1;
-                                else converged=0;
+                                if (num_unstable_constraints <= min_mechanical_constraints) converged=true;
+                                else converged=false;
                         }
                 }
@@ -81 +82 @@
                 /*Increase count: */
                 count++;
-                if(converged==1)break;
+                if(converged==true)break;
                 if(count>=max_nonlinear_iterations){
                         _printf_(true,"   maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations); 

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

@@ -14 +14 @@
 
         /*intermediary: */
-        Mat Kff_horiz = NULL, Kfs_horiz   = NULL;
-        Vec ug_horiz  = NULL, uf_horiz  = NULL, old_uf_horiz = NULL;
-        Vec pf_horiz  = NULL;
-        Vec df_horiz  = NULL;
-        Mat Kff_vert  = NULL, Kfs_vert    = NULL;
-        Vec ug_vert   = NULL, uf_vert   = NULL;
-        Vec pf_vert   = NULL;
-        Vec df_vert   = NULL;
-        Vec ys   = NULL;
-        int converged;
-        int constraints_converged;
-        int num_unstable_constraints;
-        int count;
+        Mat  Kff_horiz = NULL, Kfs_horiz   = NULL;
+        Vec  ug_horiz  = NULL, uf_horiz  = NULL, old_uf_horiz = NULL;
+        Vec  pf_horiz  = NULL;
+        Vec  df_horiz  = NULL;
+        Mat  Kff_vert  = NULL, Kfs_vert    = NULL;
+        Vec  ug_vert   = NULL, uf_vert   = NULL;
+        Vec  pf_vert   = NULL;
+        Vec  df_vert   = NULL;
+        Vec  ys   = NULL;
+        bool converged;
+        int  constraints_converged;
+        int  num_unstable_constraints;
+        int  count;
 
         /*parameters:*/
-        int min_mechanical_constraints;
-        int max_nonlinear_iterations;
-        int configuration_type;
+        int  min_mechanical_constraints;
+        int  max_nonlinear_iterations;
+        int  configuration_type;
 
         /*Recover parameters: */
@@ -39 +39 @@
         
         count=1;
-        converged=0;
+        converged=false;
 
         /*First get ug_horiz:*/
@@ -84 +84 @@
                 /*Increase count: */
                 count++;
-                if(converged==1)break;
+                if(converged==true)break;
                 if(count>=max_nonlinear_iterations){
                         _printf_(true,"   maximum number of iterations (%i) exceeded\n",max_nonlinear_iterations);