Merge branch 'curve_in_hpref' into 'master'

Curve new elements in HPRefinement

See merge request jschoeberl/netgen!311
This commit is contained in:
Joachim Schöberl 2020-02-12 12:54:27 +00:00
commit 5f16e04d33
2 changed files with 5 additions and 1 deletions

View File

@ -1407,6 +1407,8 @@ namespace netgen
el.SetIndex(hpel.index); el.SetIndex(hpel.index);
if(setorders) if(setorders)
el.SetOrder(act_ref+1,act_ref+1,0); el.SetOrder(act_ref+1,act_ref+1,0);
if((*mesh.coarsemesh)[SurfaceElementIndex{hpel.coarse_elnr}].IsCurved())
el.SetCurved(true);
mesh.AddSurfaceElement(el); mesh.AddSurfaceElement(el);
break; break;
} }
@ -1422,6 +1424,8 @@ namespace netgen
el.hp_elnr = i; el.hp_elnr = i;
if(setorders) if(setorders)
el.SetOrder(act_ref+1,act_ref+1,act_ref+1); el.SetOrder(act_ref+1,act_ref+1,act_ref+1);
if((*mesh.coarsemesh)[ElementIndex{hpel.coarse_elnr}].IsCurved())
el.SetCurved(true);
mesh.AddVolumeElement(el); mesh.AddVolumeElement(el);
break; break;
} }

View File

@ -1651,7 +1651,7 @@ namespace netgen
// NgProfiler::StopTimer(timer1c); // NgProfiler::StopTimer(timer1c);
#else #else
bool curved = curv.IsSurfaceElementCurved(sei); bool curved = (*mesh)[sei].IsCurved();
for (int iy = 0, ii = 0; iy <= n; iy++) for (int iy = 0, ii = 0; iy <= n; iy++)
for (int ix = 0; ix <= n-iy; ix++, ii++) for (int ix = 0; ix <= n-iy; ix++, ii++)