From 4fa85a3e1889f6dde9eb837861cf4b75479a98aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Mon, 11 Feb 2019 10:38:20 +0100
Subject: [PATCH] [facet][mpfa] ensure support for gcc 5&6
---
.../multidomain/facet/cellcentered/mpfa/couplingmanager.hh | 6 +++---
dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh b/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
index e968e3917e..b894a758b7 100644
--- a/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
+++ b/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh
@@ -166,7 +166,7 @@ public:
* \note The coupling residual is independent of w.r.t. which bulk dof it is computed
*/
template< class LowDimLocalAssembler >
- typename LowDimLocalAssembler::LocalResidual::ElementResidualVector
+ typename LocalResidual<lowDimId>::ElementResidualVector
evalCouplingResidual(LowDimIdType,
const LowDimLocalAssembler& lowDimLocalAssembler,
BulkIdType,
@@ -179,7 +179,7 @@ public:
* the fluxes across the facets of the neighboring bulk elements.
*/
template< class LowDimLocalAssembler >
- typename LowDimLocalAssembler::LocalResidual::ElementResidualVector
+ typename LocalResidual<lowDimId>::ElementResidualVector
evalCouplingResidual(LowDimIdType, const LowDimLocalAssembler& lowDimLocalAssembler, BulkIdType)
{
// make sure this is called for the element for which the context was set
@@ -420,7 +420,7 @@ private:
// Update context to deflected solution and reevaluate residual
updateContext(couplingElemIdx, dofIndex, priVars, pvIdx);
- return evalCouplingResidual(lowDimId, lowDimLocalAssembler, bulkId);
+ return this->evalCouplingResidual(lowDimId, lowDimLocalAssembler, bulkId);
};
static const int numDiffMethod = getParamFromGroup<int>(this->problem(lowDimId).paramGroup(), "Assembly.NumericDifferenceMethod");
diff --git a/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh b/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
index de40286dde..8905592da9 100644
--- a/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
+++ b/dumux/multidomain/facet/cellcentered/mpfa/couplingmapper.hh
@@ -158,7 +158,7 @@ public:
// add coupling info to all elements/scvfs in interaction volumes
for (auto dofIdx : lowDimElementDofs)
for (auto scvfIdx : embeddedScvfIndices)
- addCouplingsFromIV_(bulkFvGridGeometry, fvGeometry.scvf(scvfIdx), fvGeometry, lowDimElemIdx, dofIdx);
+ this->addCouplingsFromIV_(bulkFvGridGeometry, fvGeometry.scvf(scvfIdx), fvGeometry, lowDimElemIdx, dofIdx);
// sort the scvfs according to the corners of the low dim element if box is used
// that allows identifying which scvf flux enters which low dim scv later
--
GitLab