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

add back specialization

Browse Source
This commit is contained in:
Magnus Ulimoen
2020-04-15 00:37:46 +02:00
parent 1667eaaca0
commit 6df4632719
3 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sbp/src/operators/upwind4.rs
View File

@@ -291,10 +291,10 @@ impl SbpOperator1d for Upwind4 {
}
}
/*
impl<SBP: SbpOperator1d> SbpOperator2d for (Upwind4, SBP) {
fn diffxi(&self, prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape());
assert!(prev.shape()[1] >= 2 * Self::BLOCK.len());
assert!(prev.shape()[1] >= 2 * Upwind4::BLOCK.len());
match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => {
@@ -306,15 +306,13 @@ impl SbpOperator1d for Upwind4 {
([_, _], [_, _]) => {
// Fallback, work row by row
for (r0, r1) in prev.outer_iter().zip(fut.outer_iter_mut()) {
Self.diff1d(r0, r1);
Upwind4.diff(r0, r1);
}
}
_ => unreachable!("Should only be two elements in the strides vectors"),
}
}
}
*/
#[test]
fn upwind4_test() {
@@ -417,10 +415,10 @@ impl UpwindOperator1d for Upwind4 {
}
}
/*
impl<SBP: UpwindOperator1d> UpwindOperator2d for (Upwind4, SBP) {
fn dissxi(&self, prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape());
assert!(prev.shape()[1] >= 2 * Self::BLOCK.len());
assert!(prev.shape()[1] >= 2 * Upwind4::BLOCK.len());
match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => {
@@ -432,14 +430,13 @@ impl UpwindOperator1d for Upwind4 {
([_, _], [_, _]) => {
// Fallback, work row by row
for (r0, r1) in prev.outer_iter().zip(fut.outer_iter_mut()) {
Self.diss1d(r0, r1);
Upwind4.diss(r0, r1);
}
}
_ => unreachable!("Should only be two elements in the strides vectors"),
}
}
}
*/
#[test]
fn upwind4_test2() {