[Getfem-commits] r4859 - in /trunk/getfem/src: getfem/getfem_model_solvers.h gmm/gmm_iter.h

[logari81]

Author: logari81
Date: Tue Feb 10 10:14:26 2015
New Revision: 4859

URL: http://svn.gna.org/viewcvs/getfem?rev=4859&view=rev
Log:
beautify output of classical Newton solver

Modified:
    trunk/getfem/src/getfem/getfem_model_solvers.h
    trunk/getfem/src/gmm/gmm_iter.h

Modified: trunk/getfem/src/getfem/getfem_model_solvers.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_model_solvers.h?rev=4859&r1=4858&r2=4859&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_model_solvers.h      (original)
+++ trunk/getfem/src/getfem/getfem_model_solvers.h      Tue Feb 10 10:14:26 2015
@@ -419,7 +419,7 @@
       if (iter.get_noisy() > 1) cout << "linear solver done" << endl;
       R alpha = pb.line_search(dr, iter); //it is assumed that the linesearch
                                           //executes a pb.compute_residual();
-      if (iter.get_noisy()) cout << "alpha = " << alpha << " ";
+      if (iter.get_noisy()) cout << "alpha = " << std::setw(6) << alpha << " ";
       ++iter;
       crit = std::min(pb.residual_norm()
                       / std::max(1E-25, pb.approx_external_load_norm()),

Modified: trunk/getfem/src/gmm/gmm_iter.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/gmm/gmm_iter.h?rev=4859&r1=4858&r2=4859&view=diff
==============================================================================
--- trunk/getfem/src/gmm/gmm_iter.h     (original)
+++ trunk/getfem/src/gmm/gmm_iter.h     Tue Feb 10 10:14:26 2015
@@ -39,6 +39,7 @@
 #define GMM_ITER_H__
 
 #include "gmm_kernel.h"
+#include <iomanip>
 
 namespace gmm {
 
@@ -129,8 +130,8 @@
       if (noise > 0 && !written) {
        double a = (rhsn == 0) ? 1.0 : rhsn;
        converged(nr);
-       cout << name << " iter " << nit << " residual "
-            << gmm::abs(nr) / a;
+       cout << name << " iter " << std::setw(3) << nit << " residual "
+            << std::setw(12) << gmm::abs(nr) / a;
 //     if (nit % 100 == 0 && nit > 0) {
 //       cout << " (residual min " << resminreach / a << " mean val "
 //            << resadd / (100.0 * a) << " )";