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

Revert "optimize CalcPartition() and PartitionBoundary()"

Browse Source 
This reverts commit 95b7720efd.
This commit is contained in:
Matthias Hochsteger 2020-10-16 14:44:51 +02:00
parent 4c15146df9
commit f66d8bd54e
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libsrc/geom2d/genmesh2d.cpp
View File

@ -18,43 +18,29 @@ namespace netgen
{ {
double fperel, oldf, f; double fperel, oldf, f;
int n = 1; int n = 10000;
NgArray<Point<2> > xi;
NgArray<double> hi; NgArray<Point<2> > xi(n);
NgArray<double> hi(n);
bool not_fine_enough = true;
for (int i = 0; i < n; i++)
while(not_fine_enough && n < 10000)
{
not_fine_enough = false;
n*=2;
xi.SetSize(n);
hi.SetSize(n);
for (int i = 0; i < n; i++)
{ {
xi[i] = spline.GetPoint ( (i+0.5) / n ); xi[i] = spline.GetPoint ( (i+0.5) / n );
hi[i] = mesh.GetH (Point<3> (xi[i](0), xi[i](1), 0)); hi[i] = mesh.GetH (Point<3> (xi[i](0), xi[i](1), 0));
} }
// limit slope // limit slope
double gradh = min(1/elto0,mp.grading); double gradh = min(1/elto0,mp.grading);
for (int i = 0; i < n-1; i++) for (int i = 0; i < n-1; i++)
{ {
double hnext = hi[i] + gradh * (xi[i+1]-xi[i]).Length(); double hnext = hi[i] + gradh * (xi[i+1]-xi[i]).Length();
if(hnext > 2*hi[i]) hi[i+1] = min(hi[i+1], hnext);
not_fine_enough = true;
hi[i+1] = min(hi[i+1], hnext);
} }
for (int i = n-1; i > 1; i--) for (int i = n-1; i > 1; i--)
{ {
double hnext = hi[i] + gradh * (xi[i-1]-xi[i]).Length(); double hnext = hi[i] + gradh * (xi[i-1]-xi[i]).Length();
if(hnext > 2*hi[i]) hi[i-1] = min(hi[i-1], hnext);
not_fine_enough = true;
hi[i-1] = min(hi[i-1], hnext);
} }
}
points.SetSize (0); points.SetSize (0);
@ -241,10 +227,6 @@ namespace netgen
mesh2d.RestrictLocalHLine (Point<3>(p1(0),p1(1),0), mesh2d.RestrictLocalHLine (Point<3>(p1(0),p1(1),0),
Point<3>(p2(0),p2(1),0), len/mp.segmentsperedge); Point<3>(p2(0),p2(1),0), len/mp.segmentsperedge);
// skip curvature restrictions for straight lines
if(spline.MaxCurvature()==0)
continue;
double hcurve = min (spline.hmax, h/spline.reffak); double hcurve = min (spline.hmax, h/spline.reffak);
double hl = GetDomainMaxh (spline.leftdom); double hl = GetDomainMaxh (spline.leftdom);
if (hl > 0) hcurve = min2 (hcurve, hl); if (hl > 0) hcurve = min2 (hcurve, hl);