From 87334751be8135337e08fe018664a5f94e78a840 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Fri, 28 Nov 2014 12:38:05 +0000
Subject: [PATCH] [cell-centered implicit] fix bug introduced by r13823
It was not such a good idea to change the name of the protected
evalDirichletSegment_ function of the CCLocalResidual, since it can be
overwritten in derived LocalResiduals, and in fact is already
overwritten in MPNCLocalResidual. The name is changed back to its
original.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13824 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/cellcentered/cclocalresidual.hh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dumux/implicit/cellcentered/cclocalresidual.hh b/dumux/implicit/cellcentered/cclocalresidual.hh
index aa5d3048dd..efbc2b7034 100644
--- a/dumux/implicit/cellcentered/cclocalresidual.hh
+++ b/dumux/implicit/cellcentered/cclocalresidual.hh
@@ -94,7 +94,7 @@ protected:
// evaluate the pure Dirichlet conditions at the boundary face
if (bcTypes.hasDirichlet() && !bcTypes.hasNeumann())
- this->asImp_().evalDirichletSegmentPure_(isIt, bcTypes);
+ this->asImp_().evalDirichletSegment_(isIt, bcTypes);
}
}
@@ -211,7 +211,7 @@ protected:
* \brief Treat Dirichlet boundary conditions in a weak sense for a single
* intersection that only has Dirichlet boundary conditions
*/
- void evalDirichletSegmentPure_(const IntersectionIterator &isIt,
+ void evalDirichletSegment_(const IntersectionIterator &isIt,
const BoundaryTypes &bcTypes)
{
// temporary vector to store the Dirichlet boundary fluxes
@@ -243,8 +243,6 @@ protected:
PrimaryVariables values;
Valgrind::SetUndefined(values);
- unsigned bfIdx = isIt->indexInInside();
-
this->problem_().dirichlet(values, *isIt);
Valgrind::CheckDefined(values);
--
GitLab