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

update IdentifyPeriodicBoundaries to also support 2d meshes (and more stable)

Browse Source
This commit is contained in:
Christopher Lackner 2024-08-26 16:37:08 +02:00
parent 0fb5b416ba
commit 1772e01edb
3 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libsrc/meshing/meshclass.cpp
View File

@ -6812,12 +6812,12 @@ namespace netgen
// } // }
// #endif // #endif
int Mesh::IdentifyPeriodicBoundaries(const string &s1, int Mesh::IdentifyPeriodicBoundaries(const string& id_name,
const string &s2, const string &s1,
const Transformation<3> &mapping, const Transformation<3> &mapping,
double pointTolerance) double pointTolerance)
{ {
auto nr = ident->GetMaxNr() + 1; auto nr = ident->GetNr(id_name);
ident->SetType(nr, Identifications::PERIODIC); ident->SetType(nr, Identifications::PERIODIC);
double lami[4]; double lami[4];
set<int> identified_points; set<int> identified_points;
@ -6827,44 +6827,38 @@ namespace netgen
GetBox(pmin, pmax); GetBox(pmin, pmax);
pointTolerance = 1e-8 * (pmax-pmin).Length(); pointTolerance = 1e-8 * (pmax-pmin).Length();
} }
for(const auto& se : surfelements) size_t nse = GetDimension() == 3 ? surfelements.Size() : segments.Size();
for(auto sei : Range(nse))
{ {
if(GetBCName(se.index-1) != s1) auto name = GetDimension() == 3 ? GetBCName(surfelements[sei].index-1) :
GetBCName(segments[sei].edgenr-1);
if(name != s1)
continue; continue;
for(const auto& pi : se.PNums()) const auto& pnums = GetDimension() == 3 ? surfelements[sei].PNums() :
segments[sei].PNums();
for(const auto& pi : pnums)
{ {
if(identified_points.find(pi) != identified_points.end()) if(identified_points.find(pi) != identified_points.end())
continue; continue;
auto pt = (*this)[pi]; auto pt = (*this)[pi];
auto mapped_pt = mapping(pt); auto mapped_pt = mapping(pt);
// auto other_nr = GetElementOfPoint(mapped_pt, lami, true); bool found = false;
auto other_nr = GetSurfaceElementOfPoint(mapped_pt, lami); for(auto other_pi : Range(points))
int index = -1;
if(other_nr != 0)
{ {
auto other_el = SurfaceElement(other_nr); if((mapped_pt - (*this)[other_pi]).Length() < pointTolerance)
for(auto i : Range(other_el.PNums().Size()))
if((mapped_pt - (*this)[other_el.PNums()[i]]).Length() < pointTolerance)
{
index = i;
break;
}
if(index == -1)
{ {
cout << "point coordinates = " << pt << endl; identified_points.insert(pi);
cout << "mapped coordinates = " << mapped_pt << endl; ident->Add(pi, other_pi, nr);
throw Exception("Did not find mapped point with nr " + ToString(pi) + ", are you sure your mesh is periodic?"); found = true;
break;
} }
auto other_pi = other_el.PNums()[index];
identified_points.insert(pi);
ident->Add(pi, other_pi, nr);
} }
else if(!found)
{ {
cout << "point coordinates = " << pt << endl; cout << "point coordinates = " << pt << endl;
cout << "mapped coordinates = " << mapped_pt << endl; cout << "mapped coordinates = " << mapped_pt << endl;
throw Exception("Mapped point with nr " + ToString(pi) + " is outside of mesh, are you sure your mesh is periodic?"); throw Exception("Did not find mapped point with nr " + ToString(pi) + ", are you sure your mesh is periodic?");
} }
} }
} }

4
libsrc/meshing/meshclass.hpp
View File

@ -776,8 +776,8 @@ namespace netgen
{ return facedecoding[i-1]; } { return facedecoding[i-1]; }
// { return facedecoding.Elem(i); } // { return facedecoding.Elem(i); }
int IdentifyPeriodicBoundaries(const string& s1, int IdentifyPeriodicBoundaries(const string& id_name,
const string& s2, const string& s1,
const Transformation<3>& mapping, const Transformation<3>& mapping,
double pointTolerance); double pointTolerance);

3
libsrc/meshing/python_mesh.cpp
View File

@ -1247,7 +1247,8 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
py::arg("identnr"), py::arg("identnr"),
py::arg("type")=Identifications::PERIODIC) py::arg("type")=Identifications::PERIODIC)
.def("IdentifyPeriodicBoundaries", &Mesh::IdentifyPeriodicBoundaries, .def("IdentifyPeriodicBoundaries", &Mesh::IdentifyPeriodicBoundaries,
py::arg("face1"), py::arg("face2"), py::arg("mapping"), py::arg("point_tolerance") = -1.) py::arg("identification_name"), py::arg("face1"), py::arg("mapping"),
py::arg("point_tolerance") = -1.)
.def("GetNrIdentifications", [](Mesh& self) .def("GetNrIdentifications", [](Mesh& self)
{ {
return self.GetIdentifications().GetMaxNr(); return self.GetIdentifications().GetMaxNr();