Merge branch 'remove_tix2' into 'master'

Remove tix2



See merge request !19
This commit is contained in:
Joachim Schöberl 2016-11-17 18:10:41 +01:00
commit 363efee2cb

View File

@ -445,7 +445,20 @@ DLL_HEADER void ExportNetgenMeshing(py::module &m)
.def ("GetMaterial", FunctionPointer([](Mesh & self, int domnr) .def ("GetMaterial", FunctionPointer([](Mesh & self, int domnr)
{ return string(self.GetMaterial(domnr)); })) { return string(self.GetMaterial(domnr)); }))
.def ("GenerateVolumeMesh", .def ("AddPointIdentification", [](Mesh & self, py::object pindex1, py::object pindex2, int identnr, int type)
{
if(py::extract<PointIndex>(pindex1).check() && py::extract<PointIndex>(pindex2).check())
{
self.GetIdentifications().Add (py::extract<PointIndex>(pindex1)(), py::extract<PointIndex>(pindex2)(), identnr);
self.GetIdentifications().SetType(identnr, Identifications::ID_TYPE(type)); // type = 2 ... periodic
}
},
//py::default_call_policies(),
py::arg("pid1"),
py::arg("pid2"),
py::arg("identnr"),
py::arg("type"))
.def ("GenerateVolumeMesh",
[](Mesh & self, py::object pymp) [](Mesh & self, py::object pymp)
{ {
cout << "generate vol mesh" << endl; cout << "generate vol mesh" << endl;