2020-01-29 18:36:16 +00:00
|
|
|
#![allow(clippy::excessive_precision)]
|
|
|
|
#![allow(clippy::unreadable_literal)]
|
|
|
|
|
2020-02-27 19:26:43 +00:00
|
|
|
use crate::Float;
|
2020-04-08 21:07:14 +00:00
|
|
|
use ndarray::{ArrayView1, ArrayView2, ArrayViewMut1, ArrayViewMut2};
|
2019-08-09 14:49:19 +00:00
|
|
|
|
2020-04-15 15:17:48 +00:00
|
|
|
pub trait SbpOperator1d: Send + Sync {
|
2020-04-14 22:12:54 +00:00
|
|
|
fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>);
|
|
|
|
|
|
|
|
fn h(&self) -> &'static [Float];
|
|
|
|
fn is_h2(&self) -> bool {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-15 15:17:48 +00:00
|
|
|
pub trait SbpOperator2d: Send + Sync {
|
2020-04-14 22:12:54 +00:00
|
|
|
fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>);
|
|
|
|
fn diffeta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>);
|
|
|
|
|
|
|
|
fn hxi(&self) -> &'static [Float];
|
|
|
|
fn heta(&self) -> &'static [Float];
|
|
|
|
|
|
|
|
fn is_h2xi(&self) -> bool;
|
|
|
|
fn is_h2eta(&self) -> bool;
|
|
|
|
}
|
|
|
|
|
2020-04-15 15:17:48 +00:00
|
|
|
impl<SBPeta: SbpOperator1d, SBPxi: SbpOperator1d> SbpOperator2d for (&SBPeta, &SBPxi) {
|
2020-04-14 22:37:46 +00:00
|
|
|
default fn diffxi(&self, prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>) {
|
2020-04-14 22:12:54 +00:00
|
|
|
assert_eq!(prev.shape(), fut.shape());
|
|
|
|
for (r0, r1) in prev.outer_iter().zip(fut.outer_iter_mut()) {
|
|
|
|
self.1.diff(r0, r1)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fn diffeta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
|
|
|
|
let ba = (self.1, self.0);
|
|
|
|
ba.diffxi(prev.reversed_axes(), fut.reversed_axes())
|
|
|
|
}
|
|
|
|
fn hxi(&self) -> &'static [Float] {
|
|
|
|
self.1.h()
|
|
|
|
}
|
|
|
|
fn heta(&self) -> &'static [Float] {
|
|
|
|
self.0.h()
|
|
|
|
}
|
|
|
|
fn is_h2xi(&self) -> bool {
|
|
|
|
self.1.is_h2()
|
|
|
|
}
|
|
|
|
fn is_h2eta(&self) -> bool {
|
|
|
|
self.0.is_h2()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-15 15:17:48 +00:00
|
|
|
impl<SBP: SbpOperator1d + Copy> SbpOperator2d for SBP {
|
2020-04-14 22:37:46 +00:00
|
|
|
fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
|
2020-04-15 15:17:48 +00:00
|
|
|
<(&SBP, &SBP) as SbpOperator2d>::diffxi(&(self, self), prev, fut)
|
2020-04-08 21:07:14 +00:00
|
|
|
}
|
2020-04-14 19:59:02 +00:00
|
|
|
fn diffeta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
|
2020-04-15 15:17:48 +00:00
|
|
|
<(&SBP, &SBP) as SbpOperator2d>::diffeta(&(self, self), prev, fut)
|
2020-04-08 21:07:14 +00:00
|
|
|
}
|
2020-04-14 22:12:54 +00:00
|
|
|
fn hxi(&self) -> &'static [Float] {
|
2020-04-15 15:17:48 +00:00
|
|
|
<(&SBP, &SBP) as SbpOperator2d>::hxi(&(self, self))
|
2020-04-14 22:12:54 +00:00
|
|
|
}
|
|
|
|
fn heta(&self) -> &'static [Float] {
|
2020-04-15 15:17:48 +00:00
|
|
|
<(&SBP, &SBP) as SbpOperator2d>::heta(&(self, self))
|
2020-04-14 22:12:54 +00:00
|
|
|
}
|
|
|
|
fn is_h2xi(&self) -> bool {
|
2020-04-15 15:17:48 +00:00
|
|
|
<(&SBP, &SBP) as SbpOperator2d>::is_h2xi(&(self, self))
|
2020-04-14 22:12:54 +00:00
|
|
|
}
|
|
|
|
fn is_h2eta(&self) -> bool {
|
2020-04-15 15:17:48 +00:00
|
|
|
<(&SBP, &SBP) as SbpOperator2d>::is_h2eta(&(self, self))
|
2020-04-14 22:12:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-15 15:17:48 +00:00
|
|
|
pub trait UpwindOperator1d: SbpOperator1d + Send + Sync {
|
2020-04-14 22:12:54 +00:00
|
|
|
fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>);
|
2020-04-15 15:36:45 +00:00
|
|
|
fn as_sbp(&self) -> &dyn SbpOperator1d;
|
2020-04-14 22:12:54 +00:00
|
|
|
}
|
|
|
|
|
2020-04-15 15:17:48 +00:00
|
|
|
pub trait UpwindOperator2d: SbpOperator2d + Send + Sync {
|
2020-04-14 22:12:54 +00:00
|
|
|
fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>);
|
|
|
|
fn disseta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>);
|
2020-04-15 15:36:45 +00:00
|
|
|
fn as_sbp(&self) -> &dyn SbpOperator2d;
|
2020-04-14 22:12:54 +00:00
|
|
|
}
|
|
|
|
|
2020-04-15 15:17:48 +00:00
|
|
|
impl<UOeta: UpwindOperator1d, UOxi: UpwindOperator1d> UpwindOperator2d for (&UOeta, &UOxi) {
|
2020-04-14 22:37:46 +00:00
|
|
|
default fn dissxi(&self, prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>) {
|
2020-04-14 22:12:54 +00:00
|
|
|
assert_eq!(prev.shape(), fut.shape());
|
|
|
|
for (r0, r1) in prev.outer_iter().zip(fut.outer_iter_mut()) {
|
|
|
|
self.1.diss(r0, r1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fn disseta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
|
|
|
|
let ba = (self.1, self.0);
|
|
|
|
ba.dissxi(prev.reversed_axes(), fut.reversed_axes())
|
2020-04-12 17:27:18 +00:00
|
|
|
}
|
2020-04-15 15:36:45 +00:00
|
|
|
fn as_sbp(&self) -> &dyn SbpOperator2d {
|
|
|
|
self
|
|
|
|
}
|
2019-08-09 14:49:19 +00:00
|
|
|
}
|
|
|
|
|
2020-04-15 15:17:48 +00:00
|
|
|
impl<UO: UpwindOperator1d + Copy> UpwindOperator2d for UO {
|
2020-04-14 22:37:46 +00:00
|
|
|
fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
|
2020-04-15 15:17:48 +00:00
|
|
|
<(&UO, &UO) as UpwindOperator2d>::dissxi(&(self, self), prev, fut)
|
2020-04-08 21:07:14 +00:00
|
|
|
}
|
2020-04-14 19:59:02 +00:00
|
|
|
fn disseta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
|
2020-04-15 15:17:48 +00:00
|
|
|
<(&UO, &UO) as UpwindOperator2d>::disseta(&(self, self), prev, fut)
|
2020-04-08 21:07:14 +00:00
|
|
|
}
|
2020-04-15 15:36:45 +00:00
|
|
|
fn as_sbp(&self) -> &dyn SbpOperator2d {
|
|
|
|
self
|
|
|
|
}
|
2019-12-12 19:32:38 +00:00
|
|
|
}
|
|
|
|
|
2020-04-11 13:19:34 +00:00
|
|
|
pub trait InterpolationOperator: Send + Sync {
|
2020-04-13 18:56:29 +00:00
|
|
|
fn fine2coarse(&self, fine: ArrayView1<Float>, coarse: ArrayViewMut1<Float>);
|
|
|
|
fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>);
|
2020-04-11 13:19:34 +00:00
|
|
|
}
|
|
|
|
|
2020-04-12 15:42:18 +00:00
|
|
|
#[inline(always)]
|
|
|
|
pub(crate) fn diff_op_1d(
|
|
|
|
block: ndarray::ArrayView2<Float>,
|
|
|
|
diag: ndarray::ArrayView1<Float>,
|
|
|
|
symmetric: bool,
|
2020-04-12 17:27:18 +00:00
|
|
|
is_h2: bool,
|
2020-04-12 15:42:18 +00:00
|
|
|
prev: ArrayView1<Float>,
|
|
|
|
mut fut: ArrayViewMut1<Float>,
|
|
|
|
) {
|
|
|
|
assert_eq!(prev.shape(), fut.shape());
|
|
|
|
let nx = prev.shape()[0];
|
|
|
|
assert!(nx >= 2 * block.len_of(ndarray::Axis(0)));
|
|
|
|
|
2020-04-12 17:27:18 +00:00
|
|
|
let dx = if is_h2 {
|
|
|
|
1.0 / (nx - 2) as Float
|
|
|
|
} else {
|
|
|
|
1.0 / (nx - 1) as Float
|
|
|
|
};
|
2020-04-12 15:42:18 +00:00
|
|
|
let idx = 1.0 / dx;
|
|
|
|
|
|
|
|
let first_elems = prev.slice(::ndarray::s!(..block.len_of(::ndarray::Axis(1))));
|
|
|
|
for (bl, f) in block.outer_iter().zip(&mut fut) {
|
|
|
|
let diff = first_elems.dot(&bl);
|
|
|
|
*f = diff * idx;
|
|
|
|
}
|
2019-12-13 23:29:54 +00:00
|
|
|
|
2020-04-12 15:42:18 +00:00
|
|
|
// The window needs to be aligned to the diagonal elements,
|
|
|
|
// based on the block size
|
|
|
|
let window_elems_to_skip = block.len_of(::ndarray::Axis(0)) - ((diag.len() - 1) / 2);
|
|
|
|
|
|
|
|
for (window, f) in prev
|
|
|
|
.windows(diag.len())
|
|
|
|
.into_iter()
|
|
|
|
.skip(window_elems_to_skip)
|
|
|
|
.zip(fut.iter_mut().skip(block.len_of(::ndarray::Axis(0))))
|
|
|
|
.take(nx - 2 * block.len_of(::ndarray::Axis(0)))
|
|
|
|
{
|
|
|
|
let diff = diag.dot(&window);
|
|
|
|
*f = diff * idx;
|
|
|
|
}
|
2019-12-13 23:29:54 +00:00
|
|
|
|
2020-04-12 15:42:18 +00:00
|
|
|
let last_elems = prev.slice(::ndarray::s!(nx - block.len_of(::ndarray::Axis(1))..;-1));
|
|
|
|
for (bl, f) in block
|
|
|
|
.outer_iter()
|
|
|
|
.zip(&mut fut.slice_mut(::ndarray::s![nx - block.len_of(::ndarray::Axis(0))..;-1]))
|
|
|
|
{
|
|
|
|
let diff = if symmetric {
|
|
|
|
bl.dot(&last_elems)
|
|
|
|
} else {
|
|
|
|
-bl.dot(&last_elems)
|
|
|
|
};
|
|
|
|
*f = diff * idx;
|
|
|
|
}
|
2019-12-13 23:29:54 +00:00
|
|
|
}
|
|
|
|
|
2019-09-03 17:41:49 +00:00
|
|
|
mod upwind4;
|
|
|
|
pub use upwind4::Upwind4;
|
2019-12-15 16:49:41 +00:00
|
|
|
mod upwind9;
|
|
|
|
pub use upwind9::Upwind9;
|
2020-04-12 17:27:18 +00:00
|
|
|
|
|
|
|
mod upwind4h2;
|
|
|
|
pub use upwind4h2::Upwind4h2;
|
2020-04-13 20:08:18 +00:00
|
|
|
mod upwind9h2;
|
|
|
|
pub use upwind9h2::Upwind9h2;
|
2020-04-12 17:27:18 +00:00
|
|
|
|
2019-12-15 16:27:31 +00:00
|
|
|
mod traditional4;
|
|
|
|
pub use traditional4::SBP4;
|
2019-12-15 16:49:41 +00:00
|
|
|
mod traditional8;
|
|
|
|
pub use traditional8::SBP8;
|
2020-02-29 09:53:20 +00:00
|
|
|
|
2020-04-11 13:19:34 +00:00
|
|
|
mod interpolation;
|
2020-04-15 21:58:39 +00:00
|
|
|
pub use interpolation::{Interpolation4, Interpolation8, Interpolation9, Interpolation9h2};
|
2020-04-11 13:19:34 +00:00
|
|
|
|
2020-02-29 09:53:20 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
pub(crate) mod testing {
|
|
|
|
use super::*;
|
|
|
|
use ndarray::prelude::*;
|
|
|
|
pub(crate) fn grid_eval<F: Fn(Float, Float) -> Float>(
|
|
|
|
n: (usize, usize),
|
|
|
|
f: F,
|
|
|
|
) -> Array2<Float> {
|
|
|
|
let nx = n.1;
|
|
|
|
let dx = 1.0 / (nx - 1) as Float;
|
|
|
|
let ny = n.0;
|
|
|
|
let dy = 1.0 / (ny - 1) as Float;
|
|
|
|
Array2::from_shape_fn(n, |(j, i)| {
|
|
|
|
let x = dx * i as Float;
|
|
|
|
let y = dy * j as Float;
|
|
|
|
f(x, y)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) fn check_operator_on<SBP, F, FX, FY>(
|
2020-04-14 19:59:02 +00:00
|
|
|
op: SBP,
|
2020-02-29 09:53:20 +00:00
|
|
|
n: (usize, usize),
|
|
|
|
f: F,
|
|
|
|
dfdx: FX,
|
|
|
|
dfdy: FY,
|
|
|
|
eps: Float,
|
|
|
|
) where
|
2020-04-14 22:12:54 +00:00
|
|
|
SBP: SbpOperator2d,
|
2020-02-29 09:53:20 +00:00
|
|
|
F: Fn(Float, Float) -> Float,
|
|
|
|
FX: Fn(Float, Float) -> Float,
|
|
|
|
FY: Fn(Float, Float) -> Float,
|
|
|
|
{
|
|
|
|
let mut y = Array2::zeros(n);
|
|
|
|
let x = grid_eval(n, f);
|
|
|
|
|
|
|
|
y.fill(0.0);
|
2020-04-14 19:59:02 +00:00
|
|
|
op.diffxi(x.view(), y.view_mut());
|
2020-02-29 09:53:20 +00:00
|
|
|
approx::assert_abs_diff_eq!(&y, &grid_eval(n, dfdx), epsilon = eps);
|
|
|
|
|
|
|
|
y.fill(0.0);
|
2020-04-14 19:59:02 +00:00
|
|
|
op.diffeta(x.view(), y.view_mut());
|
2020-02-29 09:53:20 +00:00
|
|
|
approx::assert_abs_diff_eq!(&y, &grid_eval(n, dfdy), epsilon = eps);
|
|
|
|
}
|
|
|
|
}
|