From f663d1d2f622a0228593cf39b13bc9703485d9cf Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 22 Apr 2022 12:57:06 +0200
Subject: [PATCH] [test][io] Use Dumux::initialize

---
 test/io/gridmanager/test_gmshboundaryflag.cc           | 5 +++--
 test/io/gridmanager/test_gridmanager_cake.cc           | 6 +++---
 test/io/gridmanager/test_gridmanager_dgf.cc            | 5 +++--
 test/io/gridmanager/test_gridmanager_gmsh_3d.cc        | 6 +++---
 test/io/gridmanager/test_gridmanager_gmsh_e_markers.cc | 5 +++--
 test/io/gridmanager/test_gridmanager_mmesh.cc          | 6 +++---
 test/io/gridmanager/test_gridmanager_subgrid.cc        | 6 +++---
 test/io/gridmanager/test_gridmanager_vtk.cc            | 5 +++--
 test/io/gridmanager/test_pnm_gridmanager.cc            | 6 ++++--
 test/io/gridmanager/test_pnm_subgriddata.cc            | 5 +++--
 test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc       | 6 ++++--
 test/io/vtk/test_vtkoutputmodule.cc                    | 5 +++--
 test/io/vtk/test_vtkreader.cc                          | 5 +++--
 13 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/test/io/gridmanager/test_gmshboundaryflag.cc b/test/io/gridmanager/test_gmshboundaryflag.cc
index 4152906458..6f824c1376 100644
--- a/test/io/gridmanager/test_gmshboundaryflag.cc
+++ b/test/io/gridmanager/test_gmshboundaryflag.cc
@@ -26,11 +26,11 @@
 #if HAVE_DUNE_ALUGRID
 
 #include <dune/alugrid/grid.hh>
-#include <dune/common/parallel/mpihelper.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/boundaryflag.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
+#include <dumux/common/initialize.hh>
 #include <dumux/discretization/box.hh>
 #include <dumux/discretization/cctpfa.hh>
 
@@ -64,7 +64,8 @@ int main(int argc, char** argv)
 {
     using namespace Dumux;
 
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    initialize(argc, argv);
 
     Parameters::init(argc, argv, "test_gmshboundaryflag.input");
 
diff --git a/test/io/gridmanager/test_gridmanager_cake.cc b/test/io/gridmanager/test_gridmanager_cake.cc
index fbe0a4df41..ea2b277f07 100644
--- a/test/io/gridmanager/test_gridmanager_cake.cc
+++ b/test/io/gridmanager/test_gridmanager_cake.cc
@@ -25,10 +25,10 @@
 #include <string>
 #include <iostream>
 
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/timer.hh>
 #include <dune/grid/io/file/vtk.hh>
 
+#include <dumux/common/initialize.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/io/grid/cakegridmanager.hh>
 
@@ -76,8 +76,8 @@ void testCakeGridManager(const std::string& name)
 
 int main(int argc, char** argv)
 {
-    // initialize MPI, finalize is done automatically on exit
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    Dumux::initialize(argc, argv);
 
     // first read parameters from input file
     Dumux::Parameters::init(argc, argv, "test_gridmanager_cake.input");
diff --git a/test/io/gridmanager/test_gridmanager_dgf.cc b/test/io/gridmanager/test_gridmanager_dgf.cc
index b4e4e2fbe7..cc20787c90 100644
--- a/test/io/gridmanager/test_gridmanager_dgf.cc
+++ b/test/io/gridmanager/test_gridmanager_dgf.cc
@@ -22,14 +22,15 @@
 #include <config.h>
 #include <iostream>
 
-#include <dune/common/parallel/mpihelper.hh>
+#include <dumux/common/initialize.hh>
 #include <dumux/common/parameters.hh>
 
 #include "gridmanagertests.hh"
 
 int main(int argc, char** argv)
 {
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    Dumux::initialize(argc, argv);
 
     Dumux::Parameters::init(argc, argv, "test_gridmanager_dgf.input");
 
diff --git a/test/io/gridmanager/test_gridmanager_gmsh_3d.cc b/test/io/gridmanager/test_gridmanager_gmsh_3d.cc
index 0303aa2d47..d89ce8b6cd 100644
--- a/test/io/gridmanager/test_gridmanager_gmsh_3d.cc
+++ b/test/io/gridmanager/test_gridmanager_gmsh_3d.cc
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <iostream>
 
-#include <dune/common/parallel/mpihelper.hh>
+#include <dumux/common/initialize.hh>
 #include <dumux/common/parameters.hh>
 
 #include "gridmanagertests.hh"
@@ -30,8 +30,8 @@
 int main(int argc, char** argv)
 {
     using namespace Dumux;
-    // initialize MPI, finalize is done automatically on exit
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    initialize(argc, argv);
     Parameters::init(argc, argv, "test_gridmanager_gmsh_3d.input");
     const auto name = getParam<std::string>("Problem.Name");
     const auto refine = Dumux::getParam<bool>("Grid.Refine", true);
diff --git a/test/io/gridmanager/test_gridmanager_gmsh_e_markers.cc b/test/io/gridmanager/test_gridmanager_gmsh_e_markers.cc
index 4fd3826811..57b842a9a0 100644
--- a/test/io/gridmanager/test_gridmanager_gmsh_e_markers.cc
+++ b/test/io/gridmanager/test_gridmanager_gmsh_e_markers.cc
@@ -22,14 +22,15 @@
 #include <config.h>
 #include <iostream>
 
-#include <dune/common/parallel/mpihelper.hh>
+#include <dumux/common/initialize.hh>
 #include <dumux/common/parameters.hh>
 
 #include "gridmanagertests.hh"
 
 int main(int argc, char** argv)
 {
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    Dumux::initialize(argc, argv);
 
     Dumux::Parameters::init(argc, argv, "test_gridmanager_gmsh_e_markers.input");
 
diff --git a/test/io/gridmanager/test_gridmanager_mmesh.cc b/test/io/gridmanager/test_gridmanager_mmesh.cc
index 4d6805ad63..e273c59ad0 100644
--- a/test/io/gridmanager/test_gridmanager_mmesh.cc
+++ b/test/io/gridmanager/test_gridmanager_mmesh.cc
@@ -20,16 +20,16 @@
  */
 #include <config.h>
 
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/grid/io/file/vtk.hh>
+#include <dumux/common/initialize.hh>
 #include <dumux/io/grid/gridmanager_mmesh.hh>
 
 int main(int argc, char** argv)
 {
     using namespace Dumux;
 
-    // Initialize MPI, finalize is done automatically on exit.
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    initialize(argc, argv);
 
     // First set parameters
     Dumux::Parameters::init([](auto& params){
diff --git a/test/io/gridmanager/test_gridmanager_subgrid.cc b/test/io/gridmanager/test_gridmanager_subgrid.cc
index 0426bc008b..283ad4ca17 100644
--- a/test/io/gridmanager/test_gridmanager_subgrid.cc
+++ b/test/io/gridmanager/test_gridmanager_subgrid.cc
@@ -23,7 +23,6 @@
 #include <cmath>
 #include <string>
 
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/timer.hh>
 #include <dune/grid/io/file/vtk.hh>
@@ -33,6 +32,7 @@
 #endif
 
 #include <dumux/io/grid/gridmanager_sub.hh>
+#include <dumux/common/initialize.hh>
 #include <dumux/common/parameters.hh>
 
 
@@ -143,8 +143,8 @@ int main(int argc, char** argv)
 {
     using namespace Dumux;
 
-    // Initialize MPI, finalize is done automatically on exit.
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    initialize(argc, argv);
 
     // First read parameters from input file.
     Dumux::Parameters::init(argc, argv);
diff --git a/test/io/gridmanager/test_gridmanager_vtk.cc b/test/io/gridmanager/test_gridmanager_vtk.cc
index bde55e77b5..b935dc363e 100644
--- a/test/io/gridmanager/test_gridmanager_vtk.cc
+++ b/test/io/gridmanager/test_gridmanager_vtk.cc
@@ -24,9 +24,9 @@
 #include <algorithm>
 #include <tuple>
 
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/grid/io/file/vtk.hh>
 
+#include <dumux/common/initialize.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
@@ -88,7 +88,8 @@ void testVTKReader(const std::string& gridName)
 
 int main(int argc, char** argv)
 {
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    Dumux::initialize(argc, argv);
 
     Dumux::Parameters::init(argc, argv, "test_gridmanager_vtk.input");
 
diff --git a/test/io/gridmanager/test_pnm_gridmanager.cc b/test/io/gridmanager/test_pnm_gridmanager.cc
index 7ed07af8f5..b20fcd1baf 100644
--- a/test/io/gridmanager/test_pnm_gridmanager.cc
+++ b/test/io/gridmanager/test_pnm_gridmanager.cc
@@ -23,6 +23,7 @@
  */
 #include "config.h"
 
+#include <dumux/common/initialize.hh>
 #include <dumux/common/dumuxmessage.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/io/grid/porenetwork/gridmanager.hh>
@@ -134,8 +135,9 @@ int main(int argc, char** argv) try
 {
     using namespace Dumux;
 
-    // initialize MPI, finalize is done automatically on exit
-    const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    initialize(argc, argv);
+    const auto& mpiHelper = Dune::MPIHelper::instance();
 
     // print dumux start message
     if (mpiHelper.rank() == 0)
diff --git a/test/io/gridmanager/test_pnm_subgriddata.cc b/test/io/gridmanager/test_pnm_subgriddata.cc
index 5f3775f64c..10f632cebb 100644
--- a/test/io/gridmanager/test_pnm_subgriddata.cc
+++ b/test/io/gridmanager/test_pnm_subgriddata.cc
@@ -23,6 +23,7 @@
  */
 #include "config.h"
 
+#include <dumux/common/initialize.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/io/grid/porenetwork/gridmanager.hh>
 #include <dumux/io/grid/gridmanager_sub.hh>
@@ -35,8 +36,8 @@ int main(int argc, char** argv)
 {
     using namespace Dumux;
 
-    // initialize MPI, finalize is done automatically on exit
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    initialize(argc, argv);
 
     // parse command line arguments
     Parameters::init(argc, argv);
diff --git a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
index f502115f29..e9b60a2f85 100644
--- a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
+++ b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
@@ -33,6 +33,7 @@
 #include <dune/common/float_cmp.hh>
 #include <dune/grid/yaspgrid.hh>
 
+#include <dumux/common/initialize.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/dumuxmessage.hh>
 
@@ -299,8 +300,9 @@ int main(int argc, char** argv)
 {
     using namespace Dumux;
 
-    // initialize MPI, finalize is done automatically on exit
-    const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    initialize(argc, argv);
+    const auto& mpiHelper = Dune::MPIHelper::instance();
 
     // print dumux start message
     if (mpiHelper.rank() == 0)
diff --git a/test/io/vtk/test_vtkoutputmodule.cc b/test/io/vtk/test_vtkoutputmodule.cc
index b7ae1d4758..de763412c4 100644
--- a/test/io/vtk/test_vtkoutputmodule.cc
+++ b/test/io/vtk/test_vtkoutputmodule.cc
@@ -2,9 +2,9 @@
 
 #include <array>
 
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/grid/yaspgrid.hh>
 
+#include <dumux/common/initialize.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
@@ -13,7 +13,8 @@ int main(int argc, char** argv)
 {
     using namespace Dumux;
 
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    initialize(argc, argv);
 
     Parameters::init([](Dune::ParameterTree& params)
     {
diff --git a/test/io/vtk/test_vtkreader.cc b/test/io/vtk/test_vtkreader.cc
index fe05d7533c..adc90ec578 100644
--- a/test/io/vtk/test_vtkreader.cc
+++ b/test/io/vtk/test_vtkreader.cc
@@ -23,7 +23,6 @@
 #include <iostream>
 #include <memory>
 
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dune/grid/io/file/vtk/vtkwriter.hh>
 
@@ -37,12 +36,14 @@
 #include <dune/foamgrid/foamgrid.hh>
 #endif
 
+#include <dumux/common/initialize.hh>
 #include <dumux/common/exceptions.hh>
 #include <dumux/io/vtk/vtkreader.hh>
 
 int main(int argc, char** argv)
 {
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    Dumux::initialize(argc, argv);
 
     if (argc != 3)
         DUNE_THROW(Dune::IOError, "Needs two arguments, the vtk file name and an output file base name");
-- 
GitLab