From 5d853cd20a96d14c1f4277a1d8175fcf277b68d0 Mon Sep 17 00:00:00 2001
From: "Dennis.Glaeser" <dennis.glaeser@iws.uni-stuttgart.de>
Date: Thu, 12 Mar 2020 09:17:29 +0100
Subject: [PATCH] [test][intersection] use new intersection alias
---
test/common/geometry/test_1d3d_intersection.cc | 2 +-
test/common/geometry/test_2d2d_intersection.cc | 2 +-
test/common/geometry/test_2d3d_intersection.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/common/geometry/test_1d3d_intersection.cc b/test/common/geometry/test_1d3d_intersection.cc
index 2367167588..68fe8d105f 100644
--- a/test/common/geometry/test_1d3d_intersection.cc
+++ b/test/common/geometry/test_1d3d_intersection.cc
@@ -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;
diff --git a/test/common/geometry/test_2d2d_intersection.cc b/test/common/geometry/test_2d2d_intersection.cc
index 1d54d84823..0042f0ad93 100644
--- a/test/common/geometry/test_2d2d_intersection.cc
+++ b/test/common/geometry/test_2d2d_intersection.cc
@@ -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;
diff --git a/test/common/geometry/test_2d3d_intersection.cc b/test/common/geometry/test_2d3d_intersection.cc
index 3b2af1dad0..0b94c645c3 100644
--- a/test/common/geometry/test_2d3d_intersection.cc
+++ b/test/common/geometry/test_2d3d_intersection.cc
@@ -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}));
--
GitLab