Sminus

Author: pbrubeck

FIAT/Sminus.py

@@ -412,9 +412,8 @@ def __init__(self, ref_el, degree):
         degree = self._parse_degree(degree)
         flat_el = flatten_reference_cube(ref_el)
         dim = flat_el.get_spatial_dimension()
-        if dim != 2:
-            if dim != 3:
-                raise Exception("Trimmed Serendipity_k edge elements only valid for dimensions 2 and 3")
+        if dim not in {2, 3}:
+            raise Exception("Trimmed Serendipity_k edge elements only valid for dimensions 2 and 3")
 
         verts = flat_el.get_vertices()
 
@@ -448,14 +447,9 @@ def __init__(self, ref_el, degree):
             else:
                 IL = ()
 
-        Sminus_list = EL + FL
-        if dim == 3:
-            Sminus_list = Sminus_list + IL
+        Sminus_list = EL + FL + IL
 
-        if dim == 2:
-            self.basis = {(0, 0): Array(Sminus_list)}
-        else:
-            self.basis = {(0, 0, 0): Array(Sminus_list)}
+        self.basis = {(0,)*dim: Array(Sminus_list)}
         super().__init__(ref_el=ref_el, degree=degree, mapping="covariant piola")
 
 
@@ -484,5 +478,5 @@ def __init__(self, ref_el, degree):
 
         Sminus_list = EL + FL
         Sminus_list = [[-a[1], a[0]] for a in Sminus_list]
-        self.basis = {(0, 0): Array(Sminus_list)}
+        self.basis = {(0,)*dim: Array(Sminus_list)}
         super().__init__(ref_el=ref_el, degree=degree, mapping="contravariant piola")

FIAT/SminusCurl.py

@@ -26,10 +26,10 @@ def choose_ijk_total(degree):
 
 
 class TrimmedSerendipityCurl(FiniteElement):
-    def __init__(self, ref_el, degree):
-        if degree < 1:
-            raise Exception("Trimmed serendipity elements only valid for k >= 1")
+    DEFAULT_DEGREE = 1
 
+    def __init__(self, ref_el, degree):
+        degree = self._parse_degree(degree)
         flat_el = flatten_reference_cube(ref_el)
         dim = flat_el.get_spatial_dimension()
         self.fdim = dim

FIAT/SminusDiv.py

@@ -26,10 +26,11 @@ def choose_ijk_total(degree):
 
 
 class TrimmedSerendipityDiv(FiniteElement):
-    def __init__(self, ref_el, degree):
-        if degree < 1:
-            raise Exception("Trimmed serendipity elements only valid for k >= 1")
 
+    DEFAULT_DEGREE = 1
+
+    def __init__(self, ref_el, degree):
+        degree = self._parse_degree(degree)
         flat_el = flatten_reference_cube(ref_el)
         dim = flat_el.get_spatial_dimension()
         self.fdim = dim

FIAT/brezzi_douglas_marini_cube.py

@@ -39,22 +39,19 @@ class BrezziDouglasMariniCube(FiniteElement):
     The Brezzi-Douglas-Marini element on quadrilateral cells.
 
     :arg ref_el: The reference element.
-    :arg k: The degree.
+    :arg degree: The degree.
     :arg mapping: A string giving the Piola mapping.
                   Either 'contravariant Piola' or 'covariant Piola'.
     """
+    DEFAULT_DEGREE = 1
 
     def __init__(self, ref_el, degree, mapping):
-
-        # Check that ref_el and degree are appropriate
-        if degree < 1:
-            raise Exception("BDMc_k elements only valid for k >= 1")
-
+        degree = self._parse_degree(degree)
         flat_el = flatten_reference_cube(ref_el)
         dim = flat_el.get_spatial_dimension()
         self.fdim = dim
         if dim != 2:
-            raise Exception("BDMc_k elements only valid for dimension 2")
+            raise Exception(f"{type(self).__name__} only valid for dimension 2")
 
         # Collect the IDs of the reference element entities
         flat_topology = flat_el.get_topology()