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

Merge branch 'cleanup' into 'master'

Browse Source 
little cleanup and modernization in geom2d code

See merge request jschoeberl/netgen!219
This commit is contained in:
Joachim Schöberl 2019-08-28 13:40:25 +00:00
commit 3e1a8c7493
2 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libsrc/geom2d/genmesh2d.cpp
View File

@ -308,55 +308,50 @@ namespace netgen
void SplineGeometry2d :: CopyEdgeMesh (int from, int to, Mesh & mesh, Point3dTree & searchtree) void SplineGeometry2d :: CopyEdgeMesh (int from, int to, Mesh & mesh, Point3dTree & searchtree)
{ {
// const int D = 2; Array<PointIndex, PointIndex> mappoints (mesh.GetNP());
Array<double, PointIndex> param (mesh.GetNP());
NgArray<int, PointIndex::BASE> mappoints (mesh.GetNP()); mappoints = PointIndex::INVALID;
NgArray<double, PointIndex::BASE> param (mesh.GetNP());
mappoints = -1;
param = 0; param = 0;
Point3d pmin, pmax; Point3d pmin, pmax;
mesh.GetBox (pmin, pmax); mesh.GetBox (pmin, pmax);
double diam2 = Dist2(pmin, pmax); double diam2 = Dist2(pmin, pmax);
if (printmessage_importance>0) PrintMessage(3, string("Copy edge, from ") + ToString(from) + " to " + ToString(to));
cout << "copy edge, from = " << from << " to " << to << endl;
for (int i = 1; i <= mesh.GetNSeg(); i++) for (const auto& seg : mesh.LineSegments())
{ {
const Segment & seg = mesh.LineSegment(i);
if (seg.edgenr == from) if (seg.edgenr == from)
{ {
mappoints.Elem(seg[0]) = 1; mappoints[seg[0]] = 1;
param.Elem(seg[0]) = seg.epgeominfo[0].dist; param[seg[0]] = seg.epgeominfo[0].dist;
mappoints.Elem(seg[1]) = 1; mappoints[seg[1]] = 1;
param.Elem(seg[1]) = seg.epgeominfo[1].dist; param[seg[1]] = seg.epgeominfo[1].dist;
} }
} }
bool mapped = false; bool mapped = false;
for (int i = 1; i <= mappoints.Size(); i++) for (auto i : Range(mappoints))
{ {
if (mappoints.Get(i) != -1) if (mappoints[i].IsValid())
{ {
Point<2> newp = splines.Get(to)->GetPoint (param.Get(i)); Point<2> newp = splines.Get(to)->GetPoint (param[i]);
Point<3> newp3 (newp(0), newp(1), 0); Point<3> newp3 (newp(0), newp(1), 0);
int npi = -1; PointIndex npi = PointIndex::INVALID;
for (PointIndex pi = PointIndex::BASE; for (auto pi : Range(mesh.Points()))
pi < mesh.GetNP()+PointIndex::BASE; pi++)
if (Dist2 (mesh.Point(pi), newp3) < 1e-12 * diam2) if (Dist2 (mesh.Point(pi), newp3) < 1e-12 * diam2)
npi = pi; npi = pi;
if (npi == -1) if (!npi.IsValid())
{ {
npi = mesh.AddPoint (newp3); npi = mesh.AddPoint (newp3);
searchtree.Insert (newp3, npi); searchtree.Insert (newp3, npi);
} }
mappoints.Elem(i) = npi; mappoints[i] = npi;
mesh.GetIdentifications().Add (i, npi, to); mesh.GetIdentifications().Add (i, npi, to);
mapped = true; mapped = true;
@ -375,15 +370,15 @@ namespace netgen
Segment nseg; Segment nseg;
nseg.edgenr = to; nseg.edgenr = to;
nseg.si = GetSpline(to-1).bc; // splines.Get(to)->bc; nseg.si = GetSpline(to-1).bc; // splines.Get(to)->bc;
nseg[0] = mappoints.Get(seg[0]); nseg[0] = mappoints[seg[0]];
nseg[1] = mappoints.Get(seg[1]); nseg[1] = mappoints[seg[1]];
nseg.domin = GetSpline(to-1).leftdom; nseg.domin = GetSpline(to-1).leftdom;
nseg.domout = GetSpline(to-1).rightdom; nseg.domout = GetSpline(to-1).rightdom;
nseg.epgeominfo[0].edgenr = to; nseg.epgeominfo[0].edgenr = to;
nseg.epgeominfo[0].dist = param.Get(seg[0]); nseg.epgeominfo[0].dist = param[seg[0]];
nseg.epgeominfo[1].edgenr = to; nseg.epgeominfo[1].edgenr = to;
nseg.epgeominfo[1].dist = param.Get(seg[1]); nseg.epgeominfo[1].dist = param[seg[1]];
mesh.AddSegment (nseg); mesh.AddSegment (nseg);
} }
} }

54
libsrc/geom2d/python_geom2d.cpp
View File

@ -62,33 +62,27 @@ DLL_HEADER void ExportGeom2d(py::module &m)
}), }),
py::arg("x"), py::arg("y"), py::arg("maxh") = 1e99, py::arg("hpref")=0, py::arg("name")="") py::arg("x"), py::arg("y"), py::arg("maxh") = 1e99, py::arg("hpref")=0, py::arg("name")="")
.def("Append", FunctionPointer([](SplineGeometry2d &self, py::list segment, int leftdomain, int rightdomain, .def("Append", FunctionPointer([](SplineGeometry2d &self, py::list segment, int leftdomain, int rightdomain,
py::object bc, py::object copy, double maxh, double hpref) optional<variant<int, string>> bc, optional<int> copy, double maxh,
double hpref)
{ {
py::extract<std::string> segtype(segment[0]); auto segtype = py::cast<std::string>(segment[0]);
SplineSegExt * seg; SplineSegExt * seg;
if (segtype().compare("line") == 0) if (segtype == "line")
{ {
py::extract<int> point_index1(segment[1]); LineSeg<2> * l = new LineSeg<2>(self.GetPoint(py::cast<int>(segment[1])),
py::extract<int> point_index2(segment[2]); self.GetPoint(py::cast<int>(segment[2])));
//point_index1.check()
LineSeg<2> * l = new LineSeg<2>(self.GetPoint(point_index1()), self.GetPoint(point_index2()));
seg = new SplineSegExt(*l); seg = new SplineSegExt(*l);
} }
else if (segtype().compare("spline3") == 0) else if (segtype == "spline3")
{ {
py::extract<int> point_index1(segment[1]); SplineSeg3<2> * seg3 = new SplineSeg3<2>(self.GetPoint(py::cast<int>(segment[1])),
py::extract<int> point_index2(segment[2]); self.GetPoint(py::cast<int>(segment[2])),
py::extract<int> point_index3(segment[3]); self.GetPoint(py::cast<int>(segment[3])));
SplineSeg3<2> * seg3 = new SplineSeg3<2>(self.GetPoint(point_index1()), self.GetPoint(point_index2()), self.GetPoint(point_index3()));
seg = new SplineSegExt(*seg3); seg = new SplineSegExt(*seg3);
} }
else else
{ throw Exception("Appended segment is not a line or a spline3");
cout << "Appended segment is not a line or a spline3" << endl;
}
seg->leftdom = leftdomain; seg->leftdom = leftdomain;
seg->rightdom = rightdomain; seg->rightdom = rightdomain;
seg->hmax = maxh; seg->hmax = maxh;
@ -96,23 +90,27 @@ DLL_HEADER void ExportGeom2d(py::module &m)
seg->hpref_right = hpref; seg->hpref_right = hpref;
seg->reffak = 1; seg->reffak = 1;
seg->copyfrom = -1; seg->copyfrom = -1;
if (py::extract<int>(copy).check()) if (copy.has_value())
seg->copyfrom = py::extract<int>(copy)()+1; seg->copyfrom = *copy+1;
if (py::extract<int>(bc).check()) if (bc.has_value())
seg->bc = py::extract<int>(bc)();
else if (py::extract<string>(bc).check())
{ {
string bcname = py::extract<string>(bc)(); if(auto intptr = get_if<int>(&*bc); intptr)
seg->bc = self.GetNSplines()+1; seg->bc = *intptr;
self.SetBCName(seg->bc, bcname); else
{
auto bcname = get_if<string>(&*bc);
seg->bc = self.GetNSplines() + 1;
self.SetBCName(seg->bc, *bcname);
}
} }
else else
seg->bc = self.GetNSplines()+1; seg->bc = self.GetNSplines()+1;
self.AppendSegment(seg); self.AppendSegment(seg);
return self.GetNSplines()-1; return self.GetNSplines()-1;
}), py::arg("point_indices"), py::arg("leftdomain") = 1, py::arg("rightdomain") = py::int_(0), }), py::arg("point_indices"), py::arg("leftdomain") = 1, py::arg("rightdomain") = py::int_(0),
py::arg("bc")=NGDummyArgument(), py::arg("copy")=NGDummyArgument(), py::arg("maxh")=1e99, py::arg("hpref")=0) py::arg("bc")=nullopt, py::arg("copy")=nullopt, py::arg("maxh")=1e99,
py::arg("hpref")=0)
.def("AppendSegment", FunctionPointer([](SplineGeometry2d &self, py::list point_indices, int leftdomain, int rightdomain) .def("AppendSegment", FunctionPointer([](SplineGeometry2d &self, py::list point_indices, int leftdomain, int rightdomain)
@ -132,6 +130,8 @@ DLL_HEADER void ExportGeom2d(py::module &m)
seg = new SplineSegExt(*seg3); seg = new SplineSegExt(*seg3);
} }
else
throw Exception("Can only append segments with 2 or 3 points!");
seg->leftdom = leftdomain; seg->leftdom = leftdomain;
seg->rightdom = rightdomain; seg->rightdom = rightdomain;
seg->hmax = 1e99; seg->hmax = 1e99;