songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7917 from afabri/PMP-concurrentIO-GF 

PMP: Write into different files to avoid concurrent writing
This commit is contained in:
Laurent Rineau 2023-12-11 13:47:18 +01:00
parent 8ee8f27d45 f0426b8aa6
commit b0e944d614
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
View File

@ -335,7 +335,7 @@ void test_triangulate_refine_and_fair_hole_compile() {
std::vector<Vertex_handle> patch_vertices; std::vector<Vertex_handle> patch_vertices;
// use all param // use all param
read_poly_with_borders("elephant_quad_hole.off", poly, border_reps); read_poly_with_borders("elephant_quad_hole_no_DT3.off", poly, border_reps);
CGAL::Polygon_mesh_processing::triangulate_refine_and_fair_hole CGAL::Polygon_mesh_processing::triangulate_refine_and_fair_hole
(poly, border_reps[0], back_inserter(patch_facets), back_inserter(patch_vertices), (poly, border_reps[0], back_inserter(patch_facets), back_inserter(patch_vertices),
CGAL::parameters:: CGAL::parameters::
@ -343,14 +343,14 @@ void test_triangulate_refine_and_fair_hole_compile() {
sparse_linear_solver(Default_solver())); sparse_linear_solver(Default_solver()));
// default solver // default solver
read_poly_with_borders("elephant_quad_hole.off", poly, border_reps); read_poly_with_borders("elephant_quad_hole_no_DT3.off", poly, border_reps);
CGAL::Polygon_mesh_processing::triangulate_refine_and_fair_hole CGAL::Polygon_mesh_processing::triangulate_refine_and_fair_hole
(poly, border_reps[0], back_inserter(patch_facets), back_inserter(patch_vertices), (poly, border_reps[0], back_inserter(patch_facets), back_inserter(patch_vertices),
CGAL::parameters:: CGAL::parameters::
weight_calculator(CGAL::Weights::Uniform_weight<Polyhedron>())); weight_calculator(CGAL::Weights::Uniform_weight<Polyhedron>()));
// default solver and weight // default solver and weight
read_poly_with_borders("elephant_quad_hole.off", poly, border_reps); read_poly_with_borders("elephant_quad_hole_no_DT3.off", poly, border_reps);
CGAL::Polygon_mesh_processing::triangulate_refine_and_fair_hole CGAL::Polygon_mesh_processing::triangulate_refine_and_fair_hole
(poly, border_reps[0], back_inserter(patch_facets), back_inserter(patch_vertices)); (poly, border_reps[0], back_inserter(patch_facets), back_inserter(patch_vertices));
} }
@ -369,11 +369,11 @@ void generate_elephant_with_hole()
{ {
Halfedge_handle nh=opposite(halfedge(fd,poly), poly); Halfedge_handle nh=opposite(halfedge(fd,poly), poly);
CGAL::Euler::remove_face(halfedge(fd, poly), poly); CGAL::Euler::remove_face(halfedge(fd, poly), poly);
std::ofstream output("elephant_triangle_hole.off"); std::ofstream output("elephant_triangle_hole_no_DT3.off");
output << poly; output << poly;
output.close(); output.close();
CGAL::Euler::remove_face(nh, poly); CGAL::Euler::remove_face(nh, poly);
output.open("elephant_quad_hole.off"); output.open("elephant_quad_hole_no_DT3.off");
output << poly; output << poly;
return; return;
} }
@ -389,8 +389,8 @@ typedef CGAL::Surface_mesh<typename Kernel::Point_3> Polyhedron;
generate_elephant_with_hole<Polyhedron>(); generate_elephant_with_hole<Polyhedron>();
std::vector<std::string> input_files; std::vector<std::string> input_files;
input_files.push_back("elephant_triangle_hole.off"); input_files.push_back("elephant_triangle_hole_no_DT3.off");
input_files.push_back("elephant_quad_hole.off"); input_files.push_back("elephant_quad_hole_no_DT3.off");
input_files.push_back(CGAL::data_file_path("meshes/mech-holes-shark.off")); input_files.push_back(CGAL::data_file_path("meshes/mech-holes-shark.off"));
// std::cerr.precision(15); // std::cerr.precision(15);
for(std::vector<std::string>::iterator it = input_files.begin(); it != input_files.end(); ++it) { for(std::vector<std::string>::iterator it = input_files.begin(); it != input_files.end(); ++it) {