Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
5d853cd2
Commit
5d853cd2
authored
Mar 12, 2020
by
Dennis Gläser
Committed by
Timo Koch
Mar 14, 2020
Browse files
[test][intersection] use new intersection alias
parent
9ee1495d
Changes
3
Hide whitespace changes
Inline
Side-by-side
test/common/geometry/test_1d3d_intersection.cc
View file @
5d853cd2
...
...
@@ -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
::
Intersection
Type
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
;
...
...
test/common/geometry/test_2d2d_intersection.cc
View file @
5d853cd2
...
...
@@ -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
::
Intersection
Type
intersection
;
typename
Algorithm
::
Intersection
intersection
;
const
bool
found
=
Algorithm
::
intersection
(
pol1
,
pol2
,
intersection
);
if
(
found
&&
!
expectIntersection
)
std
::
cout
<<
"Found false positive!"
<<
std
::
endl
;
...
...
test/common/geometry/test_2d3d_intersection.cc
View file @
5d853cd2
...
...
@@ -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
::
Intersection
Type
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
}));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment