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

Merge branch 'add_csg_solid_maxh' into 'master'

Browse Source 
Add maxh property to Solid2d

See merge request jschoeberl/netgen!464
This commit is contained in:
Matthias Hochsteger 2021-12-22 10:55:32 +00:00
commit 8e38334b9a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsrc/geom2d/csg2d.cpp
View File

@ -2185,6 +2185,7 @@ shared_ptr<netgen::SplineGeometry2d> CSG2d :: GenerateSplineGeometry()
if(!is_solid_degenerated) if(!is_solid_degenerated)
{ {
geo->SetMaterial(dom, s.name); geo->SetMaterial(dom, s.name);
geo->SetDomainMaxh(dom, s.maxh);
if(s.layer != 1) if(s.layer != 1)
geo->SetDomainLayer(dom, s.layer); geo->SetDomainLayer(dom, s.layer);
} }

2
libsrc/geom2d/csg2d.hpp
View File

@ -632,6 +632,7 @@ struct Solid2d
int layer = 1; int layer = 1;
string name = MAT_DEFAULT; string name = MAT_DEFAULT;
double maxh = MAXH_DEFAULT;
Solid2d() = default; Solid2d() = default;
Solid2d(string name_) : name(name_) {} Solid2d(string name_) : name(name_) {}
@ -697,6 +698,7 @@ struct Solid2d
Solid2d & Maxh(double maxh) Solid2d & Maxh(double maxh)
{ {
this->maxh = maxh;
for(auto & p : polys) for(auto & p : polys)
for(auto v : p.Vertices(ALL)) for(auto v : p.Vertices(ALL))
v->info.maxh = maxh; v->info.maxh = maxh;