config: Add two stage config/log init to pfasst::init.

Signed-off-by: Matthew Emmett <[email protected]>

Author: memmett

examples/advection_diffusion/advection_diffusion_sweeper.hpp

@@ -48,11 +48,16 @@ namespace pfasst
         : public encap::IMEXSweeper<time>
       {
         public:
-          static void init()
+          static void init_opts()
           {
             config::add_option<size_t>("Adv/Diff Sweeper", "spatial_dofs", "Number of spatial degrees of freedom");
           }
 
+          static void init_logs()
+          {
+            pfasst::log::add_custom_logger("Advec");
+          }
+
         private:
           //! @{
           FFT fft;
@@ -88,7 +93,7 @@ namespace pfasst
 
           virtual ~AdvectionDiffusionSweeper()
           {
-            CLOG(INFO, "User") << "number of f1 evals: " << this->nf1evals;
+            CLOG(INFO, "Advec") << "number of f1 evals: " << this->nf1evals;
           }
           //! @}
 
@@ -131,7 +136,7 @@ namespace pfasst
             auto n = this->get_controller()->get_step();
             auto k = this->get_controller()->get_iteration();
 
-            CLOG(INFO, "User") << "err: " << n << " " << k << " " << max << " (" << qend.size() << "," << predict << ")";
+            CLOG(INFO, "Advec") << "err: " << n << " " << k << " " << max << " (" << qend.size() << "," << predict << ")";
             this->errors.insert(vtype(ktype(n, k), max));
           }
 
@@ -152,7 +157,7 @@ namespace pfasst
 
             auto n = this->get_controller()->get_step();
             auto k = this->get_controller()->get_iteration();
-            CLOG(INFO, "User") << "res: " << n << " " << k << " " << rmax << " (" << residuals.size() << ")";
+            CLOG(INFO, "Advec") << "res: " << n << " " << k << " " << rmax << " (" << residuals.size() << ")";
 
             this->residuals[ktype(n, k)] = rmax;
           }

examples/advection_diffusion/vanilla_sdc.cpp

@@ -62,8 +62,9 @@ namespace pfasst
 #ifndef PFASST_UNIT_TESTING
 int main(int argc, char** argv)
 {
-  pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init();
-  pfasst::init(argc, argv);
+  pfasst::init(argc, argv,
+               pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_opts,
+               pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_logs);
   pfasst::examples::advection_diffusion::run_vanilla_sdc(0.0);
 }
 #endif

include/pfasst.hpp

@@ -9,10 +9,16 @@
 
 namespace pfasst
 {
-  inline static void init(int argc, char** argv)
+  inline static void init(int argc, char** argv, std::function<void()> opts, std::function<void()> logs)
   {
+    if (opts) {
+      opts();
+    }
     config::init();
     log::start_log(argc, argv);
+    if (logs) {
+      logs();
+    }
     config::read_commandline(argc, argv);
   }
 } // ::pfasst