Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix input and output of some cgal tests. #13913

Merged
merged 1 commit into from
Jun 7, 2022
Merged

Fix input and output of some cgal tests. #13913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/cgal/cgal_mesh_criteria.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ test()
{
CGAL::Surface_mesh<CGALPoint> sm;
C3t3 tria;
std::ifstream input("input_grids/cube.off");
std::ifstream input(SOURCE_DIR "/input_grids/cube.off");
input >> sm;
cgal_surface_mesh_to_cgal_triangulation(sm,
tria,
Expand Down
10 changes: 6 additions & 4 deletions tests/cgal/cgal_quadrature_01.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@ using C3t3 = CGAL::Mesh_complex_3_in_triangulation_3<Tr,
void
test()
{
const std::vector<std::string> fnames{"input_grids/cube.off",
"input_grids/tetrahedron.off",
"input_grids/hedra.off",
"input_grids/octahedron.off"};
const std::vector<std::string> fnames{SOURCE_DIR "/input_grids/cube.off",
SOURCE_DIR
"/input_grids/tetrahedron.off",
SOURCE_DIR "/input_grids/hedra.off",
SOURCE_DIR
"/input_grids/octahedron.off"};
CGAL::Surface_mesh<CGALPoint> sm;
C3t3 tria;
constexpr int degree = 3;
Expand Down
5 changes: 3 additions & 2 deletions tests/cgal/cgal_surface_mesh_02.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ using C3t3 = CGAL::Mesh_complex_3_in_triangulation_3<Tr,
void
test()
{
const std::vector<std::string> fnames{"input_grids/cube.off",
"input_grids/tetrahedron.off"};
const std::vector<std::string> fnames{SOURCE_DIR "/input_grids/cube.off",
SOURCE_DIR
"/input_grids/tetrahedron.off"};
CGAL::Surface_mesh<CGALPoint> sm;
C3t3 tria;

Expand Down
4 changes: 2 additions & 2 deletions tests/cgal/cgal_surface_mesh_03.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ using namespace CGALWrappers;
void
test()
{
const std::vector<std::string> fnames{"input_grids/cube.off",
"input_grids/hedra.off"};
const std::vector<std::string> fnames{SOURCE_DIR "/input_grids/cube.off",
SOURCE_DIR "/input_grids/hedra.off"};
CGAL::Surface_mesh<CGALPoint> sm0, sm1, outsm;
std::ifstream input0(fnames[0]);
std::ifstream input1(fnames[1]);
Expand Down
10 changes: 8 additions & 2 deletions tests/cgal/cgal_surface_triangulation_03.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ main()
std::ifstream input_sm(SOURCE_DIR "/input_grids/tripod.off");
input_sm >> sm;
cgal_surface_mesh_to_dealii_triangulation(sm, tria);
go.write_msh(tria, deallog.get_file_stream());
go.write_msh(tria, "temp.msh");
remove("temp.msh");
// If we got here, everything is fine.
deallog << "OK" << std::endl;
}
tria.clear();

Expand All @@ -58,6 +61,9 @@ main()
std::ifstream input_p(SOURCE_DIR "/input_grids/tripod.off");
input_p >> P;
cgal_surface_mesh_to_dealii_triangulation(P, tria);
go.write_msh(tria, deallog.get_file_stream());
go.write_msh(tria, "temp.msh");
remove("temp.msh");
// If we got here, everything is fine.
deallog << "OK" << std::endl;
}
}
5 changes: 5 additions & 0 deletions tests/cgal/cgal_surface_triangulation_03.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

DEAL::Surface mesh
DEAL::OK
DEAL::Polyhedron test
DEAL::OK