Commit 5d853cd2 authored by Dennis Gläser's avatar Dennis Gläser Committed by Timo Koch
Browse files

[test][intersection] use new intersection alias

parent 9ee1495d
......@@ -27,7 +27,7 @@ bool testIntersection(const Dune::MultiLinearGeometry<double, dimworld, dimworld
{
using Test = Dumux::GeometryIntersection<Dune::MultiLinearGeometry<double,dimworld,dimworld>,
Dune::MultiLinearGeometry<double,1,dimworld> >;
typename Test::IntersectionType intersection;
typename Test::Intersection 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;
......
......@@ -52,7 +52,7 @@ bool testPolygonIntersection(const Polygon1& pol1,
using Policy = Dumux::IntersectionPolicy::PolygonPolicy<double, dimworld>;
using Algorithm = Dumux::GeometryIntersection<Polygon1, Polygon2, Policy>;
typename Algorithm::IntersectionType intersection;
typename Algorithm::Intersection intersection;
const bool found = Algorithm::intersection(pol1, pol2, intersection);
if (found && !expectIntersection)
std::cout << "Found false positive!" << std::endl;
......
......@@ -28,7 +28,7 @@ void testSegTriangle(const Dune::FieldVector<double, dimworld>& a,
using SegGeometry = Dune::MultiLinearGeometry<double, 1, dimworld>;
using Policy = Dumux::IntersectionPolicy::PointPolicy<double, dimworld>;
using Test = Dumux::GeometryIntersection<TriGeometry, SegGeometry, Policy>;
typename Test::IntersectionType intersection;
typename Test::Intersection intersection;
const auto tria = TriGeometry(Dune::GeometryTypes::triangle, CornerStorage({a, b, c}));
const auto seg = SegGeometry(Dune::GeometryTypes::line, CornerStorage({q, p}));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment