From c1b4a68e49beaa5d433168cd53472aa0e399babf Mon Sep 17 00:00:00 2001
From: "Dennis.Glaeser" <dennis.glaeser@iws.uni-stuttgart.de>
Date: Thu, 7 Mar 2019 11:42:52 +0100
Subject: [PATCH] [test][geometry] add tetrahedra to 1d3d test
---
.../common/geometry/test_1d3d_intersection.cc | 23 +++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/test/common/geometry/test_1d3d_intersection.cc b/test/common/geometry/test_1d3d_intersection.cc
index ba71f82c72..2367167588 100644
--- a/test/common/geometry/test_1d3d_intersection.cc
+++ b/test/common/geometry/test_1d3d_intersection.cc
@@ -21,14 +21,14 @@ makeLine(std::initializer_list<Dune::FieldVector<double, dimworld>>&& c)
}
template<int dimworld = 3>
-bool testIntersection(const Dune::MultiLinearGeometry<double, dimworld, dimworld>& cube,
+bool testIntersection(const Dune::MultiLinearGeometry<double, dimworld, dimworld>& polyhedron,
const Dune::MultiLinearGeometry<double, 1, dimworld>& line,
bool foundExpected = true)
{
using Test = Dumux::GeometryIntersection<Dune::MultiLinearGeometry<double,dimworld,dimworld>,
Dune::MultiLinearGeometry<double,1,dimworld> >;
typename Test::IntersectionType intersection;
- bool found = Test::intersection(cube, line, intersection);
+ bool found = Test::intersection(polyhedron, line, intersection);
if (!found && foundExpected)
std::cerr << "Failed detecting intersection with " << line.corner(0) << " " << line.corner(1) << std::endl;
else if (found && foundExpected)
@@ -49,6 +49,7 @@ int main (int argc, char *argv[]) try
constexpr int dimworld = 3;
constexpr int dim = 3;
+ // test cube-line intersections
std::vector<Dune::FieldVector<double, dimworld>> cubeCorners({
{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {1.0, 1.0, 0.0},
{0.0, 0.0, 1.0}, {1.0, 0.0, 1.0}, {0.0, 1.0, 1.0}, {1.0, 1.0, 1.0}
@@ -99,6 +100,24 @@ int main (int argc, char *argv[]) try
returns.push_back(testIntersection(cube, makeLine({{0.5, 0.5, 0.0}, {0.5, 0.5, -2.0}}), false));
returns.push_back(testIntersection(cube, makeLine({{1.0, 1.0, 1.0}, {2.0, 2.0, 2.0}}), false));
+
+ // test tetrahedron-line intersections
+ std::vector<Dune::FieldVector<double, dimworld>> tetCorners({
+ {0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}
+ });
+
+ Dune::MultiLinearGeometry<double, dim, dimworld>
+ tet(Dune::GeometryTypes::simplex(dimworld), tetCorners);
+
+ // the tests
+ returns.push_back(testIntersection(tet, makeLine({{0.0, 0.0, 0.0}, {1.0, 1.0, 1.0}})));
+ returns.push_back(testIntersection(tet, makeLine({{0.25, 0.25, 0.0}, {0.25, 0.25, 1.0}})));
+ returns.push_back(testIntersection(tet, makeLine({{-1.0, 0.25, 0.5}, {1.0, 0.25, 0.5}})));
+ returns.push_back(testIntersection(tet, makeLine({{1.0, 1.0, 1.0}, {-1.0, -1.0, -1.0}})));
+
+ returns.push_back(testIntersection(tet, makeLine({{1.5, 0.0, 0.5}, {0.0, 1.5, 0.5}}), false));
+ returns.push_back(testIntersection(tet, makeLine({{0.0, 0.0, 0.0}, {0.0, 0.0, -1.0}}), false));
+
// determine the exit code
if (std::any_of(returns.begin(), returns.end(), [](bool i){ return !i; }))
return 1;
--
GitLab