Tetgen: expose edgeadjtetlist (Issue #20)

inducer · Aug 7, 2016 · ea4857a · ea4857a
1 parent 5e41124
commit ea4857a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/doc/tri-tet.rst b/doc/tri-tet.rst
@@ -282,6 +282,9 @@ Some common notions
     .. attribute:: face_markers
     .. attribute:: edges
     .. attribute:: edge_markers
+    .. attribute:: edge_adjacent_elements
+
+        .. versionadded:: 2016.1
     .. attribute:: number_of_point_attributes
     .. attribute:: number_of_element_attributes
 

diff --git a/meshpy/gmsh_reader.py b/meshpy/gmsh_reader.py
@@ -1,9 +1,6 @@
 """Reader for the GMSH file format."""
 
-from __future__ import division
-from __future__ import absolute_import
-from six.moves import range
-from functools import reduce
+from __future__ import division, absolute_import
 
 __copyright__ = "Copyright (C) 2009 Xueyu Zhu, Andreas Kloeckner"
 
@@ -27,6 +24,9 @@
 THE SOFTWARE.
 """
 
+from six.moves import range
+from functools import reduce
+
 import numpy as np
 #import numpy.linalg as la
 from pytools import memoize_method, Record
@@ -72,8 +72,9 @@
 Reader
 ------
 
-.. autoclass:: LiteralSource
+.. autoclass:: ScriptSource
 .. autoclass:: FileSource
+.. autoclass:: ScriptWithFilesSource
 
 .. autofunction:: read_gmsh
 .. autofunction:: generate_gmsh

diff --git a/src/cpp/wrap_tetgen.cpp b/src/cpp/wrap_tetgen.cpp
@@ -49,6 +49,7 @@ namespace
 
       tForeignArray<int>                  Edges;
       tForeignArray<int>                  EdgeMarkers;
+      tForeignArray<int>                  EdgeAdjTetList;
 
     public:
       tMeshInfo()
@@ -78,7 +79,8 @@ namespace
           FaceMarkers(trifacemarkerlist, numberoftrifaces, 1, &Faces),
 
           Edges(edgelist, numberofedges, 2),
-          EdgeMarkers(edgemarkerlist, numberofedges, 1, &Edges)
+          EdgeMarkers(edgemarkerlist, numberofedges, 1, &Edges),
+          EdgeAdjTetList(edgeadjtetlist, numberofedges, 1, &Edges)
       {
         Elements.fixUnit(numberofcorners);
       }
@@ -310,6 +312,7 @@ BOOST_PYTHON_MODULE(_tetgen)
 
       .def_readonly("edges", &cl::Edges)
       .def_readonly("edge_markers", &cl::EdgeMarkers)
+      .def_readonly("edge_adjacent_elements", &cl::EdgeAdjTetList)
 
       .add_property("number_of_point_attributes",
           &cl::numberOfPointAttributes,