Merge pull request #645 from kinnala/add-element-tet-dg

Add ElementTetDG

README.md

@@ -215,6 +215,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added: `utils.penalize`, an alternative to `condense` and `enforce` for
   essential boundary conditions
 - Added: `InteriorBasis.point_source`, with `ex38`
+- Added: `ElementTetDG`, similar to `ElementTriDG` for tetrahedral meshes
 - Fixed: `MeshLine1.element_finder` 
 
 ### [3.0.0] - 2021-04-19

skfem/element/__init__.py

@@ -23,7 +23,7 @@
                            ElementQuadBFS)
 from .element_tet import (ElementTetP0, ElementTetP1, ElementTetP2,
                           ElementTetRT0, ElementTetN0, ElementTetMini,
-                          ElementTetCR)
+                          ElementTetCR, ElementTetDG)
 from .element_hex import (ElementHex0, ElementHex1, ElementHex2,
                           ElementHexS2)  # noqa
 from .element_line import (ElementLineP0, ElementLineP1, ElementLineP2,
@@ -84,6 +84,7 @@
     "ElementTetN0",
     "ElementTetMini",
     "ElementTetCR",
+    "ElementTetDG",
     "ElementHex0",
     "ElementHex1",
     "ElementHex2",

skfem/element/element_tet/__init__.py

@@ -5,3 +5,4 @@
 from .element_tet_n0 import ElementTetN0  # noqa
 from .element_tet_mini import ElementTetMini  # noqa
 from .element_tet_cr import ElementTetCR  # noqa
+from .element_tet_dg import ElementTetDG  # noqa

skfem/element/element_tet/element_tet_dg.py

@@ -0,0 +1,21 @@
+from ..element import Element
+from ...refdom import RefTet
+
+
+class ElementTetDG(Element):
+
+    refdom = RefTet
+
+    def __init__(self, elem):
+        # change all dofs to interior dofs
+        self.elem = elem
+        self.maxdeg = elem.maxdeg
+        self.interior_dofs = (4 * elem.nodal_dofs +
+                              4 * elem.facet_dofs +
+                              6 * elem.edge_dofs +
+                              elem.interior_dofs)
+        self.dofnames = elem.dofnames
+        self.doflocs = elem.doflocs
+
+    def gbasis(self, *args, **kwargs):
+        return self.elem.gbasis(*args, **kwargs)

tests/test_elements.py

@@ -13,7 +13,8 @@
                            ElementTriP1, ElementTriP2, ElementTriRT0,
                            ElementVectorH1, ElementHex2, ElementQuadBFS,
                            ElementTriCR, ElementTetCR, ElementTriHermite,
-                           ElementTriMorley, ElementTriArgyris, ElementTriDG)
+                           ElementTriMorley, ElementTriArgyris, ElementTriDG,
+                           ElementTetDG)
 from skfem.mesh import MeshHex, MeshLine, MeshQuad, MeshTet, MeshTri
 from skfem.assembly import InteriorBasis, Functional
 from skfem.mapping import MappingAffine
@@ -275,18 +276,20 @@ def test_throw_index_error(self):
 
 
 @pytest.mark.parametrize(
-    "e",
+    "m,e,edg",
     [
-        ElementTriP1(),
-        ElementTriArgyris(),
-        ElementTriMorley(),
-        ElementTriHermite(),
+        (MeshTri().refined(), ElementTriP1(), ElementTriDG),
+        (MeshTri().refined(), ElementTriP2(), ElementTriDG),
+        (MeshTet().refined(), ElementTetP1(), ElementTetDG),
+        (MeshTet().refined(), ElementTetP2(), ElementTetDG),
+        (MeshTri().refined(), ElementTriArgyris(), ElementTriDG),
+        (MeshTri().refined(), ElementTriMorley(), ElementTriDG),
+        (MeshTri().refined(), ElementTriHermite(), ElementTriDG),
     ]
 )
-def test_dg_element(e):
+def test_dg_element(m, e, edg):
 
-    m = MeshTri().refined()
-    edg = ElementTriDG(e)
+    edg = edg(e)
 
     @Functional
     def square(w):