From c4d5bed308a821685c761cbf1ca96296d0c33e46 Mon Sep 17 00:00:00 2001
From: Tobias Leibner <tobias.leibner@uni-muenster.de>
Date: Wed, 9 Dec 2015 08:57:29 +0100
Subject: [PATCH] [test.grid_provider] use dune-testtools
---
dune/stuff/test/grid_provider.hh | 30 ------------------------------
dune/stuff/test/grids.mini | 10 +++++-----
2 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/dune/stuff/test/grid_provider.hh b/dune/stuff/test/grid_provider.hh
index ae278d4aa..198d86507 100644
--- a/dune/stuff/test/grid_provider.hh
+++ b/dune/stuff/test/grid_provider.hh
@@ -12,36 +12,6 @@
#include <dune/stuff/common/type_utils.hh>
#include <dune/stuff/grid/provider/interface.hh>
-#define SGRIDS /* clang-format off */ \
- Dune::SGrid<1, 1> \
- , Dune::SGrid<2, 2> \
- , Dune::SGrid<3, 3> \
- , Dune::SGrid<4, 4> \
-/*, Dune::SGrid<1, 2> <- grid provider do not work for these combinations, bc. of the visualization with */ \
-/*, Dune::SGrid<2, 3> boundary info, bc. of function based boundary info bc. of global function interface */ \
-/*, Dune::SGrid<3, 4> */ \
-/*, Dune::SGrid<4, 5> */ /*clang-format on */
-
-#define YASPGRIDS /* clang-format off */ \
- Dune::YaspGrid<1, Dune::EquidistantOffsetCoordinates<double, 1>> \
- , Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<double, 2>> \
- , Dune::YaspGrid<3, Dune::EquidistantOffsetCoordinates<double, 3>> \
- , Dune::YaspGrid<4, Dune::EquidistantOffsetCoordinates<double, 4>> /* clang-format on */
-
-#if HAVE_ALUGRID
-#define ALUGRIDS /* clang-format off */ \
- Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming> \
- , Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming> \
- , Dune::ALUGrid<2, 2, Dune::simplex, Dune::nonconforming> \
- , Dune::ALUGrid<3, 3, Dune::simplex, Dune::nonconforming> \
- , Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming> \
- , Dune::ALUGrid<3, 3, Dune::simplex, Dune::conforming> \
-/*, Dune::ALUGrid<2, 3, Dune::cube, Dune::nonconforming> same reasons as above */ \
-/*, Dune::ALUGrid<2, 3, Dune::simplex, Dune::nonconforming> */ \
-/*, Dune::ALUGrid<2, 3, Dune::simplex, Dune::conforming> */ /* clang-format on */
-
-#endif // HAVE_ALUGRID
-
#include "gtest/gtest.h"
template <class GridProviderType>
diff --git a/dune/stuff/test/grids.mini b/dune/stuff/test/grids.mini
index 1393239d1..37d4a7023 100644
--- a/dune/stuff/test/grids.mini
+++ b/dune/stuff/test/grids.mini
@@ -6,13 +6,13 @@ geometry_is_simplex = false, true | expand 2
refinement = Dune::nonconforming, Dune::conforming | expand 3
refinement_short = nonconforming, conforming | expand 3
-grid_yasp = YaspGrid<{dimDomain},Dune::EquidistantOffsetCoordinates<double,{dimDomain}>>
-grid_alu = ALUGrid<{dimDomain},{dimDomain},{geometry},{refinement}>
+grid_yasp = Dune::YaspGrid<{dimDomain},Dune::EquidistantOffsetCoordinates<double,{dimDomain}>>
+grid_alu = Dune::ALUGrid<{dimDomain},{dimDomain},{geometry},{refinement}>
grid = {grid_yasp}, {grid_alu} | expand grid
-'{grid}' == 'ALUGrid<1,1,{geometry},{refinement}>' | exclude
-'{grid}' == 'ALUGrid<{dimDomain},{dimDomain},Dune::cube,Dune::conforming>' | exclude
+'{grid}' == 'Dune::ALUGrid<1,1,{geometry},{refinement}>' | exclude
+'{grid}' == 'Dune::ALUGrid<{dimDomain},{dimDomain},Dune::cube,Dune::conforming>' | exclude
-entity_type = Dune::{grid}::Codim<0>::Entity
+entity_type = {grid}::Codim<0>::Entity
1, ALUGRID_FOUND | expand grid | cmake_guard
--
GitLab