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

always merge domains in separate meshes (consistent output)

Browse Source
This commit is contained in:
Matthias Hochsteger 2021-06-14 09:15:43 +02:00
parent 9488485f22
commit 1cf3d2a21c
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libsrc/meshing/meshfunc.cpp
View File

@ -278,6 +278,7 @@ namespace netgen
void MergeMeshes( Mesh & mesh, FlatArray<Mesh> meshes, PointIndex first_new_pi ) void MergeMeshes( Mesh & mesh, FlatArray<Mesh> meshes, PointIndex first_new_pi )
{ {
// todo: optimize: count elements, alloc all memory, copy vol elements in parallel
static Timer t("MergeMeshes"); RegionTimer rt(t); static Timer t("MergeMeshes"); RegionTimer rt(t);
for(auto & m : meshes) for(auto & m : meshes)
{ {
@ -314,31 +315,23 @@ namespace netgen
throw NgException ("Stop meshing since boundary mesh is overlapping"); throw NgException ("Stop meshing since boundary mesh is overlapping");
if(task_manager) Array<Mesh> meshes(mesh3d.GetNDomains()-1);
auto first_new_pi = mesh3d.Points().Range().Next();
for(auto & m : meshes)
{ {
Array<Mesh> meshes(mesh3d.GetNDomains()-1); m = mesh3d;
auto first_new_pi = mesh3d.Points().Range().Next(); m.SetLocalH(mesh3d.GetLocalH());
for(auto & m : meshes)
{
m = mesh3d;
m.SetLocalH(mesh3d.GetLocalH());
}
ParallelFor(Range(1, mesh3d.GetNDomains()+1), [&](int k)
{
if(k==1)
MeshDomain(mesh3d, mp, k);
else
MeshDomain(meshes[k-2], mp, k);
});
MergeMeshes(mesh3d, meshes, first_new_pi);
} }
else
for (int k = 1; k <= mesh3d.GetNDomains(); k++)
MeshDomain(mesh3d, mp, k);
ParallelFor(Range(1, mesh3d.GetNDomains()+1), [&](int k)
{
if(k==1)
MeshDomain(mesh3d, mp, k);
else
MeshDomain(meshes[k-2], mp, k);
});
MergeMeshes(mesh3d, meshes, first_new_pi);
MeshQuality3d (mesh3d); MeshQuality3d (mesh3d);