more diameter tests

Author: mscroggs

src/grid/mixed_grid/geometry.rs

@@ -123,7 +123,7 @@ impl<T: Float + Scalar<Real = T>> SerialMixedGeometry<T> {
                             for (i, c) in v.iter_mut().enumerate() {
                                 *c = unsafe {
                                     *coordinates
-                                        .get_unchecked([cells[element_index][3 * cell_i + j], i])
+                                        .get_unchecked([cells[element_index][size * cell_i + j], i])
                                 };
                             }
                         }
@@ -141,7 +141,7 @@ impl<T: Float + Scalar<Real = T>> SerialMixedGeometry<T> {
                             for (i, c) in v.iter_mut().enumerate() {
                                 *c = unsafe {
                                     *coordinates
-                                        .get_unchecked([cells[element_index][4 * cell_i + j], i])
+                                        .get_unchecked([cells[element_index][size * cell_i + j], i])
                                 };
                             }
                         }
@@ -521,4 +521,27 @@ mod test {
             }
         }
     }
+
+    #[test]
+    fn test_diameter() {
+        //! Test diameters
+        let g = example_geometry();
+
+        for cell_i in 0..2 {
+            assert_relative_eq!(
+                g.diameter((0, cell_i)),
+                2.0 * f64::sqrt(1.5 - f64::sqrt(2.0)),
+                epsilon = 1e-12
+            );
+        }
+
+        let g = example_geometry_mixed();
+
+        for (cell_i, d) in [f64::sqrt(2.0), 2.0 * f64::sqrt(1.5 - f64::sqrt(2.0))]
+            .iter()
+            .enumerate()
+        {
+            assert_relative_eq!(g.diameter((cell_i, 0)), d, epsilon = 1e-12);
+        }
+    }
 }

src/grid/single_element_grid/geometry.rs

@@ -95,7 +95,9 @@ impl<T: Float + Scalar<Real = T>> SerialSingleElementGeometry<T> {
                 for cell_i in 0..ncells {
                     for (j, v) in [&mut v0, &mut v1, &mut v2].iter_mut().enumerate() {
                         for (i, c) in v.iter_mut().enumerate() {
-                            *c = unsafe { *coordinates.get_unchecked([cells[3 * cell_i + j], i]) };
+                            *c = unsafe {
+                                *coordinates.get_unchecked([cells[size * cell_i + j], i])
+                            };
                         }
                     }
                     diameters[cell_i] = compute_diameter_triangle(v0.view(), v1.view(), v2.view());
@@ -109,7 +111,9 @@ impl<T: Float + Scalar<Real = T>> SerialSingleElementGeometry<T> {
                 for cell_i in 0..ncells {
                     for (j, v) in [&mut v0, &mut v1, &mut v2, &mut v3].iter_mut().enumerate() {
                         for (i, c) in v.iter_mut().enumerate() {
-                            *c = unsafe { *coordinates.get_unchecked([cells[4 * cell_i + j], i]) };
+                            *c = unsafe {
+                                *coordinates.get_unchecked([cells[size * cell_i + j], i])
+                            };
                         }
                     }
                     diameters[cell_i] =
@@ -596,4 +600,28 @@ mod test {
             }
         }
     }
+
+    #[test]
+    fn test_diameter() {
+        //! Test diameters
+        let g = example_geometry_2d();
+
+        for cell_i in 0..2 {
+            assert_relative_eq!(
+                g.diameter(cell_i),
+                2.0 * f64::sqrt(1.5 - f64::sqrt(2.0)),
+                epsilon = 1e-12
+            );
+        }
+
+        let g = example_geometry_3d();
+
+        for cell_i in 0..2 {
+            assert_relative_eq!(
+                g.diameter(cell_i),
+                2.0 * f64::sqrt(1.5 - f64::sqrt(2.0)),
+                epsilon = 1e-12
+            );
+        }
+    }
 }