Implement arbitrary degree Lagrange elements (#116)

* Fix #111 * rlst * clippy * rename CiarletElement -> OldCiarletElement * OldCiarletElement * start implementing arbitrary degree elements * implement tabulte with Legendre basis * Eq, cargo fmt * working on arbitrary degree elements * Fix arbitrary degree Lagrange elements * remove printing code * clippy * replace bool with Continuity * clippy * update create_element * working on RT element * finish Raviart Thomas degree 1 element * delete OldCiarletElement * clippy * clippy * clippy * Tidying * comment out unused fields (to be uncommented when implementing interpolation)
bempp · Sep 5, 2023 · 245bc79 · 245bc79
1 parent 83ccc73
commit 245bc79
Show file tree

Hide file tree

Showing 17 changed files with 744 additions and 505 deletions.
diff --git a/bem/examples/assemble.rs b/bem/examples/assemble.rs
@@ -6,7 +6,7 @@ use bempp_tools::arrays::Array2D;
 use bempp_traits::bem::DofMap;
 use bempp_traits::bem::FunctionSpace;
 use bempp_traits::cell::ReferenceCellType;
-use bempp_traits::element::ElementFamily;
+use bempp_traits::element::{Continuity, ElementFamily};
 use num::complex::Complex;
 
 fn main() {
@@ -17,13 +17,13 @@ fn main() {
         ElementFamily::Lagrange,
         ReferenceCellType::Triangle,
         0,
-        true,
+        Continuity::Discontinuous,
     );
     let element1 = create_element(
         ElementFamily::Lagrange,
         ReferenceCellType::Triangle,
         1,
-        true,
+        Continuity::Discontinuous,
     );
 
     let space0 = SerialFunctionSpace::new(&grid, &element0);

diff --git a/bem/src/assembly.rs b/bem/src/assembly.rs
@@ -125,7 +125,7 @@ mod test {
     use bempp_traits::arrays::Array2DAccess;
     use bempp_traits::bem::DofMap;
     use bempp_traits::cell::ReferenceCellType;
-    use bempp_traits::element::ElementFamily;
+    use bempp_traits::element::{Continuity, ElementFamily};
     use num::complex::Complex;
 
     #[test]
@@ -135,13 +135,13 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let element1 = create_element(
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             1,
-            false,
+            Continuity::Continuous,
         );
         let space0 = SerialFunctionSpace::new(&grid, &element0);
         let space1 = SerialFunctionSpace::new(&grid, &element1);
@@ -186,13 +186,13 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let element1 = create_element(
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             1,
-            false,
+            Continuity::Continuous,
         );
         let space0 = SerialFunctionSpace::new(&grid, &element0);
         let space1 = SerialFunctionSpace::new(&grid, &element1);

diff --git a/bem/src/assembly/dense.rs b/bem/src/assembly/dense.rs
@@ -499,7 +499,7 @@ mod test {
     use bempp_element::element::create_element;
     use bempp_grid::shapes::regular_sphere;
     use bempp_traits::cell::ReferenceCellType;
-    use bempp_traits::element::ElementFamily;
+    use bempp_traits::element::{Continuity, ElementFamily};
     use num::complex::Complex;
 
     #[test]
@@ -509,7 +509,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -623,7 +623,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -737,7 +737,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -851,7 +851,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -874,7 +874,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             1,
-            false,
+            Continuity::Continuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -936,7 +936,7 @@ mod test {
             ],
         ];
 
-        let perm = vec![0, 5, 2, 4, 3, 1];
+        let perm = [0, 5, 2, 4, 3, 1];
 
         for (i, pi) in perm.iter().enumerate() {
             for (j, pj) in perm.iter().enumerate() {
@@ -956,7 +956,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -1069,7 +1069,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -1183,7 +1183,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -1298,7 +1298,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -1413,7 +1413,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             1,
-            false,
+            Continuity::Continuous,
         );
         let space = SerialFunctionSpace::new(&grid, &element);
 
@@ -1475,7 +1475,7 @@ mod test {
             ],
         ];
 
-        let perm = vec![0, 5, 2, 4, 3, 1];
+        let perm = [0, 5, 2, 4, 3, 1];
 
         for (i, pi) in perm.iter().enumerate() {
             for (j, pj) in perm.iter().enumerate() {

diff --git a/bem/src/dofmap.rs b/bem/src/dofmap.rs
@@ -92,7 +92,7 @@ mod test {
     use bempp_element::element::create_element;
     use bempp_grid::shapes::regular_sphere;
     use bempp_traits::cell::ReferenceCellType;
-    use bempp_traits::element::ElementFamily;
+    use bempp_traits::element::{Continuity, ElementFamily};
 
     #[test]
     fn test_dofmap_lagrange0() {
@@ -101,7 +101,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             0,
-            true,
+            Continuity::Discontinuous,
         );
         let dofmap = SerialDofMap::new(&grid, &element);
         assert_eq!(dofmap.local_size(), dofmap.global_size());
@@ -118,7 +118,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             1,
-            false,
+            Continuity::Continuous,
         );
         let dofmap = SerialDofMap::new(&grid, &element);
         assert_eq!(dofmap.local_size(), dofmap.global_size());
@@ -132,7 +132,7 @@ mod test {
             ElementFamily::Lagrange,
             ReferenceCellType::Triangle,
             2,
-            false,
+            Continuity::Continuous,
         );
         let dofmap = SerialDofMap::new(&grid, &element);
         assert_eq!(dofmap.local_size(), dofmap.global_size());

diff --git a/element/Cargo.toml b/element/Cargo.toml
@@ -26,3 +26,8 @@ bempp-quadrature = { path = "../quadrature" }
 paste = "1.*"
 libc = "0.2"
 approx = "0.5"
+rlst = { git = "https://github.com/linalg-rs/rlst.git" }
+rlst-blis-src = { git = "https://github.com/linalg-rs/rlst.git" }
+rlst-dense = { git = "https://github.com/linalg-rs/rlst.git" }
+rlst-algorithms = { git = "https://github.com/linalg-rs/rlst.git" }
+
diff --git a/element/src/cell.rs b/element/src/cell.rs
@@ -10,6 +10,19 @@ pub mod cells_3d;
 pub use bempp_traits::cell::{InvalidConnectivity, PhysicalCell, ReferenceCell, ReferenceCellType};
 pub use cells_3d::*;
 
+pub fn create_cell(cell_type: ReferenceCellType) -> Box<dyn ReferenceCell> {
+    match cell_type {
+        ReferenceCellType::Point => Box::new(Point {}),
+        ReferenceCellType::Interval => Box::new(Interval {}),
+        ReferenceCellType::Triangle => Box::new(Triangle {}),
+        ReferenceCellType::Quadrilateral => Box::new(Quadrilateral {}),
+        ReferenceCellType::Tetrahedron => Box::new(Tetrahedron {}),
+        ReferenceCellType::Hexahedron => Box::new(Hexahedron {}),
+        ReferenceCellType::Prism => Box::new(Prism {}),
+        ReferenceCellType::Pyramid => Box::new(Pyramid {}),
+    }
+}
+
 #[cfg(test)]
 mod test {
     use crate::cell::*;