Changeset 11285

Timestamp:

02/01/12 13:25:05 (13 years ago)

Author:

seroussi

Message:

minor convergenceEnum is a bool

File:

• issm/trunk-jpl/src/c/solutions/convergence.cpp (modified) (5 diffs)

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

@@ -8 +8 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 
-void convergence(int* pconverged, Mat Kff,Vec pf,Vec uf,Vec old_uf,Parameters* parameters){
+void convergence(bool* pconverged, Mat Kff,Vec pf,Vec uf,Vec old_uf,Parameters* parameters){
 
         /*output*/
-        int converged=0;
+        bool converged=false;
 
         /*intermediary*/
@@ -34 +34 @@
          * the get go: */
         if(!uf){
-                *pconverged=1;
+                *pconverged=true;
                 return;
         }
@@ -82 +82 @@
         if(res<eps_res){
                 _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," %");
-                converged=1;
+                converged=true;
         }
         else{ 
                 _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %");
-                converged=0;
+                converged=false;
         }
 
@@ -108 +108 @@
                         else{ 
                                 _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %");
-                                converged=0;
+                                converged=false;
                         }
                 }
@@ -133 +133 @@
                         else{
                                 _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
-                                converged=0;
+                                converged=false;
                         }
                 }