From 8d0bb8039fa2a798e86384c3097da80657f0bfd5 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 12 Aug 2017 11:50:37 -0400 Subject: [PATCH] Test project_to_surface without boundary objects. Since GridTools::project_to_object now calls our implementation of project_to_surface directly we can fix up these tests to just call the relevant function. --- tests/numerics/project_to_surface_01.cc | 8 +++----- tests/numerics/project_to_surface_02.cc | 6 ++---- tests/numerics/project_to_surface_03.cc | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/numerics/project_to_surface_01.cc b/tests/numerics/project_to_surface_01.cc index 8b25a5cab1..39859c429d 100644 --- a/tests/numerics/project_to_surface_01.cc +++ b/tests/numerics/project_to_surface_01.cc @@ -15,14 +15,13 @@ -// test StraightBoundary::project_to_surface for lines +// test GridTools::project_to_object for lines #include "../tests.h" #include #include -#include #include #include #include @@ -82,7 +81,6 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - StraightBoundary boundary; for (unsigned int case_no=0; case_no<2; ++case_no) { @@ -98,9 +96,9 @@ void test () { deallog << " Line " << e << ", projected point="; if (dim > 1) - deallog << boundary.project_to_surface (cell->line(e), trial_point); + deallog << GridTools::project_to_object (cell->line(e), trial_point); else - deallog << boundary.project_to_surface (cell, trial_point); + deallog << GridTools::project_to_object (cell, trial_point); deallog << " (line is from "; if (dim > 1) diff --git a/tests/numerics/project_to_surface_02.cc b/tests/numerics/project_to_surface_02.cc index 129b463ffc..0a3739a8ef 100644 --- a/tests/numerics/project_to_surface_02.cc +++ b/tests/numerics/project_to_surface_02.cc @@ -15,14 +15,13 @@ -// test StraightBoundary::project_to_surface for quads +// test GridTools::project_to_object for quads #include "../tests.h" #include #include -#include #include #include #include @@ -82,7 +81,6 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - StraightBoundary boundary; for (unsigned int case_no=0; case_no<2; ++case_no) { @@ -102,7 +100,7 @@ void test () deallog << " Quad " << e << ", projected point="; - const Point p = boundary.project_to_surface (quad, trial_point); + const Point p = GridTools::project_to_object (quad, trial_point); deallog << p; deallog << " (quad is from "; deallog << quad->vertex(0); diff --git a/tests/numerics/project_to_surface_03.cc b/tests/numerics/project_to_surface_03.cc index 7907da9fb7..ad96b69468 100644 --- a/tests/numerics/project_to_surface_03.cc +++ b/tests/numerics/project_to_surface_03.cc @@ -22,7 +22,6 @@ #include "../tests.h" #include #include -#include #include #include #include @@ -36,7 +35,6 @@ void test () deallog << "dim=" << dim << std::endl; Triangulation tria; - StraightBoundary boundary; GridGenerator::hyper_cube(tria, 0, 1); @@ -73,7 +71,7 @@ void test () deallog << " Quad " << e << ", projected point="; - const Point p = boundary.project_to_surface (quad, trial_point); + const Point p = GridTools::project_to_object (quad, trial_point); deallog << p; deallog << " (quad is from "; deallog << quad->vertex(0); -- 2.39.5