Merge pull request #204 from torbjoernk/feature/advec-logging

changed logging output from IMEX sweeper

Author: memmett

examples/advection_diffusion/advection_diffusion_sweeper.hpp

@@ -167,7 +167,6 @@ namespace pfasst
             auto n = this->get_controller()->get_step();
             auto k = this->get_controller()->get_iteration();
 
-            CLOG(INFO, "Advec") << "err: " << n << " " << k << " " << max << " (" << qend.size() << "," << predict << ")";
             this->errors.insert(vtype(ktype(n, k), max));
           }
 
@@ -188,7 +187,10 @@ namespace pfasst
 
             auto n = this->get_controller()->get_step();
             auto k = this->get_controller()->get_iteration();
-            CLOG(INFO, "Advec") << "res: " << n << " " << k << " " << rmax << " (" << residuals.size() << ")";
+
+            auto err = this->errors[ktype(n, k)];
+
+            CLOG(INFO, "Advec") << boost::format(this->FORMAT_STR) % (n+1) % k % this->get_nodes().size() % as_vector<double, time>(this->state[0]).size() % rmax % err;
 
             this->residuals[ktype(n, k)] = rmax;
           }

examples/boris/boris_sweeper.hpp

@@ -172,7 +172,6 @@ namespace pfasst
 
           ofstream data_stream;
 
-          string FORMAT_STR;
           boost::format log_fmt;
           string DATA_STREAM_FORMAT_STR;
           boost::format data_stream_fmt;

include/pfasst/encap/encap_sweeper.hpp

@@ -99,6 +99,8 @@ namespace pfasst
         time rel_residual_tol;
         //! @}
 
+        string FORMAT_STR;
+
       public:
         EncapSweeper();
 

include/pfasst/logging.hpp

@@ -191,10 +191,10 @@ namespace pfasst
      *
      * @ingroup Internals
      */
-    inline string format_mpi_rank(const size_t width = 4, const char fill = ' ')
+    inline string format_mpi_rank(const char fill = ' ')
     {
       ostringstream frmter;
-      frmter << std::setw(width) << std::setfill(fill) << pfasst::config::get_rank();
+      frmter << std::setw(4) << std::setfill(fill) << pfasst::config::get_rank();
       return frmter.str();
     }
 

src/pfasst/controller/mlsdc_impl.hpp

@@ -20,7 +20,7 @@ namespace pfasst
   void MLSDC<time>::perform_sweeps(size_t level)
   {
     auto sweeper = this->get_level(level);
-    CLOG(INFO, "Controller") << "on level " << level + 1 << "/" << this->nlevels();
+    CVLOG(1, "Controller") << "on level " << level + 1 << "/" << this->nlevels();
     for (size_t s = 0; s < this->nsweeps[level]; s++) {
       if (predict) {
         sweeper->predict(initial & predict);

src/pfasst/encap/imex_sweeper_impl.hpp

@@ -1,5 +1,6 @@
 #include "pfasst/encap/imex_sweeper.hpp"
 
+#include <algorithm>
 #include <cassert>
 using namespace std;
 
@@ -39,6 +40,15 @@ namespace pfasst
       if (! this->quadrature->left_is_node()) {
         this->fs_expl_start = this->get_factory()->create(pfasst::encap::function);
       }
+
+      size_t nsteps = this->get_controller()->get_end_time() / this->get_controller()->get_time_step();
+      size_t digit_step = (this->get_controller()->get_time_step() > 0) ? 
+                            to_string(nsteps + 1).length() : 3;
+      size_t digit_iter = (this->get_controller()->get_max_iterations() > 0) ? 
+                            to_string(this->get_controller()->get_max_iterations() - 1).length() : 3;
+      this->FORMAT_STR = "step: %|" + to_string(digit_step) + "|      iter: %|" + to_string(digit_iter) + "|"
+                         + "      n1: %|2|      n2: %|3|"
+                         + "      residual: %10.4e" + "      err: %10.4e";
     }
 
     template<typename time>
@@ -165,8 +175,8 @@ namespace pfasst
     {
       time dt = this->get_controller()->get_time_step();
       time t  = this->get_controller()->get_time();
-      CLOG(INFO, "Sweeper") << "predicting step " << this->get_controller()->get_step() + 1
-                            << " (t=" << t << ", dt=" << dt << ")";
+      CVLOG(1, "Sweeper") << "predicting step " << this->get_controller()->get_step() + 1
+                          << " (t=" << t << ", dt=" << dt << ")";
 
       if (initial) {
         this->state[0]->copy(this->start_state);
@@ -195,8 +205,8 @@ namespace pfasst
       UNUSED(initial);
       time dt = this->get_controller()->get_time_step();
       time t  = this->get_controller()->get_time();
-      CLOG(INFO, "Sweeper") << "predicting step " << this->get_controller()->get_step() + 1
-                            << " (t=" << t << ", dt=" << dt << ")";
+      CVLOG(1, "Sweeper") << "predicting step " << this->get_controller()->get_step() + 1
+                          << " (t=" << t << ", dt=" << dt << ")";
       time ds;
 
       shared_ptr<Encapsulation<time>> rhs = this->get_factory()->create(pfasst::encap::solution);
@@ -228,8 +238,8 @@ namespace pfasst
       auto const nodes = this->quadrature->get_nodes();
       auto const dt    = this->get_controller()->get_time_step();
       auto const s_mat = this->quadrature->get_s_mat().block(1, 0, nodes.size()-1, nodes.size());
-      CLOG(INFO, "Sweeper") << "sweeping on step " << this->get_controller()->get_step() + 1
-                            << " in iteration " << this->get_controller()->get_iteration() << " (dt=" << dt << ")";
+      CVLOG(1, "Sweeper") << "sweeping on step " << this->get_controller()->get_step() + 1
+                          << " in iteration " << this->get_controller()->get_iteration() << " (dt=" << dt << ")";
       time ds;
 
       this->s_integrals[0]->mat_apply(this->s_integrals, dt, s_mat, this->fs_expl, true);
@@ -266,8 +276,8 @@ namespace pfasst
       auto const nodes = this->quadrature->get_nodes();
       auto const dt    = this->get_controller()->get_time_step();
       auto const s_mat = this->quadrature->get_s_mat();
-      CLOG(INFO, "Sweeper") << "sweeping on step " << this->get_controller()->get_step() + 1
-                            << " in iteration " << this->get_controller()->get_iteration() << " (dt=" << dt << ")";
+      CVLOG(1, "Sweeper") << "sweeping on step " << this->get_controller()->get_step() + 1
+                          << " in iteration " << this->get_controller()->get_iteration() << " (dt=" << dt << ")";
       time ds;
 
       this->s_integrals[0]->mat_apply(this->s_integrals, dt, s_mat, this->fs_expl, true);