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

fixing delaunay2d point search, non-parallel for small meshes

Browse Source
This commit is contained in:
Joachim Schöberl 2020-10-26 11:20:12 +01:00
parent de83f0ca14
commit cddfb4a0b5
4 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsrc/core/table.cpp
View File

@ -18,6 +18,19 @@ namespace ngcore
size_t size = entrysize.Size();
size_t * index = new size_t[size+1];
if (entrysize.Size() < 100)
{
size_t mysum = 0;
for (size_t i = 0; i < entrysize.Size(); i++)
{
index[i] = mysum;
mysum += entrysize[i];
}
index[entrysize.Size()] = mysum;
return index;
}
Array<size_t> partial_sums(TaskManager::GetNumThreads()+1);
partial_sums[0] = 0;
ParallelJob

19
libsrc/core/taskmanager.cpp
View File

@ -337,6 +337,25 @@ namespace ngcore
return;
}
if (antasks == 1)
{
if (trace)
trace->StartJob(jobnr, afunc.target_type());
jobnr++;
if (startup_function) (*startup_function)();
TaskInfo ti;
ti.task_nr = 0;
ti.ntasks = 1;
ti.thread_nr = 0; ti.nthreads = 1;
{
RegionTracer t(ti.thread_nr, jobnr, RegionTracer::ID_JOB, ti.task_nr);
afunc(ti);
}
if (cleanup_function) (*cleanup_function)();
if (trace)
trace->StopJob();
return;
}
if (trace)
trace->StartJob(jobnr, afunc.target_type());

23
libsrc/meshing/delaunay2d.cpp
View File

@ -45,8 +45,10 @@ namespace netgen
Point<2> p1 = P2(mesh[pnums[0]]);
Point<2> p2 = P2(mesh[pnums[1]]);
Point<2> p3 = P2(mesh[pnums[2]]);
Vec<2> v1 = p2-p1;
Vec<2> v2 = p3-p1;
/*
Mat<2,2> mat, inv;
mat(0,0) = v1*v1;
mat(0,1) = v1*v2;
@ -60,7 +62,22 @@ namespace netgen
c = p1 + sol(0) * v1 + sol(1) * v2;
rad2 = Dist2(c, p1);
r = sqrt(rad2);
r = sqrt(rad2);
*/
// without normal equation ...
Mat<2,2> mat, inv;
mat(0,0) = v1(0); mat(0,1) = v1(1);
mat(1,0) = v2(0); mat(1,1) = v2(1);
CalcInverse (mat, inv);
Vec<2> rhs, sol;
rhs(0) = 0.5 * v1*v1;
rhs(1) = 0.5 * v2*v2;
sol = inv * rhs;
c = p1 + sol;
rad2 = Dist2(c, p1);
r = sqrt(rad2);
}
Point<2> Center() const { return c; }
@ -246,6 +263,7 @@ namespace netgen
if(definitive_overlapping_trig==-1)
{
static Timer t("slow check"); RegionTimer reg(t);
PrintMessage (5, "Warning in delaunay tree - didn't find overlapping circle, check all trigs again");
for(auto i_trig : trigs.Range())
{
@ -257,7 +275,8 @@ namespace netgen
double rad2 = trig.Radius2();
double d2 = Dist2 (trig.Center(), newp);
if (d2 < 0.999 * rad2)
// if (d2 < 0.999 * rad2)
if (d2 < (1-1e-10)*rad2)
{
definitive_overlapping_trig = i_trig;
break;

7
libsrc/meshing/meshclass.cpp
View File

@ -6410,7 +6410,9 @@ namespace netgen
for (SurfaceElementIndex ei : myrange)
for (PointIndex pi : (*this)[ei].PNums())
creator.Add (pi, ei);
}, ngcore::TasksPerThread(4));
},
// ngcore::TasksPerThread(4));
(surfelements.Size()>100) ? ngcore::TasksPerThread(4) : 1);
}
else
{
@ -6432,7 +6434,8 @@ namespace netgen
{
for (PointIndex pi : myrange)
QuickSort(elementsonnode[pi]);
});
},
(surfelements.Size()>100) ? ngcore::TasksPerThread(1) : 1);
return move(elementsonnode);
}