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

Clippy lints

This commit is contained in:
Magnus Ulimoen 2022-05-17 08:24:33 +02:00
parent 70cab01334
commit f40de866ce
15 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
euler/src/lib.rs
View File

@ -60,7 +60,7 @@ impl<SBP: SbpOperator2d> System<SBP> {
let metrics = &self.grid.1; let metrics = &self.grid.1;
let rhs_trad = |k: &mut Diff, y: &Field, _time: Float| { let rhs_trad = |k: &mut Diff, y: &Field, _time: Float| {
let boundaries = boundary_extractor(y, grid, &bc); let boundaries = boundary_extractor(y, grid, &bc);
RHS_trad(op, k, y, metrics, &boundaries, wb) RHS_trad(op, k, y, metrics, &boundaries, wb);
}; };
integrate::integrate::<integrate::Rk4, Field, _>( integrate::integrate::<integrate::Rk4, Field, _>(
rhs_trad, rhs_trad,
@ -98,7 +98,7 @@ impl<SBP: SbpOperator2d> System<SBP> {
self.sys self.sys
.0 .0
.vortex(self.grid.0.x(), self.grid.0.y(), 0.0, &vortex_parameters) .vortex(self.grid.0.x(), self.grid.0.y(), 0.0, &vortex_parameters);
} }
pub fn field(&self) -> &Field { pub fn field(&self) -> &Field {
@ -134,7 +134,7 @@ impl<UO: UpwindOperator2d + SbpOperator2d> System<UO> {
let rhs_upwind = |k: &mut Diff, y: &Field, _time: Float| { let rhs_upwind = |k: &mut Diff, y: &Field, _time: Float| {
let (grid, metrics) = grid; let (grid, metrics) = grid;
let boundaries = boundary_extractor(y, grid, &bc); let boundaries = boundary_extractor(y, grid, &bc);
RHS_upwind(op, k, y, metrics, &boundaries, wb) RHS_upwind(op, k, y, metrics, &boundaries, wb);
}; };
integrate::integrate::<integrate::Rk4, Field, _>( integrate::integrate::<integrate::Rk4, Field, _>(
rhs_upwind, rhs_upwind,
@ -159,7 +159,7 @@ impl<UO: UpwindOperator2d + SbpOperator2d> System<UO> {
let mut rhs_upwind = |k: &mut Diff, y: &Field, _time: Float| { let mut rhs_upwind = |k: &mut Diff, y: &Field, _time: Float| {
let (grid, metrics) = grid; let (grid, metrics) = grid;
let boundaries = boundary_extractor(y, grid, &bc); let boundaries = boundary_extractor(y, grid, &bc);
RHS_upwind(op, k, y, metrics, &boundaries, wb) RHS_upwind(op, k, y, metrics, &boundaries, wb);
}; };
let mut time = 0.0; let mut time = 0.0;
let mut sys2 = self.sys.0.clone(); let mut sys2 = self.sys.0.clone();
@ -194,7 +194,7 @@ impl Clone for Field {
Self(self.0.clone()) Self(self.0.clone())
} }
fn clone_from(&mut self, source: &Self) { fn clone_from(&mut self, source: &Self) {
self.0.clone_from(&source.0) self.0.clone_from(&source.0);
} }
} }
@ -324,7 +324,7 @@ impl Field {
vortex_param: &VortexParameters, vortex_param: &VortexParameters,
) { ) {
let (rho, rhou, rhov, e) = self.components_mut(); let (rho, rhou, rhov, e) = self.components_mut();
vortex_param.evaluate(time, x, y, rho, rhou, rhov, e) vortex_param.evaluate(time, x, y, rho, rhou, rhov, e);
} }
#[allow(clippy::erasing_op, clippy::identity_op)] #[allow(clippy::erasing_op, clippy::identity_op)]
fn iter(&self) -> impl ExactSizeIterator<Item = FieldValue> + '_ { fn iter(&self) -> impl ExactSizeIterator<Item = FieldValue> + '_ {
@ -508,7 +508,7 @@ pub fn RHS_trad(
eflux in &dE.0, eflux in &dE.0,
fflux in &dF.0, fflux in &dF.0,
detj in &metrics.detj().broadcast((4, y.ny(), y.nx())).unwrap()) { detj in &metrics.detj().broadcast((4, y.ny(), y.nx())).unwrap()) {
*out = (-eflux - fflux)/detj *out = (-eflux - fflux)/detj;
}); });
SAT_characteristics(op, k, y, metrics, boundaries); SAT_characteristics(op, k, y, metrics, boundaries);
@ -555,14 +555,14 @@ pub fn RHS_no_SAT(
ad_xi in &ad_xi.0, ad_xi in &ad_xi.0,
ad_eta in &ad_eta.0, ad_eta in &ad_eta.0,
detj in &metrics.detj().broadcast((4, y.ny(), y.nx())).unwrap()) { detj in &metrics.detj().broadcast((4, y.ny(), y.nx())).unwrap()) {
*out = (-eflux - fflux + ad_xi + ad_eta)/detj *out = (-eflux - fflux + ad_xi + ad_eta)/detj;
}); });
} else { } else {
azip!((out in &mut k.0, azip!((out in &mut k.0,
eflux in &dE.0, eflux in &dE.0,
fflux in &dF.0, fflux in &dF.0,
detj in &metrics.detj().broadcast((4, y.ny(), y.nx())).unwrap()) { detj in &metrics.detj().broadcast((4, y.ny(), y.nx())).unwrap()) {
*out = (-eflux - fflux )/detj *out = (-eflux - fflux )/detj;
}); });
} }
} }
@ -609,7 +609,7 @@ pub fn RHS_upwind(
ad_xi in &ad_xi.0, ad_xi in &ad_xi.0,
ad_eta in &ad_eta.0, ad_eta in &ad_eta.0,
detj in &metrics.detj().broadcast((4, y.ny(), y.nx())).unwrap()) { detj in &metrics.detj().broadcast((4, y.ny(), y.nx())).unwrap()) {
*out = (-eflux - fflux + ad_xi + ad_eta)/detj *out = (-eflux - fflux + ad_xi + ad_eta)/detj;
}); });
SAT_characteristics(op, k, y, metrics, boundaries); SAT_characteristics(op, k, y, metrics, boundaries);
@ -687,7 +687,7 @@ fn fluxes(k: (&mut Field, &mut Field), y: &Field, metrics: &Metrics, wb: &mut Fi
let mut p = wb.rho_mut(); let mut p = wb.rho_mut();
azip!((p in &mut p, &rho in &rho, &rhou in &rhou, &rhov in &rhov, &e in &e) { azip!((p in &mut p, &rho in &rho, &rhou in &rhou, &rhov in &rhov, &e in &e) {
*p = pressure(gamma, rho, rhou, rhov, e) *p = pressure(gamma, rho, rhou, rhov, e);
}); });
let (mut c0, c1, mut c2, c3) = k.0.components_mut(); let (mut c0, c1, mut c2, c3) = k.0.components_mut();
@ -730,7 +730,7 @@ fn fluxes(k: (&mut Field, &mut Field), y: &Field, metrics: &Metrics, wb: &mut Fi
let fflux = *ff; let fflux = *ff;
*ef = j_dxi_dx * eflux + j_dxi_dy * fflux; *ef = j_dxi_dx * eflux + j_dxi_dy * fflux;
*ff = j_deta_dx * eflux + j_deta_dy * fflux; *ff = j_deta_dx * eflux + j_deta_dy * fflux;
}) });
} }
} }
@ -835,12 +835,12 @@ fn boundary_extract<'a>(
to.slice_mut(s![.., i..i + n]) to.slice_mut(s![.., i..i + n])
.assign(&seldir(&fields[g]).slice(s![.., start..end])); .assign(&seldir(&fields[g]).slice(s![.., start..end]));
remaining -= 1; remaining -= 1;
if remaining != 0 { if remaining == 0 {
to.slice_mut(s![.., i]).iter_mut().for_each(|x| *x /= 2.0);
i += n - 1;
} else {
i += n; i += n;
assert_eq!(i, to.len_of(Axis(1))); assert_eq!(i, to.len_of(Axis(1)));
} else {
to.slice_mut(s![.., i]).iter_mut().for_each(|x| *x /= 2.0);
i += n - 1;
} }
} }
to.view() to.view()
@ -880,7 +880,7 @@ pub fn boundary_extracts<'a>(
&bt.north, &bt.north,
field, field,
grid.north(), grid.north(),
|f| f.south(), Field::south,
eb.north.as_mut(), eb.north.as_mut(),
time, time,
), ),
@ -889,7 +889,7 @@ pub fn boundary_extracts<'a>(
&bt.south, &bt.south,
field, field,
grid.south(), grid.south(),
|f| f.north(), Field::north,
eb.south.as_mut(), eb.south.as_mut(),
time, time,
), ),
@ -898,7 +898,7 @@ pub fn boundary_extracts<'a>(
&bt.east, &bt.east,
field, field,
grid.east(), grid.east(),
|f| f.west(), Field::west,
eb.east.as_mut(), eb.east.as_mut(),
time, time,
), ),
@ -907,7 +907,7 @@ pub fn boundary_extracts<'a>(
&bt.west, &bt.west,
field, field,
grid.west(), grid.west(),
|f| f.east(), Field::east,
eb.west.as_mut(), eb.west.as_mut(),
time, time,
), ),
@ -994,7 +994,7 @@ fn vortexify(
fiter.next().unwrap(), fiter.next().unwrap(),
); );
let (y, x) = yx; let (y, x) = yx;
vparams.evaluate(time, x, y, rho, rhou, rhov, e) vparams.evaluate(time, x, y, rho, rhou, rhov, e);
} }
#[allow(non_snake_case)] #[allow(non_snake_case)]

24
maxwell/src/lib.rs
View File

@ -15,13 +15,13 @@ impl Clone for Field {
Self(self.0.clone()) Self(self.0.clone())
} }
fn clone_from(&mut self, source: &Self) { fn clone_from(&mut self, source: &Self) {
self.0.clone_from(&source.0) self.0.clone_from(&source.0);
} }
} }
impl integrate::Integrable for Field { impl integrate::Integrable for Field {
type State = Field; type State = Self;
type Diff = Field; type Diff = Self;
fn scaled_add(s: &mut Self::State, o: &Self::Diff, scale: Float) { fn scaled_add(s: &mut Self::State, o: &Self::Diff, scale: Float) {
s.0.scaled_add(scale, &o.0); s.0.scaled_add(scale, &o.0);
@ -153,12 +153,12 @@ impl<SBP: SbpOperator2d> System<SBP> {
let rhs_adaptor = move |fut: &mut Field, prev: &Field, _time: Float| { let rhs_adaptor = move |fut: &mut Field, prev: &Field, _time: Float| {
RHS(op, fut, prev, grid, metrics, wb); RHS(op, fut, prev, grid, metrics, wb);
}; };
let mut _time = 0.0; let mut time = 0.0;
integrate::integrate::<integrate::Rk4, Field, _>( integrate::integrate::<integrate::Rk4, Field, _>(
rhs_adaptor, rhs_adaptor,
&self.sys.0, &self.sys.0,
&mut self.sys.1, &mut self.sys.1,
&mut _time, &mut time,
dt, dt,
&mut self.wb.k, &mut self.wb.k,
); );
@ -213,12 +213,12 @@ impl<UO: SbpOperator2d + UpwindOperator2d> System<UO> {
let rhs_adaptor = move |fut: &mut Field, prev: &Field, _time: Float| { let rhs_adaptor = move |fut: &mut Field, prev: &Field, _time: Float| {
RHS_upwind(op, fut, prev, grid, metrics, wb); RHS_upwind(op, fut, prev, grid, metrics, wb);
}; };
let mut _time = 0.0; let mut time = 0.0;
integrate::integrate::<integrate::Rk4, Field, _>( integrate::integrate::<integrate::Rk4, Field, _>(
rhs_adaptor, rhs_adaptor,
&self.sys.0, &self.sys.0,
&mut self.sys.1, &mut self.sys.1,
&mut _time, &mut time,
dt, dt,
&mut self.wb.k, &mut self.wb.k,
); );
@ -487,11 +487,8 @@ fn SAT_characteristics<SBP: SbpOperator2d>(
metrics: &Metrics, metrics: &Metrics,
boundaries: &BoundaryTerms, boundaries: &BoundaryTerms,
) { ) {
let ny = y.ny();
let nx = y.nx();
fn positive_flux(kx: Float, ky: Float) -> [[Float; 3]; 3] { fn positive_flux(kx: Float, ky: Float) -> [[Float; 3]; 3] {
let r = (kx * kx + ky * ky).sqrt(); let r = Float::hypot(kx, ky);
[ [
[ky * ky / r / 2.0, ky / 2.0, -kx * ky / r / 2.0], [ky * ky / r / 2.0, ky / 2.0, -kx * ky / r / 2.0],
[ky / 2.0, r / 2.0, -kx / 2.0], [ky / 2.0, r / 2.0, -kx / 2.0],
@ -499,7 +496,7 @@ fn SAT_characteristics<SBP: SbpOperator2d>(
] ]
} }
fn negative_flux(kx: Float, ky: Float) -> [[Float; 3]; 3] { fn negative_flux(kx: Float, ky: Float) -> [[Float; 3]; 3] {
let r = (kx * kx + ky * ky).sqrt(); let r = Float::hypot(kx, ky);
[ [
[-ky * ky / r / 2.0, ky / 2.0, kx * ky / r / 2.0], [-ky * ky / r / 2.0, ky / 2.0, kx * ky / r / 2.0],
[ky / 2.0, -r / 2.0, -kx / 2.0], [ky / 2.0, -r / 2.0, -kx / 2.0],
@ -507,6 +504,9 @@ fn SAT_characteristics<SBP: SbpOperator2d>(
] ]
} }
let ny = y.ny();
let nx = y.nx();
{ {
let g = match boundaries.east { let g = match boundaries.east {
Boundary::This => y.slice(s![.., .., 0]), Boundary::This => y.slice(s![.., .., 0]),

16
sbp/src/operators.rs
View File

@ -56,11 +56,11 @@ pub trait SbpOperator2d: Send + Sync {
fn diffxi(&self, prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>) { fn diffxi(&self, prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
for (p, f) in prev.outer_iter().zip(fut.outer_iter_mut()) { for (p, f) in prev.outer_iter().zip(fut.outer_iter_mut()) {
self.op_xi().diff(p, f) self.op_xi().diff(p, f);
} }
} }
fn diffeta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn diffeta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
self.diffxi(prev.reversed_axes(), fut.reversed_axes()) self.diffxi(prev.reversed_axes(), fut.reversed_axes());
} }
fn hxi(&self) -> &'static [Float] { fn hxi(&self) -> &'static [Float] {
@ -91,12 +91,12 @@ pub trait UpwindOperator2d: Send + Sync {
fn dissxi(&self, prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>) { fn dissxi(&self, prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
for (p, f) in prev.outer_iter().zip(fut.outer_iter_mut()) { for (p, f) in prev.outer_iter().zip(fut.outer_iter_mut()) {
UpwindOperator2d::op_xi(self).diss(p, f) UpwindOperator2d::op_xi(self).diss(p, f);
} }
} }
// Assuming operator is symmetrical x/y // Assuming operator is symmetrical x/y
fn disseta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn disseta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
self.dissxi(prev.reversed_axes(), fut.reversed_axes()) self.dissxi(prev.reversed_axes(), fut.reversed_axes());
} }
fn op_xi(&self) -> &dyn UpwindOperator1d; fn op_xi(&self) -> &dyn UpwindOperator1d;
@ -114,10 +114,10 @@ pub trait InterpolationOperator: Send + Sync {
impl SbpOperator2d for (Box<dyn SbpOperator2d>, Box<dyn SbpOperator2d>) { impl SbpOperator2d for (Box<dyn SbpOperator2d>, Box<dyn SbpOperator2d>) {
fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
self.1.diffxi(prev, fut) self.1.diffxi(prev, fut);
} }
fn diffeta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn diffeta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
self.0.diffeta(prev, fut) self.0.diffeta(prev, fut);
} }
fn op_xi(&self) -> &dyn SbpOperator1d { fn op_xi(&self) -> &dyn SbpOperator1d {
@ -136,10 +136,10 @@ impl SbpOperator2d for (Box<dyn SbpOperator2d>, Box<dyn SbpOperator2d>) {
impl UpwindOperator2d for (Box<dyn UpwindOperator2d>, Box<dyn UpwindOperator2d>) { impl UpwindOperator2d for (Box<dyn UpwindOperator2d>, Box<dyn UpwindOperator2d>) {
fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
self.1.dissxi(prev, fut) self.1.dissxi(prev, fut);
} }
fn disseta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn disseta(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
self.0.disseta(prev, fut) self.0.disseta(prev, fut);
} }
fn op_xi(&self) -> &dyn UpwindOperator1d { fn op_xi(&self) -> &dyn UpwindOperator1d {
self.1.op_xi() self.1.op_xi()

12
sbp/src/operators/algos.rs
View File

@ -111,7 +111,7 @@ pub(crate) fn diff_op_1d_slice<const M: usize, const N: usize, const D: usize>(
a: &Matrix<Float, M, N>, a: &Matrix<Float, M, N>,
b: &ColVector<Float, N>, b: &ColVector<Float, N>,
) { ) {
c.matmul_float_into(a, b) c.matmul_float_into(a, b);
} }
assert_eq!(prev.len(), fut.len()); assert_eq!(prev.len(), fut.len());
@ -198,9 +198,9 @@ pub(crate) fn diff_op_1d<const M: usize, const N: usize, const D: usize>(
assert!(nx >= 2 * M); assert!(nx >= 2 * M);
if let Some((prev, fut)) = prev.as_slice().zip(fut.as_slice_mut()) { if let Some((prev, fut)) = prev.as_slice().zip(fut.as_slice_mut()) {
diff_op_1d_slice(matrix, optype, prev, fut) diff_op_1d_slice(matrix, optype, prev, fut);
} else { } else {
diff_op_1d_fallback(matrix, optype, prev, fut) diff_op_1d_fallback(matrix, optype, prev, fut);
} }
} }
@ -258,7 +258,7 @@ pub(crate) fn diff_op_2d_fallback<const M: usize, const N: usize, const D: usize
if d.is_zero() { if d.is_zero() {
continue; continue;
} }
fut.scaled_add(idx * d, &id) fut.scaled_add(idx * d, &id);
} }
} }
@ -529,7 +529,7 @@ pub(crate) fn diff_op_2d_sliceable<const M: usize, const N: usize, const D: usiz
for (prev, mut fut) in prev.outer_iter().zip(fut.outer_iter_mut()) { for (prev, mut fut) in prev.outer_iter().zip(fut.outer_iter_mut()) {
let prev = &prev.as_slice().unwrap()[..nx]; let prev = &prev.as_slice().unwrap()[..nx];
let fut = &mut fut.as_slice_mut().unwrap()[..nx]; let fut = &mut fut.as_slice_mut().unwrap()[..nx];
diff_op_1d_slice(matrix, optype, prev, fut) diff_op_1d_slice(matrix, optype, prev, fut);
} }
} }
@ -547,7 +547,7 @@ pub(crate) fn diff_op_2d<const M: usize, const N: usize, const D: usize>(
([1, _], [1, _]) ([1, _], [1, _])
if prev.as_slice_memory_order().is_some() && fut.as_slice_memory_order().is_some() => if prev.as_slice_memory_order().is_some() && fut.as_slice_memory_order().is_some() =>
{ {
diff_op_2d_sliceable_y_simd(matrix, optype, prev, fut) diff_op_2d_sliceable_y_simd(matrix, optype, prev, fut);
} }
_ => diff_op_2d_fallback(matrix, optype, prev, fut), _ => diff_op_2d_fallback(matrix, optype, prev, fut),
} }

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

@ -79,7 +79,7 @@ impl InterpolationOperator for Interpolation4 {
ndarray::arr2(Self::F2C_BLOCK).view(), ndarray::arr2(Self::F2C_BLOCK).view(),
ndarray::arr2(Self::F2C_DIAG).view(), ndarray::arr2(Self::F2C_DIAG).view(),
(3, 2), (3, 2),
) );
} }
fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) { fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) {
assert_eq!(fine.len(), 2 * coarse.len() - 1); assert_eq!(fine.len(), 2 * coarse.len() - 1);
@ -89,7 +89,7 @@ impl InterpolationOperator for Interpolation4 {
ndarray::arr2(Self::C2F_BLOCK).view(), ndarray::arr2(Self::C2F_BLOCK).view(),
ndarray::arr2(Self::C2F_DIAG).view(), ndarray::arr2(Self::C2F_DIAG).view(),
(4, 1), (4, 1),
) );
} }
} }

4
sbp/src/operators/interpolation/interpolation8.rs
View File

@ -58,7 +58,7 @@ impl InterpolationOperator for Interpolation8 {
let diag = Array::from_iter(Self::F2C_DIAG.iter().flatten().copied()) let diag = Array::from_iter(Self::F2C_DIAG.iter().flatten().copied())
.into_shape((Self::F2C_DIAG.len(), Self::F2C_DIAG[0].len())) .into_shape((Self::F2C_DIAG.len(), Self::F2C_DIAG[0].len()))
.unwrap(); .unwrap();
super::interpolate(fine, coarse, block.view(), diag.view(), (0, 2)) super::interpolate(fine, coarse, block.view(), diag.view(), (0, 2));
} }
fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) { fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) {
assert_eq!(fine.len(), 2 * coarse.len() - 1); assert_eq!(fine.len(), 2 * coarse.len() - 1);
@ -69,7 +69,7 @@ impl InterpolationOperator for Interpolation8 {
let diag = Array::from_iter(Self::C2F_DIAG.iter().flatten().copied()) let diag = Array::from_iter(Self::C2F_DIAG.iter().flatten().copied())
.into_shape((Self::C2F_DIAG.len(), Self::C2F_DIAG[0].len())) .into_shape((Self::C2F_DIAG.len(), Self::C2F_DIAG[0].len()))
.unwrap(); .unwrap();
super::interpolate(coarse, fine, block.view(), diag.view(), (8, 1)) super::interpolate(coarse, fine, block.view(), diag.view(), (8, 1));
} }
} }

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

@ -59,7 +59,7 @@ impl InterpolationOperator for Interpolation9 {
let diag = Array::from_iter(Self::F2C_DIAG.iter().flatten().copied()) let diag = Array::from_iter(Self::F2C_DIAG.iter().flatten().copied())
.into_shape((Self::F2C_DIAG.len(), Self::F2C_DIAG[0].len())) .into_shape((Self::F2C_DIAG.len(), Self::F2C_DIAG[0].len()))
.unwrap(); .unwrap();
super::interpolate(fine, coarse, block.view(), diag.view(), (5, 2)) super::interpolate(fine, coarse, block.view(), diag.view(), (5, 2));
} }
fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) { fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) {
assert_eq!(fine.len(), 2 * coarse.len() - 1); assert_eq!(fine.len(), 2 * coarse.len() - 1);
@ -70,7 +70,7 @@ impl InterpolationOperator for Interpolation9 {
let diag = Array::from_iter(Self::C2F_DIAG.iter().flatten().copied()) let diag = Array::from_iter(Self::C2F_DIAG.iter().flatten().copied())
.into_shape((Self::C2F_DIAG.len(), Self::C2F_DIAG[0].len())) .into_shape((Self::C2F_DIAG.len(), Self::C2F_DIAG[0].len()))
.unwrap(); .unwrap();
super::interpolate(coarse, fine, block.view(), diag.view(), (8, 1)) super::interpolate(coarse, fine, block.view(), diag.view(), (8, 1));
} }
} }

4
sbp/src/operators/interpolation/interpolation9h2.rs
View File

@ -59,7 +59,7 @@ impl InterpolationOperator for Interpolation9h2 {
let diag = Array::from_iter(Self::F2C_DIAG.iter().flatten().copied()) let diag = Array::from_iter(Self::F2C_DIAG.iter().flatten().copied())
.into_shape((Self::F2C_DIAG.len(), Self::F2C_DIAG[0].len())) .into_shape((Self::F2C_DIAG.len(), Self::F2C_DIAG[0].len()))
.unwrap(); .unwrap();
super::interpolate(fine, coarse, block.view(), diag.view(), (4, 2)) super::interpolate(fine, coarse, block.view(), diag.view(), (4, 2));
} }
fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) { fn coarse2fine(&self, coarse: ArrayView1<Float>, fine: ArrayViewMut1<Float>) {
assert_eq!(fine.len(), 2 * (coarse.len() - 1)); assert_eq!(fine.len(), 2 * (coarse.len() - 1));
@ -70,7 +70,7 @@ impl InterpolationOperator for Interpolation9h2 {
let diag = Array::from_iter(Self::C2F_DIAG.iter().flatten().copied()) let diag = Array::from_iter(Self::C2F_DIAG.iter().flatten().copied())
.into_shape((Self::C2F_DIAG.len(), Self::C2F_DIAG[0].len())) .into_shape((Self::C2F_DIAG.len(), Self::C2F_DIAG[0].len()))
.unwrap(); .unwrap();
super::interpolate(coarse, fine, block.view(), diag.view(), (8, 1)) super::interpolate(coarse, fine, block.view(), diag.view(), (8, 1));
} }
} }

6
sbp/src/operators/traditional4.rs
View File

@ -50,7 +50,7 @@ impl SBP4 {
impl SbpOperator1d for SBP4 { impl SbpOperator1d for SBP4 {
fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DIFF, super::OperatorType::Normal, prev, fut) super::diff_op_1d(&Self::DIFF, super::OperatorType::Normal, prev, fut);
} }
fn h(&self) -> &'static [Float] { fn h(&self) -> &'static [Float] {
@ -74,7 +74,7 @@ impl SbpOperator1d for SBP4 {
impl SbpOperator2d for SBP4 { impl SbpOperator2d for SBP4 {
fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DIFF, OperatorType::Normal, prev, fut) super::diff_op_2d(&Self::DIFF, OperatorType::Normal, prev, fut);
} }
fn op_xi(&self) -> &dyn SbpOperator1d { fn op_xi(&self) -> &dyn SbpOperator1d {
&Self &Self
@ -85,7 +85,7 @@ impl super::SbpOperator1d2 for SBP4 {
fn diff2(&self, prev: ArrayView1<Float>, mut fut: ArrayViewMut1<Float>) { fn diff2(&self, prev: ArrayView1<Float>, mut fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::D2, OperatorType::Normal, prev, fut.view_mut()); super::diff_op_1d(&Self::D2, OperatorType::Normal, prev, fut.view_mut());
let hi = (prev.len() - 1) as Float; let hi = (prev.len() - 1) as Float;
fut.map_inplace(|x| *x *= hi) fut.map_inplace(|x| *x *= hi);
} }
fn d1(&self) -> &[Float] { fn d1(&self) -> &[Float] {
&[-88.0 / 17.0, 144.0 / 17.0, -72.0 / 17.0, 16.0 / 17.0] &[-88.0 / 17.0, 144.0 / 17.0, -72.0 / 17.0, 16.0 / 17.0]

4
sbp/src/operators/traditional8.rs
View File

@ -36,7 +36,7 @@ impl SBP8 {
impl SbpOperator1d for SBP8 { impl SbpOperator1d for SBP8 {
fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DIFF, super::OperatorType::Normal, prev, fut) super::diff_op_1d(&Self::DIFF, super::OperatorType::Normal, prev, fut);
} }
fn h(&self) -> &'static [Float] { fn h(&self) -> &'static [Float] {
@ -56,7 +56,7 @@ impl SbpOperator1d for SBP8 {
impl SbpOperator2d for SBP8 { impl SbpOperator2d for SBP8 {
fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DIFF, OperatorType::Normal, prev, fut) super::diff_op_2d(&Self::DIFF, OperatorType::Normal, prev, fut);
} }
fn op_xi(&self) -> &dyn SbpOperator1d { fn op_xi(&self) -> &dyn SbpOperator1d {
&Self &Self

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

@ -51,7 +51,7 @@ impl Upwind4 {
impl SbpOperator1d for Upwind4 { impl SbpOperator1d for Upwind4 {
fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DIFF, super::OperatorType::Normal, prev, fut) super::diff_op_1d(&Self::DIFF, super::OperatorType::Normal, prev, fut);
} }
fn h(&self) -> &'static [Float] { fn h(&self) -> &'static [Float] {
&Self::H.start &Self::H.start
@ -173,7 +173,7 @@ fn upwind4_test() {
impl UpwindOperator1d for Upwind4 { impl UpwindOperator1d for Upwind4 {
fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DISS, super::OperatorType::Normal, prev, fut) super::diff_op_1d(&Self::DISS, super::OperatorType::Normal, prev, fut);
} }
fn as_sbp(&self) -> &dyn SbpOperator1d { fn as_sbp(&self) -> &dyn SbpOperator1d {
@ -190,7 +190,7 @@ impl UpwindOperator2d for Upwind4 {
fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DISS, OperatorType::Normal, prev, fut) super::diff_op_2d(&Self::DISS, OperatorType::Normal, prev, fut);
} }
fn op_xi(&self) -> &dyn UpwindOperator1d { fn op_xi(&self) -> &dyn UpwindOperator1d {

8
sbp/src/operators/upwind4h2.rs
View File

@ -53,7 +53,7 @@ impl Upwind4h2 {
impl SbpOperator1d for Upwind4h2 { impl SbpOperator1d for Upwind4h2 {
fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DIFF, OperatorType::H2, prev, fut) super::diff_op_1d(&Self::DIFF, OperatorType::H2, prev, fut);
} }
fn h(&self) -> &'static [Float] { fn h(&self) -> &'static [Float] {
@ -81,7 +81,7 @@ impl SbpOperator2d for Upwind4h2 {
fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DIFF, OperatorType::H2, prev, fut) super::diff_op_2d(&Self::DIFF, OperatorType::H2, prev, fut);
} }
fn op_xi(&self) -> &dyn SbpOperator1d { fn op_xi(&self) -> &dyn SbpOperator1d {
&Self &Self
@ -95,7 +95,7 @@ impl UpwindOperator2d for Upwind4h2 {
fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DISS, OperatorType::H2, prev, fut) super::diff_op_2d(&Self::DISS, OperatorType::H2, prev, fut);
} }
fn op_xi(&self) -> &dyn UpwindOperator1d { fn op_xi(&self) -> &dyn UpwindOperator1d {
&Self &Self
@ -129,7 +129,7 @@ fn upwind4h2_test() {
impl UpwindOperator1d for Upwind4h2 { impl UpwindOperator1d for Upwind4h2 {
fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DISS, super::OperatorType::H2, prev, fut) super::diff_op_1d(&Self::DISS, super::OperatorType::H2, prev, fut);
} }
fn as_sbp(&self) -> &dyn SbpOperator1d { fn as_sbp(&self) -> &dyn SbpOperator1d {

8
sbp/src/operators/upwind9.rs
View File

@ -59,7 +59,7 @@ impl Upwind9 {
impl SbpOperator1d for Upwind9 { impl SbpOperator1d for Upwind9 {
fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DIFF, super::OperatorType::Normal, prev, fut) super::diff_op_1d(&Self::DIFF, super::OperatorType::Normal, prev, fut);
} }
fn h(&self) -> &'static [Float] { fn h(&self) -> &'static [Float] {
@ -84,7 +84,7 @@ impl SbpOperator2d for Upwind9 {
fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DIFF, OperatorType::Normal, prev, fut) super::diff_op_2d(&Self::DIFF, OperatorType::Normal, prev, fut);
} }
fn op_xi(&self) -> &dyn SbpOperator1d { fn op_xi(&self) -> &dyn SbpOperator1d {
&Self &Self
@ -96,7 +96,7 @@ impl SbpOperator2d for Upwind9 {
impl UpwindOperator1d for Upwind9 { impl UpwindOperator1d for Upwind9 {
fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DISS, super::OperatorType::Normal, prev, fut) super::diff_op_1d(&Self::DISS, super::OperatorType::Normal, prev, fut);
} }
fn as_sbp(&self) -> &dyn SbpOperator1d { fn as_sbp(&self) -> &dyn SbpOperator1d {
@ -112,7 +112,7 @@ impl UpwindOperator1d for Upwind9 {
impl UpwindOperator2d for Upwind9 { impl UpwindOperator2d for Upwind9 {
fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DISS, OperatorType::Normal, prev, fut) super::diff_op_2d(&Self::DISS, OperatorType::Normal, prev, fut);
} }
fn op_xi(&self) -> &dyn UpwindOperator1d { fn op_xi(&self) -> &dyn UpwindOperator1d {
&Self &Self

8
sbp/src/operators/upwind9h2.rs
View File

@ -59,7 +59,7 @@ impl Upwind9h2 {
impl SbpOperator1d for Upwind9h2 { impl SbpOperator1d for Upwind9h2 {
fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diff(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DIFF, super::OperatorType::H2, prev, fut) super::diff_op_1d(&Self::DIFF, super::OperatorType::H2, prev, fut);
} }
fn h(&self) -> &'static [Float] { fn h(&self) -> &'static [Float] {
@ -87,7 +87,7 @@ impl SbpOperator2d for Upwind9h2 {
fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn diffxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DIFF, OperatorType::H2, prev, fut) super::diff_op_2d(&Self::DIFF, OperatorType::H2, prev, fut);
} }
fn op_xi(&self) -> &dyn SbpOperator1d { fn op_xi(&self) -> &dyn SbpOperator1d {
&Self &Self
@ -124,7 +124,7 @@ fn upwind9h2_test() {
impl UpwindOperator1d for Upwind9h2 { impl UpwindOperator1d for Upwind9h2 {
fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) { fn diss(&self, prev: ArrayView1<Float>, fut: ArrayViewMut1<Float>) {
super::diff_op_1d(&Self::DISS, super::OperatorType::H2, prev, fut) super::diff_op_1d(&Self::DISS, super::OperatorType::H2, prev, fut);
} }
fn as_sbp(&self) -> &dyn SbpOperator1d { fn as_sbp(&self) -> &dyn SbpOperator1d {
self self
@ -140,7 +140,7 @@ impl UpwindOperator2d for Upwind9h2 {
fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) { fn dissxi(&self, prev: ArrayView2<Float>, fut: ArrayViewMut2<Float>) {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
super::diff_op_2d(&Self::DISS, OperatorType::H2, prev, fut) super::diff_op_2d(&Self::DISS, OperatorType::H2, prev, fut);
} }
fn op_xi(&self) -> &dyn UpwindOperator1d { fn op_xi(&self) -> &dyn UpwindOperator1d {
&Self &Self

4
shallow_water/src/lib.rs
View File

@ -19,8 +19,8 @@ impl Clone for Field {
} }
impl integrate::Integrable for Field { impl integrate::Integrable for Field {
type State = Field; type State = Self;
type Diff = Field; type Diff = Self;
fn scaled_add(s: &mut Self::State, o: &Self::Diff, scale: Float) { fn scaled_add(s: &mut Self::State, o: &Self::Diff, scale: Float) {
s.0.scaled_add(scale, &o.0); s.0.scaled_add(scale, &o.0);