From 8d251051c5be2ae3d642a8f70a457f0176391a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?=
 <christoph.grueninger@iws.uni-stuttgart.de>
Date: Mon, 9 May 2016 11:36:27 +0200
Subject: [PATCH] Fix headercheck for systems without UG

---
 .../porousmediumflow/1p/sequential/test_diffusionproblem3d.hh | 4 +++-
 test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh     | 4 ++++
 .../2p2c/sequential/test_adaptive2p2c2dproblem.hh             | 4 ++++
 .../2p2c/sequential/test_adaptive2p2c3dproblem.hh             | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
index ccc426d951..810937e275 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
@@ -51,8 +51,10 @@ NEW_TYPE_TAG(DiffusionTestProblem, INHERITS_FROM(SequentialTwoP, TestDiffusionSp
 // Set the grid type
 #if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
-#else
+#elif HAVE_UG
 SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::UGGrid<3>);
+#else
+SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::YaspGrid<3>);
 #endif
 
 SET_TYPE_PROP(DiffusionTestProblem, Problem, Dumux::TestDiffusion3DProblem<TypeTag>);
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 08cbe04e9e..165bdaf21d 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -59,7 +59,11 @@ namespace Properties
 NEW_TYPE_TAG(MPFATwoPTestProblem, INHERITS_FROM(Test2PSpatialParams));
 
 // Set the grid type
+#if HAVE_UG
 SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::UGGrid<2>);
+#else
+SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::YaspGrid<2>);
+#endif
 
 // Set the problem property
 SET_TYPE_PROP(MPFATwoPTestProblem, Problem, Dumux::MPFATwoPTestProblem<TypeTag>);
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index c1d1456f77..902d8fcebd 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -45,7 +45,11 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c2d, INHERITS_FROM(SequentialTwoPTwoCAdaptive,Test2P2CSpatialParams));
 
 // Set the grid type
+#if HAVE_UG
 SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::UGGrid<2>);
+#else
+SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::YaspGrid<3>);
+#endif
 
 // Set the problem property
 SET_TYPE_PROP(Adaptive2p2c2d, Problem, Dumux::Adaptive2p2c2d<TTAG(Adaptive2p2c2d)>);
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index 00f007870b..0a3f5963f7 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -44,7 +44,11 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c3d, INHERITS_FROM(SequentialTwoPTwoCAdaptive,Test2P2CSpatialParams, MPFAProperties));
 
 // Set the grid type
+#if HAVE_UG
 SET_TYPE_PROP(Adaptive2p2c3d, Grid, Dune::UGGrid<3>);
+#else
+SET_TYPE_PROP(Adaptive2p2c3d, Grid, Dune::YaspGrid<3>);
+#endif
 
 // Set the problem property
 SET_TYPE_PROP(Adaptive2p2c3d, Problem, Dumux::Adaptive2p2c3d<TTAG(Adaptive2p2c3d)>);
-- 
GitLab