From 0e05a7fc24b3bd3b2d79112bbbdf38d71eaf4eb6 Mon Sep 17 00:00:00 2001
From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de>
Date: Wed, 19 Dec 2018 17:56:59 +0100
Subject: [PATCH] [highorder][multidomain] fixed compatibility issue

---
 dumux/discretization/staggered/fvgridgeometry.hh         | 4 ++--
 dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dumux/discretization/staggered/fvgridgeometry.hh b/dumux/discretization/staggered/fvgridgeometry.hh
index 51b9c01e44..7ca4c9fac7 100644
--- a/dumux/discretization/staggered/fvgridgeometry.hh
+++ b/dumux/discretization/staggered/fvgridgeometry.hh
@@ -219,7 +219,7 @@ public:
     using FVGridGeometryTuple = std::tuple< CellCenterFVGridGeometry<ThisType>, FaceFVGridGeometry<ThisType> >;
 
     //! Constructor
-    StaggeredFVGridGeometry(const GridView& gridView)
+    StaggeredFVGridGeometry(const GridView& gridView, const std::string& paramGroup = "")
     : ParentType(gridView)
     , intersectionMapper_(gridView)
     {
@@ -227,7 +227,7 @@ public:
         if (!CheckOverlapSize<DiscretizationMethod::staggered>::isValid(gridView))
             DUNE_THROW(Dune::InvalidStateException, "The staggered discretization method needs at least an overlap of 1 for parallel computations. "
                                                      << " Set the parameter \"Grid.Overlap\" in the input file.");
-        if (hasParamInGroup("Discretization", "TvdApproach"))
+        if (hasParamInGroup(paramGroup, "Discretization.TvdApproach"))
             GeometryHelper::setOrder(2);
     }
 
diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh b/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
index 14d2695944..92196c501a 100644
--- a/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
+++ b/dumux/multidomain/boundary/stokesdarcy/couplingmapper.hh
@@ -136,7 +136,6 @@ public:
 
                 const auto darcyDofIdx = darcyElementIdx[0];
 
-
                 stokesFaceToDarcyStencils[scvf.dofIndex()].push_back(darcyDofIdx);
                 stokesCellCenterToDarcyStencils[stokesElementIdx].push_back(darcyDofIdx);
 
-- 
GitLab