From 2e349b45d8fceac1485d6eb62d8d45d8f870fa2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <foss@grueninger.de>
Date: Tue, 2 Jan 2018 01:16:45 +0100
Subject: [PATCH] [mpfa] Use getNumLocalScvfs() instead of constants
---
.../discretization/cellcentered/mpfa/helper.hh | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/dumux/discretization/cellcentered/mpfa/helper.hh b/dumux/discretization/cellcentered/mpfa/helper.hh
index 9532272f50..f082145d04 100644
--- a/dumux/discretization/cellcentered/mpfa/helper.hh
+++ b/dumux/discretization/cellcentered/mpfa/helper.hh
@@ -121,8 +121,10 @@ public:
assert(gridView.size(Dune::GeometryTypes::triangle)
+ gridView.size(Dune::GeometryTypes::quadrilateral) == gridView.size(0));
- return gridView.size(Dune::GeometryTypes::triangle)*6
- + gridView.size(Dune::GeometryTypes::quadrilateral)*8;
+ return gridView.size(Dune::GeometryTypes::triangle)
+ * getNumLocalScvfs(Dune::GeometryTypes::triangle)
+ + gridView.size(Dune::GeometryTypes::quadrilateral)
+ * getNumLocalScvfs(Dune::GeometryTypes::quadrilateral);
#else
assert(gridView.size(Dune::GeometryType(Dune::GeometryType::simplex, 2))
+ gridView.size(Dune::GeometryType(Dune::GeometryType::cube, 2)) == gridView.size(0));
@@ -368,10 +370,14 @@ public:
+ gridView.size(Dune::GeometryTypes::prism)
+ gridView.size(Dune::GeometryTypes::hexahedron) == gridView.size(0));
- return gridView.size(Dune::GeometryTypes::tetrahedron)*12
- + gridView.size(Dune::GeometryTypes::pyramid)*16
- + gridView.size(Dune::GeometryTypes::prism)*18
- + gridView.size(Dune::GeometryTypes::hexahedron)*24;
+ return gridView.size(Dune::GeometryTypes::tetrahedron)
+ * getNumLocalScvfs(Dune::GeometryTypes::tetrahedron)
+ + gridView.size(Dune::GeometryTypes::pyramid)
+ * getNumLocalScvfs(Dune::GeometryTypes::pyramid)
+ + gridView.size(Dune::GeometryTypes::prism)
+ * getNumLocalScvfs(Dune::GeometryTypes::prism)
+ + gridView.size(Dune::GeometryTypes::hexahedron)
+ * getNumLocalScvfs(Dune::GeometryTypes::hexahedron);
#else
assert(gridView.size(Dune::GeometryType(Dune::GeometryType::simplex, 3))
+ gridView.size(Dune::GeometryType(Dune::GeometryType::pyramid, 3))
--
GitLab