From 56de02330e01aa4760a00fa0b55ca7002e42812c Mon Sep 17 00:00:00 2001
From: Beatrix Becker <beatrix.becker@iws.uni-stuttgart.de>
Date: Tue, 31 Jan 2017 12:02:29 +0100
Subject: [PATCH] [interiorboundarydata] move makro outside of assert and
remove bug MpfaFaceType -> MpfaFaceTypes
---
.../cellcentered/mpfa/interiorboundarydata.hh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dumux/discretization/cellcentered/mpfa/interiorboundarydata.hh b/dumux/discretization/cellcentered/mpfa/interiorboundarydata.hh
index 3244b8c74e..0ab82f8efc 100644
--- a/dumux/discretization/cellcentered/mpfa/interiorboundarydata.hh
+++ b/dumux/discretization/cellcentered/mpfa/interiorboundarydata.hh
@@ -123,12 +123,13 @@ public:
VolumeVariables facetVolVars(const FVElementGeometry& fvGeometry) const
{
//! This cannot be called when FacetCoupling is active
- assert(!GET_PROP_VALUE(TypeTag, MpfaFacetCoupling) && "For models with a coupled problem on the element facets you have to"
- "provide a suitable implementation of the InteriorBoundaryData class");
+ static const bool isFacetCoupling = GET_PROP_VALUE(TypeTag, MpfaFacetCoupling);
+ assert(!isFacetCoupling && "For models with a coupled problem on the element facets you have to"
+ "provide a suitable implementation of the InteriorBoundaryData class");
//! This can only be called for interior Dirichlet boundaries
- assert(faceType_ == MpfaFaceType::interiorDirichlet && "requesting Dirichlet vol vars for a face which is"
- "not marked as interior Dirichlet face.");
+ assert(faceType_ == MpfaFaceTypes::interiorDirichlet && "requesting Dirichlet vol vars for a face which is"
+ "not marked as interior Dirichlet face.");
auto element = problem_().model().globalFvGeometry().element(elementIndex());
auto priVars = problem_().dirichlet(element, fvGeometry.scvf(scvfIndex()));
--
GitLab