mpi: re-require the user to call MPI_Init

Author: torbjoernk

examples/advection_diffusion/mpi_pfasst.cpp

@@ -89,10 +89,10 @@ namespace pfasst
 #ifndef PFASST_UNIT_TESTING
 int main(int argc, char** argv)
 {
+  MPI_Init(&argc, &argv);
   pfasst::init(argc, argv,
                pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_opts,
-               pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_logs,
-               true);
+               pfasst::examples::advection_diffusion::AdvectionDiffusionSweeper<>::init_logs);
   pfasst::examples::advection_diffusion::run_mpi_pfasst(0.0);
   fftw_cleanup();
   MPI_Finalize();

include/pfasst.hpp

@@ -7,29 +7,17 @@ using namespace std;
 #include "pfasst/config.hpp"
 #include "pfasst/logging.hpp"
 
-#ifdef WITH_MPI
-  #include <mpi.h>
-#endif
-
 
 namespace pfasst
 {
   inline static void init(int argc, char** argv,
                           std::function<void()> opts = nullptr,
-                          std::function<void()> logs = nullptr,
-                          bool with_mpi = false)
+                          std::function<void()> logs = nullptr)
   {
     if (opts) {
       opts();
     }
     config::init();
-    if (with_mpi) {
-#ifdef WITH_MPI
-      MPI_Init(&argc, &argv);
-#else
-      cerr << "PFASST::init() : 'with_mpi' flag used without enabling MPI" << endl;
-#endif
-    }
     config::read_commandline(argc, argv);
     log::start_log(argc, argv);
     if (logs) {