mulimoen/SummationByParts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump sprs to 0.10

Browse Source
This commit is contained in:
Magnus Ulimoen
2021-03-18 23:27:03 +01:00
parent 550b43b4cd
commit be984fbdac
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxwell/Cargo.toml
View File

@@ -10,7 +10,7 @@ sparse = ["sbp/sparse", "sprs"]
[dependencies]
ndarray = "0.14.0"
sbp = { path = "../sbp" }
sprs = { version = "0.9.0", optional = true, default-features = false }
sprs = { version = "0.10.0", optional = true, default-features = false }
[dev-dependencies]
criterion = "0.3.2"

10
maxwell/src/sparse.rs
View File

@@ -236,11 +236,11 @@ pub fn rhs_matrix(op: &dyn SbpOperator2d, grid: &super::Grid) -> Implicit {
/// RHS with some additional dissipation from the upwind operator
pub fn rhs_matrix_with_upwind_dissipation(
op: &dyn UpwindOperator2d,
op: impl UpwindOperator2d + SbpOperator2d,
grid: &super::Grid,
) -> sprs::CsMat<Float> {
let rhs = rhs_matrix(op.as_sbp(), grid).rhs;
let metrics = grid.metrics(op.as_sbp()).unwrap();
let rhs = rhs_matrix(&op, grid).rhs;
let metrics = grid.metrics(&op).unwrap();
let nx = grid.nx();
let ny = grid.ny();
@@ -262,14 +262,14 @@ pub fn rhs_matrix_with_upwind_dissipation(
};
let diss_x = {
let diss_x = UpwindOperator2d::op_xi(op).diss_matrix(nx);
let diss_x = UpwindOperator2d::op_xi(&op).diss_matrix(nx);
let diss_x = kronecker_product(eye(ny).view(), diss_x.view());
let met = diss(metrics.detj_dxi_dx(), metrics.detj_dxi_dy());
&met * &kronecker_product(eye(3).view(), diss_x.view())
};
let diss_y = {
let diss_y = UpwindOperator2d::op_eta(op).diss_matrix(ny);
let diss_y = UpwindOperator2d::op_eta(&op).diss_matrix(ny);
let diss_y = kronecker_product(diss_y.view(), eye(nx).view());
let met = diss(metrics.detj_deta_dx(), metrics.detj_deta_dy());
&met * &kronecker_product(eye(3).view(), diss_y.view())