From 72f156b00b9df543f680ddb1a0c5cec4710a9fd6 Mon Sep 17 00:00:00 2001
From: "Dennis.Glaeser" <dennis.glaeser@iws.uni-stuttgart.de>
Date: Thu, 30 Apr 2020 10:24:47 +0200
Subject: [PATCH] [test][sequential1p] use alugrid for test
---
test/porousmediumflow/1p/sequential/CMakeLists.txt | 1 +
.../1p/sequential/test_diffusionproblem3d.hh | 14 --------------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/test/porousmediumflow/1p/sequential/CMakeLists.txt b/test/porousmediumflow/1p/sequential/CMakeLists.txt
index d053ba0f55..0a7c3e654c 100644
--- a/test/porousmediumflow/1p/sequential/CMakeLists.txt
+++ b/test/porousmediumflow/1p/sequential/CMakeLists.txt
@@ -23,6 +23,7 @@ dumux_add_test(NAME test_diffusion3d
LABELS porousmediumflow 1p sequential
SOURCES test_diffusion3d.cc
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMAKE_GUARD dune-alugrid_FOUND
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_diffusion3d_fv-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_diffusion3d_fv-00000.vtu
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
index 9e98b6c0e6..a51f44b133 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
@@ -22,13 +22,7 @@
#ifndef DUMUX_TEST_DIFFUSION_3D_PROBLEM_HH
#define DUMUX_TEST_DIFFUSION_3D_PROBLEM_HH
-#if HAVE_DUNE_ALUGRID
#include <dune/alugrid/grid.hh>
-#endif
-#if HAVE_UG
-#include <dune/grid/uggrid.hh>
-#endif
-#include <dune/grid/yaspgrid.hh>
#include <dumux/material/components/constant.hh>
@@ -71,16 +65,8 @@ struct MimeticTest { using InheritsFrom = std::tuple<DiffusionTest, MimeticPress
} // end namespace TTag
// Set the grid type
-#if HAVE_DUNE_ALUGRID
template<class TypeTag>
struct Grid<TypeTag, TTag::DiffusionTest> { using type = Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>; };
-#elif HAVE_UG
-template<class TypeTag>
-struct Grid<TypeTag, TTag::DiffusionTest> { using type = Dune::UGGrid<3>; };
-#else
-template<class TypeTag>
-struct Grid<TypeTag, TTag::DiffusionTest> { using type = Dune::YaspGrid<3>; };
-#endif
template<class TypeTag>
struct Problem<TypeTag, TTag::DiffusionTest> { using type = TestDiffusion3DProblem<TypeTag>; };
--
GitLab