From 000473364c3f9a8be9f50d9fd4da0a58789289c3 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Mon, 26 Oct 2020 13:25:04 +0100
Subject: [PATCH] [test][navierstokes][channel3d] Only use subgrid for 3d case
* fixes compiler warning 'array subscript 2 is outside array bounds'
for pseudo 3d case
---
test/freeflow/navierstokes/channel/3d/main.cc | 2 +-
test/freeflow/navierstokes/channel/3d/problem.hh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/freeflow/navierstokes/channel/3d/main.cc b/test/freeflow/navierstokes/channel/3d/main.cc
index 3bcce44c67..f3103220bb 100644
--- a/test/freeflow/navierstokes/channel/3d/main.cc
+++ b/test/freeflow/navierstokes/channel/3d/main.cc
@@ -68,7 +68,7 @@ int main(int argc, char** argv)
using Grid = GetPropType<TypeTag, Properties::Grid>;
Dumux::GridManager<Grid> gridManager;
-#if HAVE_DUNE_SUBGRID
+#if HAVE_DUNE_SUBGRID && GRID_DIM == 3
const bool isStaircaseGeometry = getParam<bool>("Problem.IsStaircaseGeometry", false);
auto selector = [&](const auto& element)
diff --git a/test/freeflow/navierstokes/channel/3d/problem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh
index 5d95ea95b0..eded38ba4c 100644
--- a/test/freeflow/navierstokes/channel/3d/problem.hh
+++ b/test/freeflow/navierstokes/channel/3d/problem.hh
@@ -31,7 +31,7 @@
#include <dune/common/float_cmp.hh>
#include <dune/grid/yaspgrid.hh>
-#if HAVE_DUNE_SUBGRID
+#if HAVE_DUNE_SUBGRID && GRID_DIM == 3
#include <dune/subgrid/subgrid.hh>
#endif
@@ -71,7 +71,7 @@ struct Grid<TypeTag, TTag::ThreeDChannelTest>
using HostGrid = Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<GetPropType<TypeTag, Properties::Scalar>, dim> >;
-#if HAVE_DUNE_SUBGRID
+#if HAVE_DUNE_SUBGRID && GRID_DIM == 3
using type = Dune::SubGrid<HostGrid::dimension, HostGrid>;
#else
using type = HostGrid;
--
GitLab