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 'boundarylayer_updates' into 'master'

Browse Source 
Boundarylayer updates

See merge request jschoeberl/netgen!488
This commit is contained in:
Matthias Hochsteger 2022-03-07 12:53:51 +00:00
commit 8b8900e21d
2 changed files with 81 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
libsrc/meshing/boundarylayer.cpp
View File

@ -5,9 +5,18 @@
#include "global.hpp"
#include "../geom2d/csg2d.hpp"
#include <set>
namespace netgen
{
Vec<3> getSurfaceNormal(const Mesh & mesh, const Element2d & el)
{
auto v0 = mesh[el[0]];
return Cross(mesh[el[1]]-v0, mesh[el[2]]-v0).Normalize();
};
void InsertVirtualBoundaryLayer (Mesh & mesh)
{
cout << "Insert virt. b.l." << endl;
@ -182,115 +191,67 @@ namespace netgen
void InterpolateSurfaceGrowthVectors(const Mesh & mesh, const BoundaryLayerParameters& blp, int fd_old, FlatArray<Vec<3>, PointIndex> growthvectors, const Table<SurfaceElementIndex, PointIndex> & p2sel)
{
static Timer tall("InterpolateSurfaceGrowthVectors"); RegionTimer rtall(tall);
static Timer tsmooth("InterpolateSurfaceGrowthVectors-Smoothing");
auto np = mesh.GetNP();
// interpolate growth vectors at inner surface points from surrounding edge points
Array<Point<2>, PointIndex> delaunay_points(np);
Array<PointIndex, PointIndex> pmap(np); // maps duplicated points
BitArray is_point_on_bl_surface(np+1);
is_point_on_bl_surface.Clear();
Array<Vec<3>, PointIndex> normals(np);
for(auto pi : Range(growthvectors))
normals[pi] = growthvectors[pi];
Array<SurfaceElementIndex> surface_els;
Array<PointIndex> edge_points;
Array<PointIndex> surface_points;
for(auto facei : Range(1, fd_old+1))
ParallelForRange( mesh.SurfaceElements().Range(), [&] ( auto myrange )
{
if(!blp.surfid.Contains(facei))
continue;
edge_points.SetSize(0);
surface_points.SetSize(0);
surface_els.SetSize(0);
delaunay_points.SetSize(np);
pmap.SetSize(np);
mesh.GetSurfaceElementsOfFace (facei, surface_els);
Box<2> bbox ( Box<2>::EMPTY_BOX );
for(auto sei : surface_els)
{
auto sel = mesh[sei];
for (auto i : Range(sel.GetNP()))
{
auto & gi = sel.GeomInfo()[i];
Point<2> p = {gi.u, gi.v};
bbox.Add(p);
}
}
BoxTree<2> tree(bbox);
for(auto pi : mesh.Points().Range())
{
auto n_surf_els = p2sel[pi].Size();
bool has_relevant_sel = false;
for(auto sei : p2sel[pi])
if(mesh[sei].GetIndex()==facei)
{
has_relevant_sel = true;
break;
}
if(!has_relevant_sel)
for(SurfaceElementIndex sei : myrange)
{
auto facei = mesh[sei].GetIndex();
if(facei < fd_old && !blp.surfid.Contains(facei))
continue;
for(auto pi : mesh[sei].PNums())
if(mesh[pi].Type() == SURFACEPOINT)
is_point_on_bl_surface.SetBitAtomic(pi);
}
});
if(mesh[pi].Type() <= EDGEPOINT)
edge_points.Append(pi);
else
surface_points.Append(pi);
// the same point might have different uv coordinates (closed edges for instance)
// duplicate these points for the delaunay tree
bool inserted = false;
for(auto sei : p2sel[pi])
{
auto sel = mesh[sei];
if(sel.GetIndex()!=facei)
continue;
PointGeomInfo gi = sel.GeomInfo()[sel.PNums().Pos(pi)];
Point<2> p = {gi.u, gi.v};
bool found = false;
tree.GetFirstIntersecting( p, p, [&] (const auto pi_found) { return found = true; });
if(found)
continue;
auto pi_new = pi;
if(inserted)
{
pi_new = delaunay_points.Append(p);
pmap.Append(pi);
edge_points.Append(pi_new);
}
else
{
delaunay_points[pi] = p;
pmap[pi] = pi;
}
tree.Insert(p, pi_new);
inserted = true;
}
}
if(surface_points.Size()==0)
continue;
DelaunayMesh dmesh( delaunay_points, bbox );
for(auto pi : edge_points)
dmesh.AddPoint(pi);
std::map<PointIndex, double> weights;
for(auto pi : surface_points)
Array<PointIndex> points;
for(PointIndex pi : mesh.Points().Range())
if(is_point_on_bl_surface[pi])
{
dmesh.CalcIntersecting(pi);
dmesh.CalcWeights(pi, weights);
auto & v = growthvectors[pi];
auto n = 1./v.Length() * v;
for(auto & [pi_other, weight] : weights)
{
// interpolate only the tangential part of the growth vector
auto t = weight * growthvectors[pmap[pi_other]];
t -= (t * n) * n;
v += t;
}
points.Append(pi);
growthvectors[pi] = 0.0;
}
}
// smooth tangential part of growth vectors from edges to surface elements
RegionTimer rtsmooth(tsmooth);
for(auto i : Range(10))
{
for(auto pi : points)
{
auto sels = p2sel[pi];
Vec<3> new_gw = growthvectors[pi];
int cnt = 1;
std::set<PointIndex> suround;
suround.insert(pi);
auto normal = normals[pi];
for(auto sei: sels)
{
const auto & sel = mesh[sei];
for(auto pi1 : sel.PNums())
if(suround.count(pi1)==0)
{
suround.insert(pi1);
auto gw_other = growthvectors[pi1];
auto tangent_part = gw_other - (gw_other*normal)*normal;
new_gw += tangent_part;
}
}
growthvectors[pi] = 1.0/suround.size() * new_gw;
}
}
for(auto pi : points)
growthvectors[pi] += normals[pi];
}
void GenerateBoundaryLayer(Mesh& mesh, const BoundaryLayerParameters& blp)
@ -298,10 +259,6 @@ namespace netgen
static Timer timer("Create Boundarylayers");
RegionTimer regt(timer);
bool interpolate_growth_vectors = false;
if(mesh.GetGeometry())
interpolate_growth_vectors = mesh.GetGeometry()->GetGeomType() == Mesh::GEOM_OCC;
int max_edge_nr = -1;
for(const auto& seg : mesh.LineSegments())
if(seg.edgenr > max_edge_nr)
@ -338,12 +295,6 @@ namespace netgen
Array<double> surfacefacs(mesh.GetNFD()+1);
surfacefacs = 0.;
auto getSurfaceNormal = [&mesh] (const Element2d& el)
{
auto v0 = mesh[el[0]];
return Cross(mesh[el[1]]-v0, mesh[el[2]]-v0).Normalize();
};
// surface index map
Array<int> si_map(mesh.GetNFD()+1);
si_map = -1;
@ -391,7 +342,7 @@ namespace netgen
if(!blp.surfid.Contains(facei))
continue;
auto n = surfacefacs[sel.GetIndex()] * getSurfaceNormal(sel);
auto n = surfacefacs[sel.GetIndex()] * getSurfaceNormal(mesh, sel);
int itrig = sel.PNums().Pos(pi);
itrig += sel.GetNP();
@ -497,7 +448,7 @@ namespace netgen
for(const auto& sel : mesh.SurfaceElements())
if(project_boundaries.Test(sel.GetIndex()))
{
auto n = getSurfaceNormal(sel);
auto n = getSurfaceNormal(mesh, sel);
for(auto i : Range(sel.PNums()))
{
auto pi = sel.PNums()[i];
@ -543,7 +494,6 @@ namespace netgen
}
// interpolate tangential component of growth vector along edge
if(interpolate_growth_vectors)
for(auto edgenr : Range(max_edge_nr))
{
if(!moved_edges[edgenr+1]) continue;
@ -603,8 +553,7 @@ namespace netgen
}
}
if(interpolate_growth_vectors)
InterpolateSurfaceGrowthVectors(mesh, blp, fd_old, growthvectors, p2sel);
InterpolateSurfaceGrowthVectors(mesh, blp, fd_old, growthvectors, p2sel);
// insert new points
for (PointIndex pi = 1; pi <= np; pi++)

15
libsrc/meshing/meshfunc.cpp
View File

@ -99,6 +99,17 @@ namespace netgen
}
}
// mark used points for already existing volume elements, add them (with wrong point numbers) to domain mesh
for(const auto & el : mesh.VolumeElements())
{
auto dom = el.GetIndex();
auto & els = ret[dom-1].mesh->VolumeElements();
for(auto pi : el.PNums())
ipmap[dom-1][pi] = 1;
els.Append(el);
}
// mark locked/fixed points for each domain TODO: domain bounding box to add only relevant points?
for(auto pi : mesh.LockedPoints())
for(auto i : Range(ret))
@ -149,6 +160,10 @@ namespace netgen
for(auto & pi : sel.PNums())
pi = imap[pi];
for (auto & el : m.VolumeElements())
for(auto & pi : el.PNums())
pi = imap[pi];
for(auto n : Range(1,nmax+1))
{
NgArray<INDEX_2> pairs;