log: better logging for MLSDC

Author: torbjoernk

examples/advection_diffusion/serial_mlsdc.cpp

@@ -28,14 +28,14 @@ namespace pfasst
       {
         MLSDC<> mlsdc;
 
-        const size_t nsteps = 4;
-        const double dt     = 0.01;
-        const size_t niters = 8;
+        const size_t nsteps = config::get_value<size_t>("num_steps", 4);
+        const double dt     = config::get_value<double>("delta_step", 0.01);
+        const size_t niters = config::get_value<size_t>("num_iter", 8);
         const int    xrat   = 2;
         const int    trat   = 2;
 
-        size_t nnodes = 5;
-        size_t ndofs  = 128;
+        size_t nnodes = config::get_value<size_t>("num_nodes", 5);
+        size_t ndofs  = config::get_value<size_t>("spatial_dofs", 128);
 
         /*
          * build space/time discretisation levels and add them to mlsdc
@@ -93,8 +93,12 @@ namespace pfasst
 }  // ::pfasst
 
 #ifndef PFASST_UNIT_TESTING
-int main(int /*argc*/, char** /*argv*/)
+int main(int argc, char** argv)
 {
+  pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::enable_config_options();
+  pfasst::init(argc, argv);
+  pfasst::log::add_custom_logger("Advec");
+
   pfasst::examples::advection_diffusion::run_serial_mlsdc(3);
 }
 #endif

include/pfasst/mlsdc.hpp

@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "controller.hpp"
+#include "logging.hpp"
 
 using namespace std;
 
@@ -35,6 +36,7 @@ namespace pfasst
       void perform_sweeps(size_t level)
       {
         auto sweeper = this->get_level(level);
+        CLOG(INFO, "Controller") << "on level " << level + 1 << "/" << this->nlevels();
         for (size_t s = 0; s < this->nsweeps[level]; s++) {
           if (predict) {
             sweeper->predict(initial & predict);
@@ -97,6 +99,7 @@ namespace pfasst
           return l;
         }
 
+        CVLOG(1, "Controller") << "Cycle down onto level " << l.level << "/" << this->nlevels();
         trns->restrict(crse, fine, initial);
         trns->fas(this->get_time_step(), crse, fine);
         crse->save();
@@ -117,6 +120,7 @@ namespace pfasst
         auto crse = l.coarse();
         auto trns = l.transfer();
 
+        CVLOG(1, "Controller") << "Cycle up onto level " << l.level + 1 << "/" << this->nlevels();
         trns->interpolate(fine, crse);
 
         if (l < this->finest()) {