Skip to content
Snippets Groups Projects
Commit 4fa85a3e authored by Dennis Gläser's avatar Dennis Gläser Committed by Timo Koch
Browse files

[facet][mpfa] ensure support for gcc 5&6

parent 0764b44d
No related branches found
No related tags found
1 merge request!1431Feature/facetcoupling with mpfa
......@@ -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");
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment