[occ] inner point of surface -> surface mesh

This commit is contained in:
Christopher Lackner 2022-03-30 12:47:07 +02:00
parent 1de4d6e1e5
commit d36b3d8b4e
6 changed files with 58 additions and 2 deletions

View File

@ -704,6 +704,16 @@ namespace netgen
}
}
}
for(const auto& vert : GetFaceVertices(face))
{
PointIndex pi = vert->nr + 1;
if(glob2loc[pi] == 0)
{
meshing.AddPoint(mesh[pi], pi);
cntp++;
glob2loc[pi] = cntp;
}
}
for(auto & seg : segments)
{
PointGeomInfo gi0, gi1;

View File

@ -203,6 +203,8 @@ namespace netgen
const GeometryEdge & GetEdge(int i) const { return *edges[i]; }
const GeometryVertex & GetVertex(int i) const { return *vertices[i]; }
virtual Array<GeometryVertex*> GetFaceVertices(const GeometryFace& face) const { return Array<GeometryVertex*>{}; }
void Clear();
virtual int GenerateMesh (shared_ptr<Mesh> & mesh, MeshingParameters & mparam);

View File

@ -25,6 +25,7 @@ namespace netgen
public:
OCCFace(TopoDS_Shape dshape);
const TopoDS_Face Shape() const { return face; }
T_Shape TShape() { return tface; }
size_t GetHash() const override;

View File

@ -4,6 +4,7 @@
#include <meshing.hpp>
#include "occgeom.hpp"
#include "occ_face.hpp"
#include "occmeshsurf.hpp"
#include <BRepAdaptor_Curve.hxx>
@ -250,6 +251,7 @@ namespace netgen
FaceDescriptor & fd = mesh.GetFaceDescriptor(k);
auto face = TopoDS::Face(geom.fmap(k));
const auto& occface = dynamic_cast<const OCCFace&>(geom.GetFace(k-1));
auto fshape = face.TShape();
int oldnf = mesh.GetNSE();
@ -298,6 +300,20 @@ namespace netgen
glob2loc[pi] = cntp;
}
}
for(const auto& vert : geom.GetFaceVertices(geom.GetFace(k-1)))
{
PointIndex pi = vert->nr + 1;
if(glob2loc[pi] == 0)
{
auto gi = occface.Project(mesh[pi]);
MultiPointGeomInfo mgi;
mgi.AddPointGeomInfo(gi);
meshing.AddPoint(mesh[pi], pi, &mgi);
cntp++;
glob2loc[pi] = cntp;
}
}
/*
for (int i = 1; i <= mesh.GetNSeg(); i++)
@ -326,6 +342,8 @@ namespace netgen
Array<PointGeomInfo> gis(2*segments.Size());
gis.SetSize (0);
glob2loc = 0;
int cntpt = 0;
Box<2> uv_box(Box<2>::EMPTY_BOX);
for(auto & seg : segments)
@ -357,7 +375,7 @@ namespace netgen
{
PointIndex pi = seg[j];
meshing.AddPoint (mesh.Point(pi), pi);
glob2loc[pi] = ++cntpt;
gis.Append (gi[j]);
locpnum[j] = gis.Size();
uv_tree.Insert(uv, locpnum[j]);
@ -366,6 +384,21 @@ namespace netgen
meshing.AddBoundaryElement (locpnum[0], locpnum[1], gi[0], gi[1]);
}
for(const auto& vert : geom.GetFaceVertices(geom.GetFace(k-1)))
{
PointIndex pi = vert->nr + 1;
if(glob2loc[pi] == 0)
{
auto gi = occface.Project(mesh[pi]);
MultiPointGeomInfo mgi;
mgi.AddPointGeomInfo(gi);
meshing.AddPoint(mesh[pi], pi, &mgi);
gis.Append(gi);
Point<2> uv = { gi.u, gi.v };
uv_tree.Insert(uv, gis.Size());
glob2loc[pi] = ++cntpt;
}
}
}

View File

@ -1316,6 +1316,14 @@ namespace netgen
}
Array<GeometryVertex*> OCCGeometry :: GetFaceVertices(const GeometryFace& face) const
{
Array<GeometryVertex*> verts;
const auto& occface = dynamic_cast<const OCCFace&>(face);
for(auto& vert : GetVertices(occface.Shape()))
verts.Append(vertices[vertex_map.at(vert.TShape())].get());
return move(verts);
}
void OCCGeometry :: BuildVisualizationMesh (double deflection)

View File

@ -247,6 +247,8 @@ namespace netgen
void MakeSolid();
Array<GeometryVertex*> GetFaceVertices(const GeometryFace& face) const override;
void HealGeometry();
void GlueGeometry();