Changeset 12515 for issm/trunk-jpl/src/c/solutions/convergence.cpp

Timestamp:

06/22/12 16:56:14 (13 years ago)

Author:

Mathieu Morlighem

Message:

Starting to replace _printf by _pprintString

File:

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

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

@@ -55 +55 @@
                 nF=pf->Norm(NORM_TWO);
                 solver_residue=nKUF/nF;
-                _printf_(true,"\n%s%g\n","   solver residue: norm(KU-F)/norm(F)=",solver_residue);
+                if(true) _pprintLine_("\n" << "   solver residue: norm(KU-F)/norm(F)=" << solver_residue);
 
                 //clean up
@@ -71 +71 @@
         res=nKUoldF/nF;
         if (isnan(res)){
-                _printf_(true,"norm nf = %lf and norm kuold = %lf\n",nF,nKUoldF);
+                if(true) _pprintLine_("norm nf = " << nF << "f and norm kuold = " << nKUoldF << "f");
                 _error2_("mechanical equilibrium convergence criterion is NaN!");
         }
@@ -81 +81 @@
         //print
         if(res<eps_res){
-                _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," %");
+                if(VerboseConvergence()) _pprintLine_("" << "   mechanical equilibrium convergence criterion" << "50s" << res*100 << " < " << eps_res*100 << " %");
                 converged=true;
         }
         else{ 
-                _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," %");
+                if(VerboseConvergence()) _pprintLine_("" << "   mechanical equilibrium convergence criterion" << "50s" << res*100 << " > " << eps_res*100 << " %");
                 converged=false;
         }
@@ -104 +104 @@
                 if (!isnan(eps_rel)){
                         if((ndu/nu)<eps_rel){
-                                _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," %");
+                                if(VerboseConvergence()) _pprintLine_("" << "   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " < " << eps_rel*100 << " %");
                         }
                         else{ 
-                                _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," %");
+                                if(VerboseConvergence()) _pprintLine_("" << "   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " > " << eps_rel*100 << " %");
                                 converged=false;
                         }
                 }
-                else _printf_(true,"%-50s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," %");
+                else if(true) _pprintLine_("" << "   Convergence criterion: norm(du)/norm(u)" << "50s" << ndu/nu*100 << " %");
 
         }
@@ -129 +129 @@
                 if (!isnan(eps_abs)){
                         if ((nduinf*yts)<eps_abs){
-                                _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
+                                if(VerboseConvergence()) _pprintLine_("" << "   Convergence criterion: max(du)" << "50s" << nduinf*yts << " < " << eps_abs << " m/yr");
                         }
                         else{
-                                _printf_(VerboseConvergence(),"%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
+                                if(VerboseConvergence()) _pprintLine_("" << "   Convergence criterion: max(du)" << "50s" << nduinf*yts << " > " << eps_abs << " m/yr");
                                 converged=false;
                         }
                 }
-                else  _printf_(true,"%-50s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," m/yr");
+                else  if(true) _pprintLine_("" << "   Convergence criterion: max(du)" << "50s" << nduinf*yts << " m/yr");
 
         }