ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-11 16:49:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'remove_search_tree_in_face_mapping' into 'master'

Browse Source 
Remove search tree in face mapping

See merge request ngsolve/netgen!640
This commit is contained in:
Lackner, Christopher 2024-03-06 15:22:28 +01:00
commit a5c11df37e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsrc/meshing/basegeom.cpp
View File

@ -22,7 +22,7 @@ namespace netgen
ArrayMem<int, 1> points;
tree.GetIntersecting(p, p, points);
if(points.Size()==0)
throw Exception("cannot find mapped point");
throw Exception("cannot find mapped point " + ToString(p));
return points[0];
}
@ -935,11 +935,12 @@ namespace netgen
}
bool have_identifications = false;
std::map<tuple<PointIndex, int>, PointIndex> mapto;
for(auto & face : faces)
if(face->primary != face.get())
{
have_identifications = true;
MapSurfaceMesh(mesh, *face);
MapSurfaceMesh(mesh, *face, mapto);
}
// identify points on faces
@ -983,7 +984,8 @@ namespace netgen
if(ident.from == face.get())
for(auto pi : pi_of_face[face->nr])
{
auto pi_other = tree.Find(ident.trafo(mesh[pi]));
auto pi_primary = ident.from->primary->nr == ident.from->nr ? pi : mapto[{pi, ident.to->primary->nr}];
auto pi_other = ident.to->primary->nr == ident.to->nr ? pi_primary : mapto[{pi_primary, ident.to->nr}];
mesh_ident.Add(pi, pi_other, ident.name, ident.type);
}
}
@ -993,7 +995,7 @@ namespace netgen
multithread.task = savetask;
}
void NetgenGeometry :: MapSurfaceMesh( Mesh & mesh, const GeometryFace & dst ) const
void NetgenGeometry :: MapSurfaceMesh( Mesh & mesh, const GeometryFace & dst, std::map<tuple<PointIndex, int>, PointIndex> & mapto ) const
{
static Timer timer("MapSurfaceMesh");
RegionTimer rt(timer);
@ -1074,6 +1076,8 @@ namespace netgen
pmap[pi] = mesh.AddPoint(trafo(mesh[pi]), 1, SURFACEPOINT);
}
sel_new[i] = pmap[pi];
mapto[{pi, dst.nr}] = pmap[pi];
mapto[{pmap[pi], src.nr}] = pi;
}
if(do_invert.IsTrue())
sel_new.Invert();

2
libsrc/meshing/basegeom.hpp
View File

@ -243,7 +243,7 @@ namespace netgen
virtual void MeshSurface(Mesh& mesh, const MeshingParameters& mparam) const;
virtual bool MeshFace(Mesh& mesh, const MeshingParameters& mparam,
int nr, FlatArray<int, PointIndex> glob2loc) const;
virtual void MapSurfaceMesh( Mesh & mesh, const GeometryFace & dst ) const;
virtual void MapSurfaceMesh( Mesh & mesh, const GeometryFace & dst, std::map<tuple<PointIndex, int>, PointIndex> & mapto) const;
virtual void OptimizeSurface(Mesh& mesh, const MeshingParameters& mparam) const;
virtual void FinalizeMesh(Mesh& mesh) const;