Skip to content

Commit

Permalink
Merge pull request #14325 from luca-heltai/CGAL--adjust_version_inter…
Browse files Browse the repository at this point in the history
…sections

Update required cgal version for intersection routines
  • Loading branch information
kronbichler committed Sep 30, 2022
2 parents eede82a + 8293f80 commit d20b776
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions source/cgal/intersections.cc
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ namespace CGALWrappers
compute_intersection(const std::array<Point<3>, 2> &first_simplex,
const std::array<Point<3>, 4> &second_simplex)
{
# if DEAL_II_CGAL_VERSION_GTE(5, 1, 5)
# if DEAL_II_CGAL_VERSION_GTE(5, 5, 0)
std::array<CGALPoint3, 4> pts0;
std::array<CGALPoint3, 2> pts1;
std::transform(
Expand Down Expand Up @@ -311,7 +311,7 @@ namespace CGALWrappers
compute_intersection(const std::array<Point<3>, 3> &first_simplex,
const std::array<Point<3>, 4> &second_simplex)
{
# if DEAL_II_CGAL_VERSION_GTE(5, 1, 5)
# if DEAL_II_CGAL_VERSION_GTE(5, 5, 0)
std::array<CGALPoint3, 4> pts0;
std::array<CGALPoint3, 3> pts1;
std::transform(
Expand Down Expand Up @@ -464,7 +464,7 @@ namespace CGALWrappers
const std::array<Point<3>, 2> &vertices1,
const double tol)
{
# if DEAL_II_CGAL_VERSION_GTE(5, 1, 5)
# if DEAL_II_CGAL_VERSION_GTE(5, 5, 0)
std::array<CGALPoint3_exact, 8> pts;
std::transform(
vertices0.begin(), vertices0.end(), pts.begin(), [&](const Point<3> &p) {
Expand Down Expand Up @@ -521,7 +521,7 @@ namespace CGALWrappers
const std::array<Point<3>, 4> &vertices1,
const double tol)
{
# if DEAL_II_CGAL_VERSION_GTE(5, 1, 5)
# if DEAL_II_CGAL_VERSION_GTE(5, 5, 0)
std::array<CGALPoint3_exact, 8> pts_hex;
std::array<CGALPoint3_exact, 4> pts_quad;
std::transform(
Expand Down

0 comments on commit d20b776

Please sign in to comment.