rust - update rust examples to match c/python

Cargo.toml

@@ -3,8 +3,10 @@ members = [
         "rust/libceed",
         "rust/libceed-sys",
         "examples/rust/ex1-volume",
+        "examples/rust/ex1-volume-vector",
         "examples/rust/ex2-surface",
-        "examples/rust/ex3-vector-volume",
-        "examples/rust/ex4-vector-surface",
+        "examples/rust/ex2-surface-vector",
+        "examples/rust/ex3-volume",
+        "examples/rust/ex3-volume-vector",
         "examples/rust/mesh",
 ]

examples/deal.II/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5.0)
 
 FIND_PACKAGE(deal.II 8.0 QUIET
   HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}

examples/rust/ex3-vector-volume/Cargo.toml → examples/rust/ex1-volume-vector/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "ex3-vector-volume"
+name = "ex1-volume-vector"
 version = "0.11.0"
 authors = [
     "Jeremy L Thompson <thompson.jeremy.luke@gmail.com>",

examples/rust/ex3-vector-volume/src/main.rs → examples/rust/ex1-volume-vector/src/main.rs

@@ -31,12 +31,12 @@ mod transform;
 // ----------------------------------------------------------------------------
 fn main() -> libceed::Result<()> {
     let options = opt::Opt::parse();
-    example_3(options)
+    example_1_vector(options)
 }
 
 #[allow(clippy::erasing_op)]
 #[allow(clippy::identity_op)]
-fn example_3(options: opt::Opt) -> libceed::Result<()> {
+fn example_1_vector(options: opt::Opt) -> libceed::Result<()> {
     // Process command line arguments
     let opt::Opt {
         ceed_spec,
@@ -304,7 +304,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn example_3_1d() {
+    fn example_1_vector_1d() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 1,
@@ -316,11 +316,11 @@ mod tests {
             quiet: true,
             gallery: false,
         };
-        assert!(example_3(options).is_ok());
+        assert!(example_1_vector(options).is_ok());
     }
 
     #[test]
-    fn example_3_2d() {
+    fn example_1_vector_2d() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 2,
@@ -332,11 +332,11 @@ mod tests {
             quiet: true,
             gallery: false,
         };
-        assert!(example_3(options).is_ok());
+        assert!(example_1_vector(options).is_ok());
     }
 
     #[test]
-    fn example_3_3d() {
+    fn example_1_vector_3d() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 3,
@@ -348,11 +348,11 @@ mod tests {
             quiet: false,
             gallery: false,
         };
-        assert!(example_3(options).is_ok());
+        assert!(example_1_vector(options).is_ok());
     }
 
     #[test]
-    fn example_3_1d_gallery() {
+    fn example_1_vector_1d_gallery() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 1,
@@ -364,11 +364,11 @@ mod tests {
             quiet: true,
             gallery: true,
         };
-        assert!(example_3(options).is_ok());
+        assert!(example_1_vector(options).is_ok());
     }
 
     #[test]
-    fn example_3_2d_gallery() {
+    fn example_1_vector_2d_gallery() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 2,
@@ -380,11 +380,11 @@ mod tests {
             quiet: true,
             gallery: true,
         };
-        assert!(example_3(options).is_ok());
+        assert!(example_1_vector(options).is_ok());
     }
 
     #[test]
-    fn example_3_3d_gallery() {
+    fn example_1_vector_3d_gallery() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 3,
@@ -396,7 +396,7 @@ mod tests {
             quiet: true,
             gallery: true,
         };
-        assert!(example_3(options).is_ok());
+        assert!(example_1_vector(options).is_ok());
     }
 }
 

examples/rust/ex3-vector-volume/src/transform.rs → examples/rust/ex1-volume-vector/src/transform.rs

@@ -37,7 +37,8 @@ pub(crate) fn transform_mesh_coordinates(
     // Exact volume of transformed region
     let exact_volume = match dim {
         1 => 1.0,
-        _ => 3.0 / 4.0 * std::f64::consts::PI as libceed::Scalar,
+        2 | 3 => 3.0 / 4.0 * std::f64::consts::PI as libceed::Scalar,
+        _ => unreachable!(),
     };
     Ok(exact_volume)
 }

examples/rust/ex1-volume/src/transform.rs

@@ -37,7 +37,8 @@ pub(crate) fn transform_mesh_coordinates(
     // Exact volume of transformed region
     let exact_volume = match dim {
         1 => 1.0,
-        _ => 3.0 / 4.0 * std::f64::consts::PI as libceed::Scalar,
+        2 | 3 => 3.0 / 4.0 * std::f64::consts::PI as libceed::Scalar,
+        _ => unreachable!(),
     };
     Ok(exact_volume)
 }

examples/rust/ex4-vector-surface/Cargo.toml → examples/rust/ex2-surface-vector/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "ex4-vector-surface"
+name = "ex2-surface-vector"
 version = "0.11.0"
 authors = [
     "Jeremy L Thompson <thompson.jeremy.luke@gmail.com>",

examples/rust/ex4-vector-surface/src/main.rs → examples/rust/ex2-surface-vector/src/main.rs

@@ -32,12 +32,12 @@ mod transform;
 // ----------------------------------------------------------------------------
 fn main() -> libceed::Result<()> {
     let options = opt::Opt::parse();
-    example_4(options)
+    example_2_vector(options)
 }
 
 #[allow(clippy::erasing_op)]
 #[allow(clippy::identity_op)]
-fn example_4(options: opt::Opt) -> libceed::Result<()> {
+fn example_2_vector(options: opt::Opt) -> libceed::Result<()> {
     // Process command line arguments
     let opt::Opt {
         ceed_spec,
@@ -256,7 +256,7 @@ fn example_4(options: opt::Opt) -> libceed::Result<()> {
         match dim {
             1 => {
                 let q = qdata.len();
-                for c in 0..3 {
+                for c in 0..ncomp_u {
                     vg.iter_mut()
                         .skip(c * q)
                         .zip(ug.iter().skip(c * q).zip(qdata.iter()))
@@ -266,12 +266,12 @@ fn example_4(options: opt::Opt) -> libceed::Result<()> {
             2 => {
                 let q = qdata.len() / 3;
                 for i in 0..q {
+                    let dxdxdxdx_t = [
+                        [qdata[i + 0 * q], qdata[i + 2 * q]],
+                        [qdata[i + 2 * q], qdata[i + 1 * q]],
+                    ];
                     for c in 0..ncomp_u {
                         let du = [ug[i + (c + 0 * ncomp_u) * q], ug[i + (c + 1 * ncomp_u) * q]];
-                        let dxdxdxdx_t = [
-                            [qdata[i + 0 * q], qdata[i + 2 * q]],
-                            [qdata[i + 2 * q], qdata[i + 1 * q]],
-                        ];
                         for j in 0..dim {
                             vg[i + (c + j * ncomp_u) * q] =
                                 du[0] * dxdxdxdx_t[0][j] + du[1] * dxdxdxdx_t[1][j];
@@ -282,17 +282,17 @@ fn example_4(options: opt::Opt) -> libceed::Result<()> {
             3 => {
                 let q = qdata.len() / 6;
                 for i in 0..q {
+                    let dxdxdxdx_t = [
+                        [qdata[i + 0 * q], qdata[i + 5 * q], qdata[i + 4 * q]],
+                        [qdata[i + 5 * q], qdata[i + 1 * q], qdata[i + 3 * q]],
+                        [qdata[i + 4 * q], qdata[i + 3 * q], qdata[i + 2 * q]],
+                    ];
                     for c in 0..ncomp_u {
                         let du = [
                             ug[i + (c + 0 * ncomp_u) * q],
                             ug[i + (c + 1 * ncomp_u) * q],
                             ug[i + (c + 2 * ncomp_u) * q],
                         ];
-                        let dxdxdxdx_t = [
-                            [qdata[i + 0 * q], qdata[i + 5 * q], qdata[i + 4 * q]],
-                            [qdata[i + 5 * q], qdata[i + 1 * q], qdata[i + 3 * q]],
-                            [qdata[i + 4 * q], qdata[i + 3 * q], qdata[i + 2 * q]],
-                        ];
                         for j in 0..dim {
                             vg[i + (c + j * ncomp_u) * q] = du[0] * dxdxdxdx_t[0][j]
                                 + du[1] * dxdxdxdx_t[1][j]
@@ -395,7 +395,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn example_4_1d() {
+    fn example_2_vector_1d() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 1,
@@ -407,11 +407,11 @@ mod tests {
             quiet: true,
             gallery: false,
         };
-        assert!(example_4(options).is_ok());
+        assert!(example_2_vector(options).is_ok());
     }
 
     #[test]
-    fn example_4_2d() {
+    fn example_2_vector_2d() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 2,
@@ -423,11 +423,11 @@ mod tests {
             quiet: true,
             gallery: false,
         };
-        assert!(example_4(options).is_ok());
+        assert!(example_2_vector(options).is_ok());
     }
 
     #[test]
-    fn example_4_3d() {
+    fn example_2_vector_3d() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 3,
@@ -439,11 +439,11 @@ mod tests {
             quiet: false,
             gallery: false,
         };
-        assert!(example_4(options).is_ok());
+        assert!(example_2_vector(options).is_ok());
     }
 
     #[test]
-    fn example_4_1d_gallery() {
+    fn example_2_vector_1d_gallery() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 1,
@@ -455,11 +455,11 @@ mod tests {
             quiet: true,
             gallery: true,
         };
-        assert!(example_4(options).is_ok());
+        assert!(example_2_vector(options).is_ok());
     }
 
     #[test]
-    fn example_4_2d_gallery() {
+    fn example_2_vector_2d_gallery() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 2,
@@ -471,11 +471,11 @@ mod tests {
             quiet: true,
             gallery: true,
         };
-        assert!(example_4(options).is_ok());
+        assert!(example_2_vector(options).is_ok());
     }
 
     #[test]
-    fn example_4_3d_gallery() {
+    fn example_2_vector_3d_gallery() {
         let options = opt::Opt {
             ceed_spec: "/cpu/self/ref/serial".to_string(),
             dim: 3,
@@ -487,7 +487,7 @@ mod tests {
             quiet: true,
             gallery: true,
         };
-        assert!(example_4(options).is_ok());
+        assert!(example_2_vector(options).is_ok());
     }
 }
 

examples/rust/ex4-vector-surface/src/transform.rs → examples/rust/ex2-surface-vector/src/transform.rs

@@ -24,7 +24,8 @@ pub(crate) fn transform_mesh_coordinates(
     let exact_area = match dim {
         1 => 2.0,
         2 => 4.0,
-        _ => 6.0,
+        3 => 6.0,
+        _ => unreachable!(),
     };
     Ok(exact_area)
 }

examples/rust/ex2-surface/src/main.rs

@@ -123,7 +123,6 @@ fn example_2(options: opt::Opt) -> libceed::Result<()> {
         dim * (dim + 1) / 2,
         num_qpts,
     )?;
-
     let (rstr_solution, _) =
         mesh::build_cartesian_restriction(&ceed, dim, num_xyz, solution_degree, 1, num_qpts)?;
     let mesh_size = rstr_mesh.lvector_size();

examples/rust/ex2-surface/src/transform.rs

@@ -24,7 +24,8 @@ pub(crate) fn transform_mesh_coordinates(
     let exact_area = match dim {
         1 => 2.0,
         2 => 4.0,
-        _ => 6.0,
+        3 => 6.0,
+        _ => unreachable!(),
     };
     Ok(exact_area)
 }

examples/rust/ex3-volume-vector/.gitignore

@@ -0,0 +1,2 @@
+target
+Cargo.lock

examples/rust/ex3-volume-vector/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "ex3-volume-vector"
+version = "0.11.0"
+authors = [
+    "Jeremy L Thompson <thompson.jeremy.luke@gmail.com>",
+]
+edition = "2018"
+
+[dependencies]
+clap = { version = "4.0.17", features = ["derive"] }
+libceed = { path = "../../../rust/libceed" }
+mesh = { path = "../mesh" }
+
+[package.metadata.release]
+release = false