fix modes

Author: alexfikl

modepy/modes.py

@@ -650,13 +650,13 @@ def __call__(self, x):
         return tuple(result)
 
 
-def _product_basis(dims, basis_1d, generate_order):
+def _product_basis(dims, basis_1d, basis_order):
     return tuple(
             _TensorProductBasisFunction(order, [basis_1d[i] for i in order])
-            for order in generate_order(len(basis_1d), dims))
+            for order in basis_order)
 
 
-def _grad_product_basis(dims, basis_1d, grad_basis_1d, generate_order):
+def _grad_product_basis(dims, basis_1d, grad_basis_1d, basis_order):
     from pytools import wandering_element
 
     func = (basis_1d, grad_basis_1d)
@@ -665,7 +665,7 @@ def _grad_product_basis(dims, basis_1d, grad_basis_1d, generate_order):
                 [func[i][k] for i, k in zip(iderivative, order)]
                 for iderivative in wandering_element(dims)
                 ])
-            for order in generate_order(len(basis_1d), dims))
+            for order in basis_order)
 
 
 def tensor_product_basis(dims, basis_1d):
@@ -678,7 +678,9 @@ def tensor_product_basis(dims, basis_1d):
     """
 
     from pytools import generate_nonnegative_integer_tuples_below as gnitb
-    return _product_basis(dims, basis_1d, gnitb)
+    return _product_basis(dims,
+            basis_1d,
+            gnitb(len(basis_1d), dims))
 
 
 def grad_tensor_product_basis(dims, basis_1d, grad_basis_1d):
@@ -692,7 +694,9 @@ def grad_tensor_product_basis(dims, basis_1d, grad_basis_1d):
     """
 
     from pytools import generate_nonnegative_integer_tuples_below as gnitb
-    return _grad_product_basis(dims, basis_1d, grad_basis_1d, gnitb)
+    return _grad_product_basis(dims,
+            basis_1d, grad_basis_1d,
+            gnitb(len(basis_1d), dims))
 
 
 def legendre_tensor_product_basis(dims, order):
@@ -730,7 +734,9 @@ def hypercube_onb(dims, basis_1d):
 
     from pytools import (
             generate_nonnegative_integer_tuples_summing_to_at_most as gnitstam)
-    return _product_basis(dims, basis_1d, gnitstam)
+    return _product_basis(dims,
+            basis_1d,
+            gnitstam(len(basis_1d) - 1, dims))
 
 
 def grad_hypercube_onb(dims, basis_1d, grad_basis_1d):
@@ -745,7 +751,9 @@ def grad_hypercube_onb(dims, basis_1d, grad_basis_1d):
 
     from pytools import (
             generate_nonnegative_integer_tuples_summing_to_at_most as gnitstam)
-    return _grad_product_basis(dims, basis_1d, grad_basis_1d, gnitstam)
+    return _grad_product_basis(dims,
+            basis_1d, grad_basis_1d,
+            gnitstam(len(basis_1d) - 1, dims))
 
 
 def legendre_hypercube_onb(dims, order):