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

Merge pull request #7971 from lrineau/SMDS_3-fix_read_MEDIT-GF 

Mesh_3/SMDS_3: Fix reading of .mesh files
This commit is contained in:
Laurent Rineau 2024-01-24 16:00:06 +01:00
parent ea652b8d2f 885647fe4c
commit f7b4ecd114
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
SMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h
View File

@ -596,24 +596,22 @@ bool build_triangulation_from_file(std::istream& is,
bool is_CGAL_mesh = false; bool is_CGAL_mesh = false;
while(is >> word && word != "End") std::string line;
while(std::getline(is, line) && line != "End")
{ {
if (word.at(0) == '#') // remove trailing whitespace, in particular a possible '\r' from Windows
// end-of-line encoding
if(!line.empty() && std::isspace(line.back())) {
line.pop_back();
}
if (line.size() > 0 && line.at(0) == '#' &&
line.find("CGAL::Mesh_complex_3_in_triangulation_3") != std::string::npos)
{ {
is >> word; is_CGAL_mesh = true; // with CGAL meshes, domain 0 should be kept
if (word == "End") continue;
{
break;
}
else if (word == "CGAL::Mesh_complex_3_in_triangulation_3")
{
is_CGAL_mesh = true; // with CGAL meshes, domain 0 should be kept
continue;
}
//else skip other comments
} }
if(word == "Vertices") if(line == "Vertices")
{ {
is >> nv; is >> nv;
for(int i=0; i<nv; ++i) for(int i=0; i<nv; ++i)
@ -629,8 +627,10 @@ bool build_triangulation_from_file(std::istream& is,
} }
} }
if(word == "Triangles") if(line == "Triangles")
{ {
bool has_negative_surface_patch_ids = false;
typename Tr::Cell::Surface_patch_index max_surface_patch_id = 0;
is >> nf; is >> nf;
for(int i=0; i<nf; ++i) for(int i=0; i<nf; ++i)
{ {
@ -642,7 +642,8 @@ bool build_triangulation_from_file(std::istream& is,
std::cerr << "Issue while reading triangles" << std::endl; std::cerr << "Issue while reading triangles" << std::endl;
return false; return false;
} }
has_negative_surface_patch_ids |= (surface_patch_id < 0);
max_surface_patch_id = (std::max)(max_surface_patch_id, surface_patch_id);
Facet facet; Facet facet;
facet[0] = n[0] - 1; facet[0] = n[0] - 1;
facet[1] = n[1] - 1; facet[1] = n[1] - 1;
@ -668,9 +669,18 @@ bool build_triangulation_from_file(std::istream& is,
border_facets.emplace(facet, surface_patch_id); border_facets.emplace(facet, surface_patch_id);
} }
if(has_negative_surface_patch_ids)
{
if(verbose)
std::cerr << "Warning: negative surface patch ids" << std::endl;
for(auto& facet_and_patch_id : border_facets) {
if(facet_and_patch_id.second < 0)
facet_and_patch_id.second = max_surface_patch_id - facet_and_patch_id.second;
}
}
} }
if(word == "Tetrahedra") if(line == "Tetrahedra")
{ {
is >> ntet; is >> ntet;
for(int i=0; i<ntet; ++i) for(int i=0; i<ntet; ++i)