Changeset 12634

Timestamp:

07/13/12 11:21:28 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed format

File:

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

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

@@ -81 +81 @@
         //print
         if(res<eps_res){
-                if(VerboseConvergence()) _pprintLine_("   mechanical equilibrium convergence criterion" << "50s" << res*100 << " < " << eps_res*100 << " %");
+                if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   mechanical equilibrium convergence criterion" << res*100 << " < " << eps_res*100 << " %");
                 converged=true;
         }
         else{ 
-                if(VerboseConvergence()) _pprintLine_("   mechanical equilibrium convergence criterion" << "50s" << res*100 << " > " << eps_res*100 << " %");
+                if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   mechanical equilibrium convergence criterion" << res*100 << " > " << eps_res*100 << " %");
                 converged=false;
         }
@@ -104 +104 @@
                 if (!xIsNan<IssmDouble>(eps_rel)){
                         if((ndu/nu)<eps_rel){
-                                if(VerboseConvergence()) _pprintLine_("   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " < " << eps_rel*100 << " %");
+                                if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " < " << eps_rel*100 << " %");
                         }
                         else{ 
-                                if(VerboseConvergence()) _pprintLine_("   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " > " << eps_rel*100 << " %");
+                                if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " > " << eps_rel*100 << " %");
                                 converged=false;
                         }
                 }
-                else _pprintLine_("   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " %");
+                else _pprintLine_(setw(50) << left << "   Convergence criterion: norm(du)/norm(u)" << ndu/nu*100 << " %");
 
         }
@@ -129 +129 @@
                 if (!xIsNan<IssmDouble>(eps_abs)){
                         if ((nduinf*yts)<eps_abs){
-                                if(VerboseConvergence()) _pprintLine_("   Convergence criterion: max(du)" << "50s" << nduinf*yts << " < " << eps_abs << " m/yr");
+                                if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " < " << eps_abs << " m/yr");
                         }
                         else{
-                                if(VerboseConvergence()) _pprintLine_("   Convergence criterion: max(du)" << "50s" << nduinf*yts << " > " << eps_abs << " m/yr");
+                                if(VerboseConvergence()) _pprintLine_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " > " << eps_abs << " m/yr");
                                 converged=false;
                         }
                 }
-                else  _pprintLine_("   Convergence criterion: max(du)" << "50s" << nduinf*yts << " m/yr");
+                else  _pprintLine_(setw(50) << left << "   Convergence criterion: max(du)" << nduinf*yts << " m/yr");
 
         }