From ebb10c195790f4df8325b01712748e0511b31de6 Mon Sep 17 00:00:00 2001 From: Rob Kirby Date: Thu, 27 Feb 2020 11:19:26 -0600 Subject: [PATCH 1/5] Add trimmed serendipity --- ufl/finiteelement/elementlist.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ufl/finiteelement/elementlist.py b/ufl/finiteelement/elementlist.py index 01cf430d5..73665e4cd 100644 --- a/ufl/finiteelement/elementlist.py +++ b/ufl/finiteelement/elementlist.py @@ -195,6 +195,8 @@ def show_elements(): ("quadrilateral",)) register_element2("BDMCF", 1, HDiv, "contravariant Piola", (1, None), ("quadrilateral",)) +register_element2("SminusE", 0, HCurl, "covariant Piola", (1, None), cubes[1:2]) +register_element2("SminusF", 0, HDiv, "contravariant Piola", (1, None), cubes[1:2]) register_element2("AAE", 1, HCurl, "covariant Piola", (1, None), ("hexahedron",)) register_element2("AAF", 1, HDiv, "contravariant Piola", (1, None), From 3ff2d5040a03d9dd854e591e3ba614783b1d67ba Mon Sep 17 00:00:00 2001 From: Rob Kirby Date: Thu, 27 Feb 2020 12:42:42 -0600 Subject: [PATCH 2/5] Fix value shape for trimmed serendipity --- ufl/finiteelement/elementlist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ufl/finiteelement/elementlist.py b/ufl/finiteelement/elementlist.py index 73665e4cd..0345419bf 100644 --- a/ufl/finiteelement/elementlist.py +++ b/ufl/finiteelement/elementlist.py @@ -195,8 +195,8 @@ def show_elements(): ("quadrilateral",)) register_element2("BDMCF", 1, HDiv, "contravariant Piola", (1, None), ("quadrilateral",)) -register_element2("SminusE", 0, HCurl, "covariant Piola", (1, None), cubes[1:2]) -register_element2("SminusF", 0, HDiv, "contravariant Piola", (1, None), cubes[1:2]) +register_element2("SminusE", 1, HCurl, "covariant Piola", (1, None), cubes[1:2]) +register_element2("SminusF", 1, HDiv, "contravariant Piola", (1, None), cubes[1:2]) register_element2("AAE", 1, HCurl, "covariant Piola", (1, None), ("hexahedron",)) register_element2("AAF", 1, HDiv, "contravariant Piola", (1, None), From c9bb809769ca66742d0427d27e8df0cce21b4adb Mon Sep 17 00:00:00 2001 From: Justincrum Date: Fri, 10 Apr 2020 10:23:34 -0700 Subject: [PATCH 3/5] ufl plumbing update for trimmed serendipity. --- ufl/finiteelement/elementlist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ufl/finiteelement/elementlist.py b/ufl/finiteelement/elementlist.py index 0345419bf..63cb0f29e 100644 --- a/ufl/finiteelement/elementlist.py +++ b/ufl/finiteelement/elementlist.py @@ -195,8 +195,8 @@ def show_elements(): ("quadrilateral",)) register_element2("BDMCF", 1, HDiv, "contravariant Piola", (1, None), ("quadrilateral",)) -register_element2("SminusE", 1, HCurl, "covariant Piola", (1, None), cubes[1:2]) -register_element2("SminusF", 1, HDiv, "contravariant Piola", (1, None), cubes[1:2]) +register_element2("SminusE", 1, HCurl, "covariant Piola", (1, None), cubes[1:3]) +register_element2("SminusF", 1, HDiv, "contravariant Piola", (1, None), cubes[1:3]) register_element2("AAE", 1, HCurl, "covariant Piola", (1, None), ("hexahedron",)) register_element2("AAF", 1, HDiv, "contravariant Piola", (1, None), From 87cd5a09dd16adab4f9455ed987958009bf732e9 Mon Sep 17 00:00:00 2001 From: Justincrum Date: Tue, 14 Apr 2020 11:27:44 -0700 Subject: [PATCH 4/5] Plumbing for SminusDiv.py --- ufl/finiteelement/elementlist.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ufl/finiteelement/elementlist.py b/ufl/finiteelement/elementlist.py index 63cb0f29e..8690fdbd4 100644 --- a/ufl/finiteelement/elementlist.py +++ b/ufl/finiteelement/elementlist.py @@ -196,7 +196,8 @@ def show_elements(): register_element2("BDMCF", 1, HDiv, "contravariant Piola", (1, None), ("quadrilateral",)) register_element2("SminusE", 1, HCurl, "covariant Piola", (1, None), cubes[1:3]) -register_element2("SminusF", 1, HDiv, "contravariant Piola", (1, None), cubes[1:3]) +register_element2("SminusF", 1, HDiv, "contravariant Piola", (1, None), cubes[1:2]) +register_element2("SminusDiv", 1, HDiv, "contravariant Piola", (1, None), cubes[1:3]) register_element2("AAE", 1, HCurl, "covariant Piola", (1, None), ("hexahedron",)) register_element2("AAF", 1, HDiv, "contravariant Piola", (1, None), From c17ccb5a6b4e641d533dd6411b9bb33327d2d28d Mon Sep 17 00:00:00 2001 From: Justincrum Date: Tue, 8 Sep 2020 13:24:57 -0700 Subject: [PATCH 5/5] Adding in element stuff for SminusCurl. --- ufl/finiteelement/elementlist.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ufl/finiteelement/elementlist.py b/ufl/finiteelement/elementlist.py index 8690fdbd4..70335550c 100644 --- a/ufl/finiteelement/elementlist.py +++ b/ufl/finiteelement/elementlist.py @@ -198,6 +198,7 @@ def show_elements(): register_element2("SminusE", 1, HCurl, "covariant Piola", (1, None), cubes[1:3]) register_element2("SminusF", 1, HDiv, "contravariant Piola", (1, None), cubes[1:2]) register_element2("SminusDiv", 1, HDiv, "contravariant Piola", (1, None), cubes[1:3]) +register_element2("SminusCurl", 1, HCurl, "covariant Piola", (1, None), cubes[1:3]) register_element2("AAE", 1, HCurl, "covariant Piola", (1, None), ("hexahedron",)) register_element2("AAF", 1, HDiv, "contravariant Piola", (1, None),