inducer · inducer · Dec 11, 2020 · Nov 3, 2020 · Nov 4, 2020 · Nov 4, 2020
diff --git a/doc/index.rst b/doc/index.rst
@@ -42,6 +42,7 @@ Contents
 .. toctree::
     :maxdepth: 2
 
+    shapes
     modes
     nodes
     quadrature

diff --git a/doc/modes.rst b/doc/modes.rst
@@ -1,4 +1,6 @@
 Modes (Basis functions)
 =======================
 
+.. automodule:: modepy.spaces
+
 .. automodule:: modepy.modes
diff --git a/doc/nodes.rst b/doc/nodes.rst
@@ -1,106 +1,4 @@
 Interpolation Nodes
 ===================
 
-Coordinate systems on simplices
--------------------------------
-
-.. _tri-coords:
-
-Coordinates on the triangle
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Unit coordinates :math:`(r,s)`::
-
-    C
-    |\
-    | \
-    |  O
-    |   \
-    |    \
-    A-----B
-
-Vertices in unit coordinates::
-
-    O = (0,0)
-    A = (-1,-1)
-    B = (1,-1)
-    C = (-1,1)
-
-Equilateral coordinates :math:`(x,y)`::
-
-          C
-         / \
-        /   \
-       /     \
-      /   O   \
-     /         \
-    A-----------B
-
-Vertices in equilateral coordinates::
-
-    O = (0,0)
-    A = (-1,-1/sqrt(3))
-    B = (1,-1/sqrt(3))
-    C = (0,2/sqrt(3))
-
-.. _tet-coords:
-
-Coordinates on the tetrahedron
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Unit coordinates :math:`(r,s,t)`::
-
-               ^ s
-               |
-               C
-              /|\
-             / | \
-            /  |  \
-           /   |   \
-          /   O|    \
-         /   __A-----B---> r
-        /_--^ ___--^^
-       ,D--^^^
-    t L
-
-(squint, and it might start making sense...)
-
-Vertices in unit coordinates::
-
-    O=( 0, 0, 0)
-    A=(-1,-1,-1)
-    B=(+1,-1,-1)
-    C=(-1,+1,-1)
-    D=(-1,-1,+1)
-
-Vertices in equilateral coordinates :math:`(x,y,z)`::
-
-    O = (0,0,0)
-    A = (-1,-1/sqrt(3),-1/sqrt(6))
-    B = ( 1,-1/sqrt(3),-1/sqrt(6))
-    C = ( 0, 2/sqrt(3),-1/sqrt(6))
-    D = ( 0,         0, 3/sqrt(6))
-
-Transformations between coordinate systems
-------------------------------------------
-
-.. currentmodule:: modepy.tools
-
-All of these expect and return arrays of shape *(dims, npts)*.
-
-.. autofunction:: equilateral_to_unit
-.. autofunction:: barycentric_to_unit
-.. autofunction:: unit_to_barycentric
-.. autofunction:: barycentric_to_equilateral
-
-Node sets for interpolation
----------------------------
-
-.. currentmodule:: modepy
-
-.. autofunction:: equidistant_nodes
-.. autofunction:: warp_and_blend_nodes
-.. autofunction:: tensor_product_nodes
-
-Also see :class:`modepy.VioreanuRokhlinSimplexQuadrature` if nodes on the
-boundary are not required.
+.. automodule:: modepy.nodes
diff --git a/doc/quadrature.rst b/doc/quadrature.rst
@@ -6,10 +6,6 @@ Base classes
 
 .. automodule:: modepy.quadrature
 
-.. currentmodule:: modepy
-
-.. autoclass:: Quadrature
-
 Jacobi-Gauss quadrature in one dimension
 ----------------------------------------
 
@@ -55,4 +51,15 @@ Quadratures on the simplex
 
 .. autoclass:: VioreanuRokhlinSimplexQuadrature
 
+
+Quadratures on the hypercube
+----------------------------
+
+.. currentmodule:: modepy
+
+.. autoclass:: WitherdenVincentQuadrature
+
+.. autoclass:: TensorProductQuadrature
+.. autoclass:: LegendreGaussTensorProductQuadrature
+
 .. vim: sw=4
diff --git a/doc/shapes.rst b/doc/shapes.rst
@@ -0,0 +1,4 @@
+Shapes
+======
+
+.. automodule:: modepy.shapes
diff --git a/doc/tools.rst b/doc/tools.rst
@@ -24,11 +24,6 @@ Modal decay/residual
 
 .. automodule:: modepy.modal_decay
 
-Interpolation quality
----------------------
-
-.. currentmodule:: modepy.tools
-
-.. autofunction:: estimate_lebesgue_constant
+.. automodule:: modepy.tools
 
 .. vim: sw=4
diff --git a/modepy/__init__.py b/modepy/__init__.py
@@ -22,26 +22,47 @@
 """
 
 
+from modepy.shapes import (
+        Shape, Face, Simplex, Hypercube,
+
+        biunit_vertices_for_shape, faces_for_shape,
+        submesh_for_shape,
+        )
+from modepy.spaces import (
+        FunctionSpace, PN, QN, space_for_shape)
 from modepy.modes import (
         jacobi, grad_jacobi,
         simplex_onb, grad_simplex_onb, simplex_onb_with_mode_ids,
         simplex_monomial_basis, grad_simplex_monomial_basis,
         simplex_monomial_basis_with_mode_ids,
         simplex_best_available_basis, grad_simplex_best_available_basis,
         tensor_product_basis, grad_tensor_product_basis,
-        legendre_tensor_product_basis, grad_legendre_tensor_product_basis)
+        legendre_tensor_product_basis, grad_legendre_tensor_product_basis,
+        symbolicize_function,
+
+        Basis, BasisNotOrthonormal, TensorProductBasis,
+        basis_for_space, orthonormal_basis_for_space, monomial_basis_for_space)
 from modepy.nodes import (
         equidistant_nodes, warp_and_blend_nodes,
-        tensor_product_nodes, legendre_gauss_lobatto_tensor_product_nodes)
+        tensor_product_nodes, legendre_gauss_lobatto_tensor_product_nodes,
+
+        node_tuples_for_space,
+        equispaced_nodes_for_space, edge_clustered_nodes_for_space,
+        random_nodes_for_shape)
 from modepy.matrices import (vandermonde,
         resampling_matrix, differentiation_matrices,
         diff_matrix_permutation,
         inverse_mass_matrix, mass_matrix,
-        modal_face_mass_matrix, nodal_face_mass_matrix)
-from modepy.quadrature import Quadrature, QuadratureRuleUnavailable
+        modal_face_mass_matrix, nodal_face_mass_matrix,
+        modal_mass_matrix_for_face, nodal_mass_matrix_for_face)
+from modepy.quadrature import (
+        Quadrature, QuadratureRuleUnavailable,
+        TensorProductQuadrature, LegendreGaussTensorProductQuadrature,
+        quadrature_for_space)
 from modepy.quadrature.jacobi_gauss import (
         JacobiGaussQuadrature, LegendreGaussQuadrature, ChebyshevGaussQuadrature,
-        GaussGegenbauerQuadrature)
+        GaussGegenbauerQuadrature,
+        )
 from modepy.quadrature.xiao_gimbutas import XiaoGimbutasSimplexQuadrature
 from modepy.quadrature.vioreanu_rokhlin import VioreanuRokhlinSimplexQuadrature
 from modepy.quadrature.grundmann_moeller import GrundmannMoellerSimplexQuadrature
@@ -56,29 +77,47 @@
 __all__ = [
         "__version__",
 
+        "Shape", "Face", "Simplex", "Hypercube",
+        "biunit_vertices_for_shape", "faces_for_shape",
+        "submesh_for_shape",
+
+        "FunctionSpace", "PN", "QN", "space_for_shape",
+
         "jacobi", "grad_jacobi",
         "simplex_onb", "grad_simplex_onb", "simplex_onb_with_mode_ids",
         "simplex_monomial_basis", "grad_simplex_monomial_basis",
         "simplex_monomial_basis_with_mode_ids",
         "simplex_best_available_basis", "grad_simplex_best_available_basis",
         "tensor_product_basis", "grad_tensor_product_basis",
         "legendre_tensor_product_basis", "grad_legendre_tensor_product_basis",
+        "symbolicize_function",
+
+        "Basis", "BasisNotOrthonormal", "TensorProductBasis",
+        "basis_for_space", "orthonormal_basis_for_space", "monomial_basis_for_space",
 
         "equidistant_nodes", "warp_and_blend_nodes",
         "tensor_product_nodes", "legendre_gauss_lobatto_tensor_product_nodes",
+        "node_tuples_for_space",
+        "edge_clustered_nodes_for_space", "equispaced_nodes_for_space",
+        "random_nodes_for_shape",
 
         "vandermonde", "resampling_matrix", "differentiation_matrices",
         "diff_matrix_permutation",
-        "inverse_mass_matrix", "mass_matrix", "modal_face_mass_matrix",
-        "nodal_face_mass_matrix",
+        "inverse_mass_matrix", "mass_matrix",
+        "modal_face_mass_matrix", "nodal_face_mass_matrix",
+        "modal_mass_matrix_for_face", "nodal_mass_matrix_for_face",
 
         "Quadrature", "QuadratureRuleUnavailable",
+        "TensorProductQuadrature", "LegendreGaussTensorProductQuadrature",
+        "quadrature_for_space",
+
         "JacobiGaussQuadrature", "LegendreGaussQuadrature",
         "GaussLegendreQuadrature", "ChebyshevGaussQuadrature",
         "GaussGegenbauerQuadrature",
         "XiaoGimbutasSimplexQuadrature", "GrundmannMoellerSimplexQuadrature",
         "VioreanuRokhlinSimplexQuadrature",
         "ClenshawCurtisQuadrature", "FejerQuadrature",
+
         "WitherdenVincentQuadrature",
         ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ Contents @@
     .. toctree::
         :maxdepth: 2
+        shapes
         modes
         nodes
         quadrature
@@ Expand Down @@