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

Merge branch 'unifysamedomain' into 'master'

Browse Source 
Always call UnifySameDomain on + operator not only in 2D

See merge request jschoeberl/netgen!429
This commit is contained in:
Joachim Schöberl 2021-10-05 14:14:48 +00:00
commit 98d5c8a8aa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/occ/python_occ_shapes.cpp
View File

@ -942,13 +942,13 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
// make one face when fusing in 2D
// from https://gitlab.onelab.info/gmsh/gmsh/-/issues/627
int cntsolid = 0;
for (TopExp_Explorer e(shape1, TopAbs_SOLID); e.More(); e.Next())
cntsolid++;
for (TopExp_Explorer e(shape2, TopAbs_SOLID); e.More(); e.Next())
cntsolid++;
if (cntsolid == 0)
{
// int cntsolid = 0;
// for (TopExp_Explorer e(shape1, TopAbs_SOLID); e.More(); e.Next())
// cntsolid++;
// for (TopExp_Explorer e(shape2, TopAbs_SOLID); e.More(); e.Next())
// cntsolid++;
// if (cntsolid == 0)
// {
ShapeUpgrade_UnifySameDomain unify(fused, true, true, true);
unify.Build();
@ -966,9 +966,9 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
// PropagateProperties (unify, fused);
return unify.Shape();
}
else
return fused;
// }
// else
// return fused;
}, "fuses shapes")
.def("__radd__", [] (const TopoDS_Shape & shape, int i) // for sum([shapes])
{ return shape; }, "needed for Sum([shapes])")