diff --git a/maxwell/src/sparse.rs b/maxwell/src/sparse.rs index 9c458b7..6234fea 100644 --- a/maxwell/src/sparse.rs +++ b/maxwell/src/sparse.rs @@ -1,6 +1,6 @@ use super::Float; use sbp::operators::{SbpOperator2d, UpwindOperator2d}; -use sbp::utils::sparse_sparse_outer_product; +use sbp::utils::kronecker_product; fn eye(n: usize) -> sprs::CsMat { sprs::CsMat::eye(n) @@ -20,8 +20,8 @@ pub fn rhs_matrix(op: &dyn SbpOperator2d, ny: usize, nx: usize) -> sprs::CsMat sprs::CsMat sprs::CsMat sprs::CsMat sprs::CsMat sprs::CsMat { pub north: T, diff --git a/sbp/src/utils/outer_product.rs b/sbp/src/utils/kronecker_product.rs similarity index 94% rename from sbp/src/utils/outer_product.rs rename to sbp/src/utils/kronecker_product.rs index c5cf0dc..74bfa88 100644 --- a/sbp/src/utils/outer_product.rs +++ b/sbp/src/utils/kronecker_product.rs @@ -2,7 +2,7 @@ /// M = A \kron B #[allow(non_snake_case)] #[must_use] -pub fn sparse_sparse_outer_product< +pub fn kronecker_product< N: num_traits::Num + Copy + Default, I: sprs::SpIndex, Iptr: sprs::SpIndex, @@ -114,7 +114,7 @@ pub fn sparse_sparse_outer_product< } #[test] -fn test_outer_product() { +fn test_kronecker_product() { let mut a = sprs::TriMat::new((2, 3)); a.add_triplet(0, 1, 2); a.add_triplet(0, 2, 3); @@ -153,15 +153,15 @@ fn test_outer_product() { } }; - let c = sparse_sparse_outer_product(a.view(), b.view()); + let c = kronecker_product(a.view(), b.view()); check(c.view()); let b = b.to_csc(); - let c = sparse_sparse_outer_product(a.view(), b.view()); + let c = kronecker_product(a.view(), b.view()); check(c.view()); let a = a.to_csc(); - let c = sparse_sparse_outer_product(a.view(), b.view()); + let c = kronecker_product(a.view(), b.view()); check(c.view()); let b = b.to_csr(); - let c = sparse_sparse_outer_product(a.view(), b.view()); + let c = kronecker_product(a.view(), b.view()); check(c.view()); }