ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-24 20:00:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_searchtree_for_curved_volume_elements' into 'master'

Browse Source 
Fix searchtree for curved volume elements

See merge request ngsolve/netgen!574
This commit is contained in:
Lackner, Christopher 2023-06-20 14:44:55 +02:00
commit 4f3e0abd25
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/meshing/boundarylayer.cpp
View File

@ -358,7 +358,7 @@ namespace netgen
void MergeAndAddSegments( Mesh & mesh, FlatArray<Segment> new_segments) void MergeAndAddSegments( Mesh & mesh, FlatArray<Segment> new_segments)
{ {
INDEX_2_HASHTABLE<bool> already_added( 2*new_segments.Size() ); INDEX_2_HASHTABLE<bool> already_added( mesh.LineSegments().Size() + 2*new_segments.Size() );
for(auto & seg : mesh.LineSegments()) for(auto & seg : mesh.LineSegments())
{ {

30
libsrc/meshing/meshclass.cpp
View File

@ -5221,7 +5221,37 @@ namespace netgen
auto & el = volelements[ei]; auto & el = volelements[ei];
if(el.IsCurved() && curvedelems->IsElementCurved(ei)) if(el.IsCurved() && curvedelems->IsElementCurved(ei))
{
// add edge/face midpoints to box
auto eltype = el.GetType();
const auto verts = topology.GetVertices(eltype);
const auto edges = FlatArray<const ELEMENT_EDGE>(topology.GetNEdges(eltype), topology.GetEdges0(eltype));
for (const auto & edge: edges) {
netgen::Point<3> lam = netgen::Point<3>(0.5* (verts[edge[0]] + verts[edge[1]]));
auto p = netgen::Point<3>(0.0);
curvedelems->CalcElementTransformation(lam,ei,p);
box.Add(p);
}
const auto faces = FlatArray<const ELEMENT_FACE>(topology.GetNFaces(eltype), topology.GetFaces0(eltype));
for (const auto & face: faces) {
netgen::Vec<3> lam = netgen::Vec<3>(verts[face[0]] + verts[face[1]] + verts[face[2]]);
if(face[3] != -1) {
lam += netgen::Vec<3>(verts[face[3]]);
lam *= 0.25;
}
else
lam *= 1.0/3;
auto p = netgen::Point<3>(0.0);
curvedelems->CalcElementTransformation(netgen::Point<3>(lam),ei,p);
box.Add(p);
}
box.Scale(1.2); box.Scale(1.2);
}
elementsearchtree -> Insert (box, ei+1); elementsearchtree -> Insert (box, ei+1);