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

use unique_ptr in MeshingData

Browse Source
This commit is contained in:
Matthias Hochsteger 2021-06-22 11:16:28 +02:00
parent 6237f5542f
commit 2b8a2356a0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/meshing/meshfunc.cpp
View File

@ -16,7 +16,7 @@ namespace netgen
int domain; int domain;
// mesh for one domain (contains all adjacent surface elments) // mesh for one domain (contains all adjacent surface elments)
Mesh mesh; unique_ptr<Mesh> mesh;
// maps from lokal (domain) mesh to global mesh // maps from lokal (domain) mesh to global mesh
Array<PointIndex, PointIndex> pmap; Array<PointIndex, PointIndex> pmap;
@ -57,7 +57,8 @@ namespace netgen
md.mp = mp; md.mp = mp;
md.mp.maxh = min2 (mp.maxh, mesh.MaxHDomain(md.domain)); md.mp.maxh = min2 (mp.maxh, mesh.MaxHDomain(md.domain));
auto & m = ret[i].mesh; ret[i].mesh = make_unique<Mesh>();
auto & m = *ret[i].mesh;
m.SetLocalH(mesh.GetLocalH()); m.SetLocalH(mesh.GetLocalH());
@ -84,7 +85,7 @@ namespace netgen
if(mp.only3D_domain_nr && mp.only3D_domain_nr != dom) if(mp.only3D_domain_nr && mp.only3D_domain_nr != dom)
continue; continue;
auto & sels = ret[dom-1].mesh.SurfaceElements(); auto & sels = ret[dom-1].mesh->SurfaceElements();
for(auto pi : sel.PNums()) for(auto pi : sel.PNums())
ipmap[dom-1][pi] = 1; ipmap[dom-1][pi] = 1;
sels.Append(sel); sels.Append(sel);
@ -97,7 +98,7 @@ namespace netgen
if(mp.only3D_domain_nr && mp.only3D_domain_nr != ret[i].domain) if(mp.only3D_domain_nr && mp.only3D_domain_nr != ret[i].domain)
continue; continue;
auto & m = ret[i].mesh; auto & m = *ret[i].mesh;
auto & pmap = ret[i].pmap; auto & pmap = ret[i].pmap;
for(auto pi : Range(ipmap[i])) for(auto pi : Range(ipmap[i]))
@ -116,7 +117,7 @@ namespace netgen
if(mp.only3D_domain_nr && mp.only3D_domain_nr != ret[i].domain) if(mp.only3D_domain_nr && mp.only3D_domain_nr != ret[i].domain)
continue; continue;
auto & m = ret[i].mesh; auto & m = *ret[i].mesh;
for (auto & sel : m.SurfaceElements()) for (auto & sel : m.SurfaceElements())
for(auto & pi : sel.PNums()) for(auto & pi : sel.PNums())
pi = imap[pi]; pi = imap[pi];
@ -140,7 +141,7 @@ namespace netgen
void CloseOpenQuads( MeshingData & md) void CloseOpenQuads( MeshingData & md)
{ {
auto & mesh = md.mesh; auto & mesh = *md.mesh;
auto domain = md.domain; auto domain = md.domain;
MeshingParameters & mp = md.mp; MeshingParameters & mp = md.mp;
@ -232,7 +233,7 @@ namespace netgen
static Timer t("PrepareForBlockFillLocalH"); RegionTimer rt(t); static Timer t("PrepareForBlockFillLocalH"); RegionTimer rt(t);
md.meshing = make_unique<Meshing3>(nullptr); md.meshing = make_unique<Meshing3>(nullptr);
auto & mesh = md.mesh; auto & mesh = *md.mesh;
mesh.CalcSurfacesOfNode(); mesh.CalcSurfacesOfNode();
mesh.FindOpenElements(md.domain); mesh.FindOpenElements(md.domain);
@ -250,7 +251,7 @@ namespace netgen
void MeshDomain( MeshingData & md) void MeshDomain( MeshingData & md)
{ {
auto & mesh = md.mesh; auto & mesh = *md.mesh;
auto domain = md.domain; auto domain = md.domain;
MeshingParameters & mp = md.mp; MeshingParameters & mp = md.mp;
@ -664,7 +665,7 @@ namespace netgen
for(auto & m_ : md) for(auto & m_ : md)
{ {
auto first_new_pi = m_.pmap.Range().Next(); auto first_new_pi = m_.pmap.Range().Next();
auto & m = m_.mesh; auto & m = *m_.mesh;
Array<PointIndex, PointIndex> pmap(m.Points().Size()); Array<PointIndex, PointIndex> pmap(m.Points().Size());
for(auto pi : Range(PointIndex(PointIndex::BASE), first_new_pi)) for(auto pi : Range(PointIndex(PointIndex::BASE), first_new_pi))
pmap[pi] = m_.pmap[pi]; pmap[pi] = m_.pmap[pi];