From 47e2008c36fa7770d63cb84dc25a5de3dae0327b Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 22 Apr 2022 12:50:01 +0200
Subject: [PATCH] [test][geometry] Use Dumux::initialize or remove unused MPI

---
 test/geometry/test_0d1d_intersection.cc                | 4 ----
 test/geometry/test_1d1d_intersection.cc                | 4 ----
 test/geometry/test_1d2d_intersection.cc                | 4 ----
 test/geometry/test_intersectingentity_cartesiangrid.cc | 6 ++++--
 test/geometry/test_intersectionentityset.cc            | 6 +++---
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/test/geometry/test_0d1d_intersection.cc b/test/geometry/test_0d1d_intersection.cc
index 942e06ad1b..391e21e902 100644
--- a/test/geometry/test_0d1d_intersection.cc
+++ b/test/geometry/test_0d1d_intersection.cc
@@ -5,7 +5,6 @@
 #include <initializer_list>
 
 #include <dune/common/exceptions.hh>
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fvector.hh>
 
 #include <dumux/geometry/intersectspointgeometry.hh>
@@ -90,9 +89,6 @@ void testIntersections(std::vector<bool>& returns)
 
 int main (int argc, char *argv[])
 {
-    // maybe initialize mpi
-    Dune::MPIHelper::instance(argc, argv);
-
     // collect returns to determine exit code
     std::vector<bool> returns;
 
diff --git a/test/geometry/test_1d1d_intersection.cc b/test/geometry/test_1d1d_intersection.cc
index ef5590f642..2bb332c9e7 100644
--- a/test/geometry/test_1d1d_intersection.cc
+++ b/test/geometry/test_1d1d_intersection.cc
@@ -4,7 +4,6 @@
 #include <algorithm>
 
 #include <dune/common/exceptions.hh>
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fvector.hh>
 
 #include <dumux/geometry/geometryintersection.hh>
@@ -187,9 +186,6 @@ void testSegmentIntersections(std::vector<bool>& returns)
 
 int main (int argc, char *argv[])
 {
-    // maybe initialize mpi
-    Dune::MPIHelper::instance(argc, argv);
-
     // collect returns to determine exit code
     std::vector<bool> returns;
 
diff --git a/test/geometry/test_1d2d_intersection.cc b/test/geometry/test_1d2d_intersection.cc
index b98e22cc57..920af49c61 100644
--- a/test/geometry/test_1d2d_intersection.cc
+++ b/test/geometry/test_1d2d_intersection.cc
@@ -6,7 +6,6 @@
 #include <type_traits>
 
 #include <dune/common/exceptions.hh>
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fvector.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
@@ -146,9 +145,6 @@ void performTests(std::vector<bool>& returns, const Quadrilateral& quad, const T
 
 int main (int argc, char *argv[])
 {
-    // maybe initialize mpi
-    Dune::MPIHelper::instance(argc, argv);
-
     // collect returns to determine exit code
     std::vector<bool> returns;
 
diff --git a/test/geometry/test_intersectingentity_cartesiangrid.cc b/test/geometry/test_intersectingentity_cartesiangrid.cc
index 8b97413dff..7f2930de21 100644
--- a/test/geometry/test_intersectingentity_cartesiangrid.cc
+++ b/test/geometry/test_intersectingentity_cartesiangrid.cc
@@ -1,10 +1,10 @@
 #include <config.h>
 
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/exceptions.hh>
 #include <dune/grid/yaspgrid.hh>
 
+#include <dumux/common/initialize.hh>
 #include <dumux/geometry/boundingboxtree.hh>
 #include <dumux/geometry/intersectingentities.hh>
 
@@ -35,7 +35,9 @@ void testIntersectingEntityCartesianGrid()
 
 int main(int argc, char* argv[])
 {
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    Dumux::initialize(argc, argv);
+
     testIntersectingEntityCartesianGrid<1>();
     testIntersectingEntityCartesianGrid<2>();
     testIntersectingEntityCartesianGrid<3>();
diff --git a/test/geometry/test_intersectionentityset.cc b/test/geometry/test_intersectionentityset.cc
index d75c22544a..7e42435626 100644
--- a/test/geometry/test_intersectionentityset.cc
+++ b/test/geometry/test_intersectionentityset.cc
@@ -6,13 +6,13 @@
 
 #include <dune/common/exceptions.hh>
 #include <dune/common/float_cmp.hh>
-#include <dune/common/parallel/mpihelper.hh>
 #include <dune/geometry/type.hh>
 #include <dune/geometry/multilineargeometry.hh>
 #include <dune/grid/common/gridfactory.hh>
 #include <dune/grid/io/file/gmshreader.hh>
 #include <dune/alugrid/grid.hh>
 
+#include <dumux/common/initialize.hh>
 #include <dumux/geometry/geometricentityset.hh>
 #include <dumux/geometry/intersectionentityset.hh>
 
@@ -20,8 +20,8 @@ int main (int argc, char *argv[])
 {
     using namespace Dumux;
 
-    // maybe initialize mpi
-    Dune::MPIHelper::instance(argc, argv);
+    // maybe initialize MPI and/or multithreading backend
+    Dumux::initialize(argc, argv);
 
     ///////////////////////////////////////////////////////////////////////
     // Extract the boundary of a given grid and intersect it with the grid
-- 
GitLab