occ: setting boundary conditions, and propagating it through intersection

This commit is contained in:
Joachim Schoeberl 2021-07-25 22:16:21 +02:00
parent 62217b7db6
commit f3caa7182a
3 changed files with 134 additions and 2 deletions

View File

@ -40,12 +40,45 @@
namespace netgen namespace netgen
{ {
std::map<Handle(TopoDS_TShape), string> OCCGeometry::global_shape_names;
OCCGeometry::OCCGeometry(const TopoDS_Shape& _shape) OCCGeometry::OCCGeometry(const TopoDS_Shape& _shape)
{ {
shape = _shape; shape = _shape;
changed = true; changed = true;
BuildFMap(); BuildFMap();
CalcBoundingBox(); CalcBoundingBox();
TopExp_Explorer e;
for (e.Init(shape, TopAbs_SOLID); e.More(); e.Next())
{
TopoDS_Solid solid = TopoDS::Solid(e.Current());
string name = global_shape_names[solid.TShape()];
if (name == "")
name = string("domain_") + ToString(snames.Size());
snames.Append(name);
}
for (e.Init(shape, TopAbs_FACE); e.More(); e.Next())
{
TopoDS_Face face = TopoDS::Face(e.Current());
string name = global_shape_names[face.TShape()];
if (name == "")
name = string("bc_") + ToString(fnames.Size());
fnames.Append(name);
/*
for (exp1.Init(face, TopAbs_EDGE); exp1.More(); exp1.Next())
{
TopoDS_Edge edge = TopoDS::Edge(exp1.Current());
// name = STEP_GetEntityName(edge,&reader);
// cout << "getname = " << name << ", mapname = " << shape_names[edge.TShape()] << endl;
name = shape_names[edge.TShape()];
occgeo->enames.Append(name);
}
*/
}
} }
string STEP_GetEntityName(const TopoDS_Shape & theShape, STEPCAFControl_Reader * aReader) string STEP_GetEntityName(const TopoDS_Shape & theShape, STEPCAFControl_Reader * aReader)

View File

@ -201,6 +201,8 @@ namespace netgen
OCCParameters occparam; OCCParameters occparam;
public: public:
static std::map<Handle(TopoDS_TShape), string> global_shape_names;
TopoDS_Shape shape; TopoDS_Shape shape;
TopTools_IndexedMapOfShape fmap, emap, vmap, somap, shmap, wmap; TopTools_IndexedMapOfShape fmap, emap, vmap, somap, shmap, wmap;
NgArray<bool> fsingular, esingular, vsingular; NgArray<bool> fsingular, esingular, vsingular;

View File

@ -16,7 +16,9 @@
#include <BRepAlgoAPI_Cut.hxx> #include <BRepAlgoAPI_Cut.hxx>
#include <BRepAlgoAPI_Common.hxx> #include <BRepAlgoAPI_Common.hxx>
#include <BRepAlgoAPI_Fuse.hxx> #include <BRepAlgoAPI_Fuse.hxx>
#include <XCAFDoc_VisMaterialTool.hxx>
#include <TDF_Attribute.hxx>
#include <Standard_GUID.hxx>
using namespace netgen; using namespace netgen;
@ -286,13 +288,49 @@ DLL_HEADER void ExportNgOCC(py::module &m)
sub.append(e.Current()); sub.append(e.Current());
return sub; return sub;
}) })
.def("bc", [](const TopoDS_Shape & shape, const string & name)
{
TopExp_Explorer e;
for (e.Init(shape, TopAbs_FACE); e.More(); e.Next())
OCCGeometry::global_shape_names[e.Current().TShape()] = name;
return shape;
})
.def("__add__", [] (const TopoDS_Shape & shape1, const TopoDS_Shape & shape2) { .def("__add__", [] (const TopoDS_Shape & shape1, const TopoDS_Shape & shape2) {
return BRepAlgoAPI_Fuse(shape1, shape2).Shape(); return BRepAlgoAPI_Fuse(shape1, shape2).Shape();
}) })
.def("__mul__", [] (const TopoDS_Shape & shape1, const TopoDS_Shape & shape2) { .def("__mul__", [] (const TopoDS_Shape & shape1, const TopoDS_Shape & shape2) {
return BRepAlgoAPI_Common(shape1, shape2).Shape(); // return BRepAlgoAPI_Common(shape1, shape2).Shape();
BRepAlgoAPI_Common builder(shape1, shape2);
Handle(BRepTools_History) history = builder.History ();
/*
// work in progress ...
TopTools_ListOfShape modlist = history->Modified(shape1);
for (auto s : modlist)
cout << "modified from list el: " << s.ShapeType() << endl;
*/
for (TopExp_Explorer e(shape1, TopAbs_FACE); e.More(); e.Next())
{
const string & name = OCCGeometry::global_shape_names[e.Current().TShape()];
TopTools_ListOfShape modlist = history->Modified(e.Current());
for (auto s : modlist)
OCCGeometry::global_shape_names[s.TShape()] = name;
}
for (TopExp_Explorer e(shape2, TopAbs_FACE); e.More(); e.Next())
{
const string & name = OCCGeometry::global_shape_names[e.Current().TShape()];
TopTools_ListOfShape modlist = history->Modified(e.Current());
for (auto s : modlist)
OCCGeometry::global_shape_names[s.TShape()] = name;
}
return builder.Shape();
}) })
.def("__sub__", [] (const TopoDS_Shape & shape1, const TopoDS_Shape & shape2) { .def("__sub__", [] (const TopoDS_Shape & shape1, const TopoDS_Shape & shape2) {
@ -322,6 +360,65 @@ DLL_HEADER void ExportNgOCC(py::module &m)
ng_geometry = shared_ptr<OCCGeometry>(instance, NOOP_Deleter); ng_geometry = shared_ptr<OCCGeometry>(instance, NOOP_Deleter);
return ng_geometry; return ng_geometry;
},py::call_guard<py::gil_scoped_release>()); },py::call_guard<py::gil_scoped_release>());
m.def("TestXCAF", [] (TopoDS_Shape shape) {
/*static*/ Handle(XCAFApp_Application) app = XCAFApp_Application::GetApplication();
cout << endl << endl << endl;
cout << "app = " << *reinterpret_cast<void**>(&app) << endl;
Handle(TDocStd_Document) doc;
cout << "nbdocs = " << app->NbDocuments() << endl;
if(app->NbDocuments() > 0)
{
app->GetDocument(1,doc);
// app->Close(doc);
}
else
app->NewDocument ("STEP-XCAF",doc);
Handle(XCAFDoc_ShapeTool) shape_tool = XCAFDoc_DocumentTool::ShapeTool(doc->Main());
Handle(XCAFDoc_MaterialTool) material_tool = XCAFDoc_DocumentTool::MaterialTool(doc->Main());
Handle(XCAFDoc_VisMaterialTool) vismaterial_tool = XCAFDoc_DocumentTool::VisMaterialTool(doc->Main());
cout << "handle(shape) = " << *(void**)(void*)(&(shape.TShape())) << endl;
TDF_LabelSequence doc_shapes;
shape_tool->GetShapes(doc_shapes);
cout << "shape tool nbentities: " << doc_shapes.Size() << endl;
TDF_Label label = shape_tool -> FindShape(shape);
cout << "shape label = " << endl << label << endl;
if (label.IsNull()) return;
cout << "nbattr = " << label.NbAttributes() << endl;
if (!label.IsNull())
{
Handle(TDF_Attribute) attribute;
cout << "create guid" << endl;
// Standard_GUID guid("c4ef4200-568f-11d1-8940-080009dc3333");
Standard_GUID guid("2a96b608-ec8b-11d0-bee7-080009dc3333");
cout << "have guid" << endl;
cout << "find attrib " << label.FindAttribute(guid, attribute) << endl;
cout << "attrib = " << attribute << endl;
cout << "tag = " << label.Tag() << endl;
cout << "father.tag = " << label.Father().Tag() << endl;
cout << "Data = " << label.Data() << endl;
cout << "nbchild = " << label.NbChildren() << endl;
for (auto i : Range(label.NbChildren()))
{
TDF_Label child = label.FindChild(i+1);
cout << "child[" << i << "] = " << child << endl;
cout << "find attrib " << child.FindAttribute(guid, attribute) << endl;
cout << "attrib = " << attribute << endl;
}
// cout << "findshape = " << shape_tool -> FindShape(shape) << endl;
cout << "IsMaterial = " << material_tool->IsMaterial(label) << endl;
cout << "IsVisMaterial = " << vismaterial_tool->IsMaterial(label) << endl;
}
}, py::arg("shape")=TopoDS_Shape());
} }
PYBIND11_MODULE(libNgOCC, m) { PYBIND11_MODULE(libNgOCC, m) {