Merge pull request #202 from firedrakeproject/default_spectral

Default spectral
firedrakeproject · Nov 28, 2019 · e1a2c17 · e1a2c17
2 parents e984c90 + 7abd5e9
commit e1a2c17
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/tests/test_create_fiat_element.py b/tests/test_create_fiat_element.py
@@ -61,9 +61,9 @@ def test_tensor_prod_simple(ufl_A, ufl_B):
 
 
 @pytest.mark.parametrize(('family', 'expected_cls'),
-                         [('P', FIAT.Lagrange),
-                          ('DP', FIAT_DiscontinuousLagrange),
-                          ('DP L2', FIAT_DiscontinuousLagrange)])
+                         [('P', FIAT.GaussLobattoLegendre),
+                          ('DP', FIAT.GaussLegendre),
+                          ('DP L2', FIAT.GaussLegendre)])
 def test_interval_variant_default(family, expected_cls):
     ufl_element = ufl.FiniteElement(family, ufl.interval, 3)
     assert isinstance(create_element(ufl_element), expected_cls)

diff --git a/tests/test_create_finat_element.py b/tests/test_create_finat_element.py
@@ -69,9 +69,9 @@ def test_tensor_prod_simple(ufl_A, ufl_B):
 
 
 @pytest.mark.parametrize(('family', 'expected_cls'),
-                         [('P', finat.Lagrange),
-                          ('DP', finat.DiscontinuousLagrange),
-                          ('DP L2', finat.DiscontinuousLagrange)])
+                         [('P', finat.GaussLobattoLegendre),
+                          ('DP', finat.GaussLegendre),
+                          ('DP L2', finat.GaussLegendre)])
 def test_interval_variant_default(family, expected_cls):
     ufl_element = ufl.FiniteElement(family, ufl.interval, 3)
     assert isinstance(create_element(ufl_element), expected_cls)

diff --git a/tsfc/fiatinterface.py b/tsfc/fiatinterface.py
@@ -128,7 +128,7 @@ def convert_finiteelement(element, vector_is_mixed):
 
     kind = element.variant()
     if kind is None:
-        kind = 'equispaced'  # default variant
+        kind = 'spectral' if element.cell().cellname() == 'interval' else 'equispaced'  # default variant
 
     if element.family() == "Lagrange":
         if kind == 'equispaced':

diff --git a/tsfc/finatinterface.py b/tsfc/finatinterface.py
@@ -128,7 +128,7 @@ def convert_finiteelement(element, **kwargs):
 
     kind = element.variant()
     if kind is None:
-        kind = 'equispaced'  # default variant
+        kind = 'spectral' if element.cell().cellname() == 'interval' else 'equispaced'  # default variant
 
     if element.family() == "Lagrange":
         if kind == 'equispaced':
@@ -144,7 +144,6 @@ def convert_finiteelement(element, **kwargs):
         else:
             raise ValueError("Variant %r not supported on %s" % (kind, element.cell()))
     elif element.family() in ["Discontinuous Lagrange", "Discontinuous Lagrange L2"]:
-        kind = element.variant() or 'equispaced'
         if kind == 'equispaced':
             lmbda = finat.DiscontinuousLagrange
         elif kind == 'spectral' and element.cell().cellname() == 'interval':