examples: advec: make mpi example take cmd options

Author: torbjoernk

examples/advection_diffusion/mpi_pfasst.cpp

@@ -40,17 +40,17 @@ namespace pfasst
        *
        * @ingroup AdvectionDiffusion
        */
-      error_map run_mpi_pfasst(double abs_residual_tol, size_t niters=4)
+      error_map run_mpi_pfasst(const double abs_res_tol, const double rel_res_tol,
+                               const size_t niters, const size_t nsteps, const double dt,
+                               const size_t ndofs_f, const size_t ndofs_c,
+                               const size_t nnodes_f, const size_t nnodes_c)
       {
-        const size_t nsteps = 4;
-        const double dt     = 0.01;
-
         vector<pair<size_t, quadrature::QuadratureType>> nodes = {
-          { 3, quadrature::QuadratureType::GaussLobatto },
-          { 5, quadrature::QuadratureType::GaussLobatto }
+          { nnodes_c, quadrature::QuadratureType::GaussLobatto },
+          { nnodes_f, quadrature::QuadratureType::GaussLobatto }
         };
 
-        vector<size_t> ndofs = { 64, 128 };
+        vector<size_t> ndofs = { ndofs_c, ndofs_f };
 
         auto build_level = [ndofs](size_t level) {
           auto factory  = make_shared<MPIVectorFactory<double>>(ndofs[level]);
@@ -75,7 +75,7 @@ namespace pfasst
         pf.set_comm(&comm);
         pf.set_duration(0.0, nsteps * dt, dt, niters);
         pf.set_nsweeps({2, 1});
-        pf.get_finest<AdvectionDiffusionSweeper<>>()->set_residual_tolerances(abs_residual_tol, 0.0);
+        pf.get_finest<AdvectionDiffusionSweeper<>>()->set_residual_tolerances(abs_res_tol, rel_res_tol);
         pf.set_options();
         pf.run();
 
@@ -94,7 +94,20 @@ int main(int argc, char** argv)
   pfasst::init(argc, argv,
                pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_opts,
                pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_logs);
-  pfasst::examples::advection_diffusion::run_mpi_pfasst(0.0);
+
+  const double tend        = pfasst::config::get_value<double>("tend", 0.04);
+  const double dt          = pfasst::config::get_value<double>("dt", 0.01);
+  const size_t nnodes_f    = pfasst::config::get_value<size_t>("num_nodes", 5);
+  const size_t ndofs_f     = pfasst::config::get_value<size_t>("spatial_dofs", 128);
+  const size_t niters      = pfasst::config::get_value<size_t>("num_iter", 4);
+  const double abs_res_tol = pfasst::config::get_value<double>("abs_res_tol", 0.0);
+  const double rel_res_tol = pfasst::config::get_value<double>("rel_res_tol", 0.0);
+
+  const size_t nsteps = tend / dt;
+  const size_t nnodes_c = (nnodes_f + 1) / 2;
+  const size_t ndofs_c = ndofs_f / 2;
+
+  pfasst::examples::advection_diffusion::run_mpi_pfasst(abs_res_tol, rel_res_tol, niters, nsteps, dt, ndofs_f, ndofs_c, nnodes_f, nnodes_c);
   fftw_cleanup();
   MPI_Finalize();
 }

tests/examples/advection_diffusion/test_mpi_advection_diffusion.cpp

@@ -24,7 +24,7 @@ TEST(ErrorTest, MPIPFASST)
 {
   typedef error_map::value_type vtype;
 
-  auto errors = run_mpi_pfasst(0.0);
+  auto errors = run_mpi_pfasst(0.0, 0.0, 4, 4, 0.01, 128, 64, 5, 3);
   auto get_step  = [](const vtype x) { return get<0>(get<0>(x)); };
   auto get_iter  = [](const vtype x) { return get<1>(get<0>(x)); };
   auto get_error = [](const vtype x) { return get<1>(x); };
@@ -44,7 +44,7 @@ TEST(AdaptiveErrorTest, MPIPFASST)
 {
   typedef error_map::value_type vtype;
 
-  auto errors = run_mpi_pfasst(1.e-8, 12);
+  auto errors = run_mpi_pfasst(1.e-8, 0.0, 12, 4, 0.01, 128, 64, 5, 3);
   auto get_step  = [](const vtype x) { return get<0>(get<0>(x)); };
   auto get_iter  = [](const vtype x) { return get<1>(get<0>(x)); };
   auto get_error = [](const vtype x) { return get<1>(x); };
@@ -68,7 +68,10 @@ TEST(AdaptiveErrorTest, MPIPFASST)
 int main(int argc, char** argv)
 {
   testing::InitGoogleTest(&argc, argv);
-  MPI_Init(&argc, &argv);
+  pfasst::init(argc, argv,
+               pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_opts,
+               pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_logs,
+               true);
   int result = 1, max_result;  // GTest return value 1 (failure), 0 (success)
   result = RUN_ALL_TESTS();
   MPI_Allreduce(&result, &max_result, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD);