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

change trait signature for interpolation

Browse Source
This commit is contained in:
Magnus Ulimoen
2020-04-13 20:56:29 +02:00
parent 2adf91e1ce
commit 9cfd54253f
5 changed files with 61 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sbp/src/operators/interpolation/interpolation4.rs
View File

@@ -1,6 +1,6 @@
use super::*;
pub struct Interpolation4 {}
pub struct Interpolation4;
impl Interpolation4 {
const F2C_DIAG: &'static [[Float; 7]] = &[[
@@ -71,7 +71,7 @@ impl Interpolation4 {
}
impl InterpolationOperator for Interpolation4 {
fn fine2coarse(fine: ArrayView1<Float>, coarse: ArrayViewMut1<Float>) {
fn fine2coarse(&self, fine: ArrayView1<Float>, coarse: ArrayViewMut1<Float>) {
assert_eq!(fine.len(), 2 * coarse.len() - 1);
super::interpolate(
fine,
@@ -81,7 +81,7 @@ impl InterpolationOperator for Interpolation4 {
(3, 2),
)
}
fn coarse2fine(coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) {
fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) {
assert_eq!(fine.len(), 2 * coarse.len() - 1);
super::interpolate(
coarse,

6
sbp/src/operators/interpolation/interpolation9.rs
View File

@@ -1,6 +1,6 @@
use super::*;
pub struct Interpolation9 {}
pub struct Interpolation9;
impl Interpolation9 {
#[rustfmt::skip]
@@ -50,7 +50,7 @@ impl Interpolation9 {
}
impl InterpolationOperator for Interpolation9 {
fn fine2coarse(fine: ArrayView1<Float>, coarse: ArrayViewMut1<Float>) {
fn fine2coarse(&self, fine: ArrayView1<Float>, coarse: ArrayViewMut1<Float>) {
assert_eq!(fine.len(), 2 * coarse.len() - 1);
use ndarray::prelude::*;
use std::iter::FromIterator;
@@ -62,7 +62,7 @@ impl InterpolationOperator for Interpolation9 {
.unwrap();
super::interpolate(fine, coarse, block.view(), diag.view(), (5, 2))
}
fn coarse2fine(coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) {
fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) {
assert_eq!(fine.len(), 2 * coarse.len() - 1);
use ndarray::prelude::*;
use std::iter::FromIterator;