implement more degrees

mscroggs · Sep 26, 2024 · b5c5c87 · b5c5c87
1 parent a2d6654
commit b5c5c87
Show file tree

Hide file tree

Showing 38 changed files with 310 additions and 286 deletions.
diff --git a/symfem/elements/alfeld_sorokina.py b/symfem/elements/alfeld_sorokina.py
@@ -127,23 +127,24 @@ def __init__(self, reference: Reference, order: int):
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        raise NotImplementedError()
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        raise NotImplementedError()
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        raise NotImplementedError()
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        raise NotImplementedError()
 
     names = ["Alfeld-Sorokina", "AS"]
     references = ["triangle"]
     min_order = 2
     max_order = 2
     continuity = "C0"
+    value_type = "scalar macro"
     last_updated = "2023.05"
diff --git a/symfem/elements/bddm.py b/symfem/elements/bddm.py
@@ -80,22 +80,23 @@ def init_kwargs(self) -> typing.Dict[str, typing.Any]:
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return self.order // 3
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order + 1
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order + 1
 
     names = ["Brezzi-Douglas-Duran-Fortin", "BDDF"]
     references = ["hexahedron"]
     min_order = 1
     continuity = "H(div)"
+    value_type = "vector"
     last_updated = "2023.06"
diff --git a/symfem/elements/bdfm.py b/symfem/elements/bdfm.py
@@ -99,22 +99,26 @@ def init_kwargs(self) -> typing.Dict[str, typing.Any]:
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        if self.reference.name in ["triangle", "tetrahedron"]:
+            return self.order - 1
+        else:
+            return self.order // self.reference.tdim
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order - 1
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order
 
     names = ["Brezzi-Douglas-Fortin-Marini", "BDFM"]
     references = ["triangle", "quadrilateral", "hexahedron", "tetrahedron"]
     min_order = 1
     continuity = "H(div)"
+    value_type = "vector"
     last_updated = "2023.06"
diff --git a/symfem/elements/bdm.py b/symfem/elements/bdm.py
@@ -54,22 +54,23 @@ def init_kwargs(self) -> typing.Dict[str, typing.Any]:
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order
 
     names = ["Brezzi-Douglas-Marini", "BDM", "N2div"]
     references = ["triangle", "tetrahedron"]
     min_order = 1
     continuity = "H(div)"
+    value_type = "vector"
     last_updated = "2023.06"
diff --git a/symfem/elements/bell.py b/symfem/elements/bell.py
@@ -56,23 +56,24 @@ def init_kwargs(self) -> typing.Dict[str, typing.Any]:
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return 4
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return 5
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return 4
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return 5
 
     names = ["Bell"]
     references = ["triangle"]
     min_order = 5
     max_order = 5
     continuity = "C1"
+    value_type = "scalar"
     last_updated = "2023.05"
diff --git a/symfem/elements/bernardi_raugel.py b/symfem/elements/bernardi_raugel.py
@@ -115,28 +115,29 @@ def __init__(self, reference: Reference, order: int):
                         reference, x[i], p.dofs[0], entity=(3, 0), mapping="contravariant"
                     )
                 )
-
         super().__init__(reference, order, poly, dofs, reference.tdim, reference.tdim)
+        print(poly, self.lagrange_superdegree)
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order + self.reference.tdim - 1
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order + self.reference.tdim - 1
 
     names = ["Bernardi-Raugel"]
     references = ["triangle", "tetrahedron"]
     min_order = 1
     max_order = {"triangle": 1, "tetrahedron": 2}
     continuity = "H(div)"
+    value_type = "vector"
     last_updated = "2023.06"
diff --git a/symfem/elements/bernstein.py b/symfem/elements/bernstein.py
@@ -236,22 +236,23 @@ def index(x: int, y: int = 0, z: int = 0) -> int:
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order
 
     names = ["Bernstein", "Bernstein-Bezier"]
     references = ["interval", "triangle", "tetrahedron"]
     min_order = 0
     continuity = "C0"
+    value_type = "scalar"
     last_updated = "2023.05"
diff --git a/symfem/elements/bfs.py b/symfem/elements/bfs.py
@@ -52,24 +52,25 @@ def __init__(self, reference: Reference, order: int):
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order * 2
 
     names = ["Bogner-Fox-Schmit", "BFS"]
     references = ["quadrilateral"]
     min_order = 3
     max_order = 3
     continuity = "C0"
     # continuity = "C1"
+    value_type = "scalar"
     last_updated = "2023.05"
diff --git a/symfem/elements/bubble.py b/symfem/elements/bubble.py
@@ -13,6 +13,7 @@
 from symfem.functionals import DotPointEvaluation, ListOfFunctionals, PointEvaluation
 from symfem.functions import FunctionInput
 from symfem.references import Reference
+from symfem.symbols import x
 from symfem.elements.lagrange import Lagrange
 
 __all__ = ["Bubble", "BubbleEnrichedLagrange", "BubbleEnrichedVectorLagrange"]
@@ -33,8 +34,12 @@ def __init__(self, reference: Reference, order: int, variant: str = "equispaced"
 
         p1 = create_element(reference.name, "Lagrange", 1, vertices=reference.vertices)
         bubble = 1
-        for f in p1.get_basis_functions():
-            bubble *= f
+        if reference.name in ["interval", "quadrilateral", "hexahedron"]:
+            for v in x[:reference.tdim]:
+                bubble *= v * (1 - v)
+        else:
+            for f in p1.get_basis_functions():
+                bubble *= f
 
         if reference.name in ["interval", "quadrilateral", "hexahedron"]:
             o = order - 2
@@ -80,19 +85,21 @@ def init_kwargs(self) -> typing.Dict[str, typing.Any]:
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return -1
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return -1
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        if self.reference.name in ["quadrilateral", "hexahedron"]:
+            return self.order * self.reference.tdim
+        return self.order
 
     names = ["bubble"]
     references = ["interval", "triangle", "tetrahedron", "quadrilateral", "hexahedron"]
@@ -104,6 +111,7 @@ def polynomial_superdegree(self) -> typing.Optional[int]:
         "hexahedron": 2,
     }
     continuity = "C0"
+    value_type = "scalar"
     last_updated = "2023.09"
 
 
@@ -140,24 +148,25 @@ def init_kwargs(self) -> typing.Dict[str, typing.Any]:
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order + 2
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order + 2
 
     names = ["bubble enriched Lagrange"]
     references = ["triangle"]
     min_order = 1
     continuity = "C0"
+    value_type = "scalar"
     last_updated = "2023.09"
 
 
@@ -201,22 +210,23 @@ def init_kwargs(self) -> typing.Dict[str, typing.Any]:
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order + 2
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        return self.order + 2
 
     names = ["bubble enriched vector Lagrange"]
     references = ["triangle"]
     min_order = 1
     continuity = "C0"
+    value_type = "vector"
     last_updated = "2023.09"
diff --git a/symfem/elements/conforming_crouzeix_raviart.py b/symfem/elements/conforming_crouzeix_raviart.py
@@ -60,22 +60,27 @@ def __init__(self, reference: Reference, order: int):
 
     @property
     def lagrange_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def lagrange_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        if self.order == 1:
+            return 1
+        return self.order + 1
 
     @property
     def polynomial_subdegree(self) -> int:
-        pass  # TODO
+        return self.order
 
     @property
     def polynomial_superdegree(self) -> typing.Optional[int]:
-        pass  # TODO
+        if self.order == 1:
+            return 1
+        return self.order + 1
 
     names = ["conforming Crouzeix-Raviart", "conforming CR"]
     references = ["triangle"]
     min_order = 1
     continuity = "L2"
+    value_type = "scalar"
     last_updated = "2023.05"