Changeset 6305 for issm/trunk/src/c/solutions/convergence.cpp

Timestamp:

10/14/10 16:20:41 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added verbose class

File:

• issm/trunk/src/c/solutions/convergence.cpp (modified) (6 diffs)

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

@@ -28 +28 @@
         double eps_rel;
         double eps_abs;
-        int    verbose;
         double yts;
 
@@ -43 +42 @@
         parameters->FindParam(&eps_abs,EpsAbsEnum);
         parameters->FindParam(&yts,YtsEnum);
-        parameters->FindParam(&verbose,VerboseEnum);
 
         /*Display solver caracteristics*/
-        if (verbose>1){
+        if (VerbConverge()){
 
                 //compute KUF = KU - F = K*U - F
@@ -82 +80 @@
         //print
         if(res<eps_res){
-                if (verbose) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," %");
+                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," %");
                 converged=1;
         }
         else{ 
-                if (verbose) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %");
+                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %");
                 converged=0;
         }
 
         /*Relative criterion (optional)*/
-        if (!isnan(eps_rel) || (verbose>1)){
+        if (!isnan(eps_rel) || (VerbConverge())){
 
                 //compute norm(du)/norm(u)
@@ -105 +103 @@
                 if (!isnan(eps_rel)){
                         if((ndu/nu)<eps_rel){
-                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," %");
+                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," %");
                         }
                         else{ 
-                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %");
+                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %");
                                 converged=0;
                         }
@@ -117 +115 @@
 
         /*Absolute criterion (Optional) = max(du)*/
-        if (!isnan(eps_abs) || (verbose>1)){
+        if (!isnan(eps_abs) || (VerbConverge())){
 
                 //compute max(du)
@@ -130 +128 @@
                 if (!isnan(eps_abs)){
                         if ((nduinf*yts)<eps_abs){
-                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
+                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
                         }
                         else{
-                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
+                                if (VerbConverge()) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
                                 converged=0;
                         }