diff --git a/src/wrap_tetgen.cpp b/src/wrap_tetgen.cpp index 4bc31c84665f3391884e5e20012b75409842c54f..83334442e729c430266744161139db9896382b2c 100644 --- a/src/wrap_tetgen.cpp +++ b/src/wrap_tetgen.cpp @@ -20,7 +20,7 @@ struct tMeshDescriptor : public tetgenio, public boost::noncopyable tForeignArray<REAL> Points; // in/out tForeignArray<REAL> PointAttributes; // in/out tForeignArray<REAL> AdditionalPoints; // out - tForeignArray<REAL> AdditionalPointAttributs; // out + tForeignArray<REAL> AdditionalPointAttributes; // out tForeignArray<int> PointMarkers; // in/out tForeignArray<int> Elements; // in/out @@ -32,21 +32,21 @@ struct tMeshDescriptor : public tetgenio, public boost::noncopyable public: tMeshDescriptor() - : Points("Points", pointlist, numberofpoints, 3), - PointAttributes("PointAttributes", pointattributelist, numberofpoints, 0, &Points), - AdditionalPoints("AdditionalPoints", addpointlist, numberofaddpoints, 3), - PointAttributes("AdditionalPointAttributes", addpointattributelist, numberofaddpoints, 0, &AdditionalPoints), - PointMarkers("PointMarkers", pointmarkerlist, numberofpoints, 1, &Points), - - Elements("Elements", tetrahedronlist, numberoftetrahedra, 4), - ElementAttributes("ElementAttributes", tetrahedronattributelist, + : Points("points", pointlist, numberofpoints, 3), + PointAttributes("point_attributes", pointattributelist, numberofpoints, 0, &Points), + AdditionalPoints("additional_points", addpointlist, numberofaddpoints, 3), + AdditionalPointAttributes("additional_point_attributes", addpointattributelist, numberofaddpoints, 0, &AdditionalPoints), + PointMarkers("point_markers", pointmarkerlist, numberofpoints, 1, &Points), + + Elements("elements", tetrahedronlist, numberoftetrahedra, 4), + ElementAttributes("element_attributes", tetrahedronattributelist, numberoftetrahedra, 0, &Elements), - ElementVolumes("ElementVolumes", tetrahedronvolumelist, + ElementVolumes("element_volumes", tetrahedronvolumelist, numberoftetrahedra, 1, &Elements), - Neighbors("Neighbors", neighborlist, + Neighbors("neighbors", neighborlist, numberoftetrahedra, 4, &Elements), - Facets("Facets", facetlist, numberoffacets) + Facets("facets", facetlist, numberoffacets) /* Segments("Segments", segmentlist, numberofsegments, 2), @@ -177,6 +177,8 @@ BOOST_PYTHON_MODULE(internals) .def_readonly("points", &cl::Points) .def_readonly("point_attributes", &cl::PointAttributes) .def_readonly("point_markers", &cl::PointMarkers) + .def_readonly("additional_points", &cl::AdditionalPoints) + .def_readonly("additional_point_attributes", &cl::AdditionalPointAttributes) .def_readonly("elements", &cl::Elements) .def_readonly("element_attributes", &cl::ElementAttributes) @@ -211,6 +213,12 @@ BOOST_PYTHON_MODULE(internals) //.enable_pickling() ; } + { + typedef tetgenio::facet cl; + class_<cl, boost::noncopyable> + ("Facet", no_init) + ; + } exposeForeignArray(REAL(), "RealArray"); exposeForeignArray(int(), "IntArray");