ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 04:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

occ - closesurface identification (prisms)

Browse Source
This commit is contained in:
mhochsteger@cerbsim.com 2021-11-28 19:48:19 +01:00
parent 45bd63810a
commit c0d6f1588d
4 changed files with 123 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
libsrc/meshing/basegeom.cpp
View File

@ -1,3 +1,5 @@
#include <set>
#include <mystdlib.h>
#include "meshing.hpp"
#include <core/register_archive.hpp>
@ -204,7 +206,7 @@ namespace netgen
{
bool need_inverse = ident.from == s.get();
auto other = need_inverse ? ident.to : ident.from;
if(other->nr < current->nr)
if(other->nr < s->primary->nr)
{
auto trafo = ident.trafo;
if(need_inverse)
@ -213,6 +215,15 @@ namespace netgen
s->primary_to_me.Combine(trafo, s->primary_to_me);
changed = true;
}
if(other->primary->nr < s->primary->nr)
{
auto trafo = ident.trafo;
if(need_inverse)
trafo = trafo.CalcInverse();
s->primary = other->primary;
s->primary_to_me.Combine(trafo, other->primary_to_me);
changed = true;
}
}
}
}
@ -478,7 +489,30 @@ namespace netgen
if(edge->primary == edge)
{
DivideEdge(edge, mparam, mesh, edge_points, params);
// check if start and end vertex are identified (if so, we only insert one segement and do z-refinement later)
bool is_identified_edge = false;
auto v0 = vertices[edge->GetStartVertex().nr].get();
auto v1 = vertices[edge->GetEndVertex().nr].get();
for(auto & ident : v0->identifications)
{
auto other = ident.from == v0 ? ident.to : ident.from;
if(other->nr == v1->nr && ident.type == Identifications::CLOSESURFACES)
{
is_identified_edge = true;
break;
}
}
if(is_identified_edge)
{
params.SetSize(2);
params[0] = 0.;
params[1] = 1.;
}
else
{
DivideEdge(edge, mparam, mesh, edge_points, params);
}
}
else
{
@ -634,8 +668,73 @@ namespace netgen
mesh.SetBCName(k, face.properties.GetName());
if(face.primary == &face)
{
if(MeshFace(mesh, mparam, k, glob2loc))
n_failed_faces++;
// check if this face connects two identified closesurfaces
bool is_connecting_closesurfaces = false;
auto & idents = mesh.GetIdentifications();
std::set<int> relevant_edges;
auto segments = face.GetBoundary(mesh);
for(const auto &s : segments)
relevant_edges.insert(s.edgenr-1);
Array<bool, PointIndex> is_point_in_tree(mesh.Points().Size());
is_point_in_tree = false;
PointTree tree( bounding_box );
for(const auto &s : segments)
for(auto pi : s.PNums())
if(!is_point_in_tree[pi])
{
tree.Insert(mesh[pi], pi);
is_point_in_tree[pi] = true;
}
Array<int> mapped_edges(edges.Size());
constexpr int UNINITIALIZED = -2;
constexpr int NOT_MAPPED = -1;
mapped_edges = UNINITIALIZED;
Transformation<3> trafo;
for(const auto &s : segments)
{
auto edgenr = s.edgenr-1;
auto & edge = *edges[edgenr];
ShapeIdentification *edge_mapping;
// have edgenr first time, search for closesurface identification
if(mapped_edges[edgenr] == UNINITIALIZED)
{
mapped_edges[edgenr] = NOT_MAPPED;
for(auto & edge_ident : edge.identifications)
{
if(edge_ident.type == Identifications::CLOSESURFACES &&
edge_ident.from->nr == edgenr &&
relevant_edges.count(edge_ident.to->nr) > 0
)
{
trafo = edge_ident.trafo;
mapped_edges[edgenr] = edge_ident.to->nr;
is_connecting_closesurfaces = true;
break;
}
}
}
// this edge has a closesurface mapping to another -> make connecting quad
if(mapped_edges[edgenr] != NOT_MAPPED)
{
Element2d sel(4);
sel[0] = s[0];
sel[1] = s[1];
sel[2] = tree.Find(trafo(mesh[s[1]]));
sel[3] = tree.Find(trafo(mesh[s[0]]));
sel.SetIndex(face.nr+1);
mesh.AddSurfaceElement(sel);
}
}
if(!is_connecting_closesurfaces)
if(MeshFace(mesh, mparam, k, glob2loc))
n_failed_faces++;
}
}
@ -751,6 +850,8 @@ namespace netgen
pmap[tree.Find(mesh[pi])] = pi;
}
xbool do_invert = maybe;
// now insert mapped surface elements
for(auto sei : mesh.SurfaceElements().Range())
{
@ -758,6 +859,14 @@ namespace netgen
if(sel.GetIndex() != src.nr+1)
continue;
if(do_invert.IsMaybe())
{
auto n_src = src.GetNormal(mesh[sel[0]]);
auto n_dist = dst.GetNormal(mesh[sel[0]]);
Mat<3> normal_matrix;
CalcInverse(Trans(trafo.GetMatrix()), normal_matrix);
do_invert = n_src * (normal_matrix * n_dist) < 0.0;
}
auto sel_new = sel;
sel_new.SetIndex(dst.nr+1);
for(auto i : Range(sel.PNums()))
@ -769,7 +878,8 @@ namespace netgen
}
sel_new[i] = pmap[pi];
}
sel_new.Invert();
if(do_invert.IsTrue())
sel_new.Invert();
for(auto i : Range(sel.PNums()))
dst.CalcPointGeomInfo(mesh[sel_new[i]], sel_new.GeomInfo()[i]);
mesh.AddSurfaceElement(sel_new);

5
libsrc/meshing/basegeom.hpp
View File

@ -164,6 +164,11 @@ namespace netgen
Array<std::pair<Point<3>, double>> restricted_h;
Box<3> bounding_box;
int dimension = 3;
std::map<size_t, GeometryVertex*> vertex_map;
std::map<size_t, GeometryEdge*> edge_map;
std::map<size_t, GeometryFace*> face_map;
std::map<size_t, GeometrySolid*> solid_map;
public:
NetgenGeometry()

2
libsrc/occ/occ_edge.hpp
View File

@ -20,10 +20,10 @@ namespace netgen
double s0, s1;
GProp_GProps props;
public:
OCCVertex start;
OCCVertex end;
public:
OCCEdge(TopoDS_Shape edge_);
auto Shape() const { return edge; }

2
libsrc/occ/occgeom.cpp
View File

@ -1131,6 +1131,8 @@ namespace netgen
edge_map[tshape] = edges.Size();
auto occ_edge = make_unique<OCCEdge>(edge);
occ_edge->properties = global_shape_properties[tshape];
occ_edge->start.nr = vertex_map[occ_edge->start.TShape()];
occ_edge->end.nr = vertex_map[occ_edge->end.TShape()];
edges.Append(std::move(occ_edge));
}