move test to bottom of file

This commit is contained in:
Magnus Ulimoen 2019-11-14 18:19:48 +01:00
parent 8b11cb74e4
commit 1e7cbdc02f
1 changed files with 29 additions and 29 deletions

View File

@ -270,6 +270,35 @@ impl Upwind4 {
} }
} }
impl SbpOperator for Upwind4 {
fn diffx(prev: ArrayView2<f32>, mut fut: ArrayViewMut2<f32>) {
assert_eq!(prev.shape(), fut.shape());
assert!(prev.shape()[0] >= 8);
for (r0, r1) in prev.outer_iter().zip(fut.outer_iter_mut()) {
Self::diff(r0, r1)
}
}
fn diffy(prev: ArrayView2<f32>, mut fut: ArrayViewMut2<f32>) {
assert_eq!(prev.shape(), fut.shape());
assert!(prev.shape()[1] >= 8);
let nx = prev.shape()[1];
let ny = prev.shape()[0];
if nx >= 4 && nx % 4 == 0 {
if let (Some(p), Some(f)) = (prev.as_slice(), fut.as_slice_mut()) {
Self::diffy_simd(p, f, nx, ny);
return;
}
}
// diffy = transpose then use diffx
Self::diffx(prev.reversed_axes(), fut.reversed_axes());
}
fn h() -> &'static [f32] {
Self::HBLOCK
}
}
#[test] #[test]
fn upwind4_test() { fn upwind4_test() {
use ndarray::prelude::*; use ndarray::prelude::*;
@ -357,32 +386,3 @@ fn upwind4_test() {
approx::assert_abs_diff_eq!(&res.to_owned(), &target.to_owned(), epsilon = 1e-2); approx::assert_abs_diff_eq!(&res.to_owned(), &target.to_owned(), epsilon = 1e-2);
} }
} }
impl SbpOperator for Upwind4 {
fn diffx(prev: ArrayView2<f32>, mut fut: ArrayViewMut2<f32>) {
assert_eq!(prev.shape(), fut.shape());
assert!(prev.shape()[0] >= 8);
for (r0, r1) in prev.outer_iter().zip(fut.outer_iter_mut()) {
Self::diff(r0, r1)
}
}
fn diffy(prev: ArrayView2<f32>, mut fut: ArrayViewMut2<f32>) {
assert_eq!(prev.shape(), fut.shape());
assert!(prev.shape()[1] >= 8);
let nx = prev.shape()[1];
let ny = prev.shape()[0];
if nx >= 4 && nx % 4 == 0 {
if let (Some(p), Some(f)) = (prev.as_slice(), fut.as_slice_mut()) {
Self::diffy_simd(p, f, nx, ny);
return;
}
}
// diffy = transpose then use diffx
Self::diffx(prev.reversed_axes(), fut.reversed_axes());
}
fn h() -> &'static [f32] {
Self::HBLOCK
}
}