Merge pull request #93 from 'wence/zany-element-degrees'

* wence/zany-element-degrees:
  Use valid degrees in tests for Argyris/Morley
  Don't accept None as degree for Argyris etc...
  Register Bell, whitespace for Argyris
  Fix for Argyris -- 5th order on triangles only
  Accept 2 as valid degree for Morley
  WIP: accept all degrees 3 or greater for Hermite

test/test_sobolevspace.py

@@ -119,8 +119,8 @@ def test_contains_h1():
 
 def test_contains_h2():
     h2_elements = [
-        FiniteElement("ARG", triangle, 1),
-        FiniteElement("MOR", triangle),
+        FiniteElement("ARG", triangle, 5),
+        FiniteElement("MOR", triangle, 2),
     ]
     for h2_element in h2_elements:
         assert h2_element in H2
@@ -235,7 +235,7 @@ def test_varying_continuity_elements():
     P2 = FiniteElement("CG", interval, 2)
     P3 = FiniteElement("CG", interval, 3)
     RT1 = FiniteElement("RT", triangle, 1)
-    ARG = FiniteElement("ARG", triangle, 1)
+    ARG = FiniteElement("ARG", triangle, 5)
 
     # Tensor product elements
     P1DGP2 = TensorProductElement(P1DG_t, P2)

ufl/finiteelement/elementlist.py

@@ -125,19 +125,20 @@ def show_elements():
                  (1, None), simplices[1:])   # "RTF"  (2d), "N1F" (3d)
 
 # Elements not in the periodic table
-register_element("Argyris", "ARG", 0, H2, "identity", (1, None), simplices[1:])
+register_element("Argyris", "ARG", 0, H2, "identity", (5, 5), ("triangle",))
 register_element("Arnold-Winther", "AW", 0, H1, "identity", None, ("triangle",))
+register_element("Bell", "BELL", 0, H2, "identity", (5, 5), ("triangle",))
 register_element("Brezzi-Douglas-Fortin-Marini", "BDFM", 1, HDiv,
                  "contravariant Piola", (1, None), simplices[1:])
 register_element("Crouzeix-Raviart", "CR", 0, L2, "identity", (1, 1),
                  simplices[1:])
 # TODO: Implement generic Tear operator for elements instead of this:
 register_element("Discontinuous Raviart-Thomas", "DRT", 1, L2,
                  "contravariant Piola", (1, None), simplices[1:])
-register_element("Hermite", "HER", 0, H1, "identity", None, simplices[1:])
+register_element("Hermite", "HER", 0, H1, "identity", (3, 3), simplices[1:])
 register_element("Mardal-Tai-Winther", "MTW", 0, H1, "identity", None,
                  ("triangle",))
-register_element("Morley", "MOR", 0, H2, "identity", None, ("triangle",))
+register_element("Morley", "MOR", 0, H2, "identity", (2, 2), ("triangle",))
 
 # Special elements
 register_element("Boundary Quadrature", "BQ", 0, L2, "identity", (0, None),