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

diff_op_row as function factory

This commit is contained in:
Magnus Ulimoen 2020-04-29 19:52:55 +02:00
parent 615b2a6990
commit ff2a141505
6 changed files with 60 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sbp/src/operators.rs
View File

@ -232,13 +232,13 @@ pub(crate) fn diff_op_col(
#[inline(always)] #[inline(always)]
pub(crate) fn diff_op_row( pub(crate) fn diff_op_row(
block: &[&[Float]], block: &'static [&'static [Float]],
diag: &[Float], diag: &'static [Float],
symmetric: bool, symmetric: bool,
is_h2: bool, is_h2: bool,
prev: ArrayView2<Float>, ) -> impl Fn(ArrayView2<Float>, ArrayViewMut2<Float>) {
mut fut: ArrayViewMut2<Float>, #[inline(always)]
) { move |prev: ArrayView2<Float>, mut fut: ArrayViewMut2<Float>| {
assert_eq!(prev.shape(), fut.shape()); assert_eq!(prev.shape(), fut.shape());
let nx = prev.shape()[1]; let nx = prev.shape()[1];
assert!(nx >= 2 * block.len()); assert!(nx >= 2 * block.len());
@ -294,6 +294,7 @@ pub(crate) fn diff_op_row(
} }
} }
} }
}
mod upwind4; mod upwind4;
pub use upwind4::Upwind4; pub use upwind4::Upwind4;

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

@ -40,7 +40,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &SBP4) {
match (prev.strides(), fut.strides()) { match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => { ([_, 1], [_, 1]) => {
diff_op_row(SBP4::BLOCK, SBP4::DIAG, false, false, prev, fut); diff_op_row(SBP4::BLOCK, SBP4::DIAG, false, false)(prev, fut);
} }
([1, _], [1, _]) => { ([1, _], [1, _]) => {
diff_op_col(SBP4::BLOCK, SBP4::DIAG, false, false, prev, fut); diff_op_col(SBP4::BLOCK, SBP4::DIAG, false, false, prev, fut);

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

@ -44,7 +44,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &SBP8) {
match (prev.strides(), fut.strides()) { match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => { ([_, 1], [_, 1]) => {
diff_op_row(SBP8::BLOCK, SBP8::DIAG, false, false, prev, fut); diff_op_row(SBP8::BLOCK, SBP8::DIAG, false, false)(prev, fut);
} }
([1, _], [1, _]) => { ([1, _], [1, _]) => {
diff_op_col(SBP8::BLOCK, SBP8::DIAG, false, false, prev, fut); diff_op_col(SBP8::BLOCK, SBP8::DIAG, false, false, prev, fut);

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

@ -58,7 +58,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &Upwind4h2) {
match (prev.strides(), fut.strides()) { match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => { ([_, 1], [_, 1]) => {
diff_op_row(Upwind4h2::BLOCK, Upwind4h2::DIAG, false, true, prev, fut); diff_op_row(Upwind4h2::BLOCK, Upwind4h2::DIAG, false, true)(prev, fut);
} }
([1, _], [1, _]) => { ([1, _], [1, _]) => {
diff_op_col(Upwind4h2::BLOCK, Upwind4h2::DIAG, false, true, prev, fut); diff_op_col(Upwind4h2::BLOCK, Upwind4h2::DIAG, false, true, prev, fut);
@ -81,14 +81,7 @@ impl<UO: UpwindOperator1d> UpwindOperator2d for (&UO, &Upwind4h2) {
match (prev.strides(), fut.strides()) { match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => { ([_, 1], [_, 1]) => {
diff_op_row( diff_op_row(Upwind4h2::DISS_BLOCK, Upwind4h2::DISS_DIAG, true, true)(prev, fut);
Upwind4h2::DISS_BLOCK,
Upwind4h2::DISS_DIAG,
true,
true,
prev,
fut,
);
} }
([1, _], [1, _]) => { ([1, _], [1, _]) => {
diff_op_col( diff_op_col(

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

@ -63,7 +63,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &Upwind9) {
match (prev.strides(), fut.strides()) { match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => { ([_, 1], [_, 1]) => {
diff_op_row(Upwind9::BLOCK, Upwind9::DIAG, false, false, prev, fut); diff_op_row(Upwind9::BLOCK, Upwind9::DIAG, false, false)(prev, fut);
} }
([1, _], [1, _]) => { ([1, _], [1, _]) => {
diff_op_col(Upwind9::BLOCK, Upwind9::DIAG, false, false, prev, fut); diff_op_col(Upwind9::BLOCK, Upwind9::DIAG, false, false, prev, fut);
@ -96,14 +96,7 @@ impl<UO: UpwindOperator1d> UpwindOperator2d for (&UO, &Upwind9) {
match (prev.strides(), fut.strides()) { match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => { ([_, 1], [_, 1]) => {
diff_op_row( diff_op_row(Upwind9::DISS_BLOCK, Upwind9::DISS_DIAG, true, false)(prev, fut);
Upwind9::DISS_BLOCK,
Upwind9::DISS_DIAG,
true,
false,
prev,
fut,
);
} }
([1, _], [1, _]) => { ([1, _], [1, _]) => {
diff_op_col( diff_op_col(

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

@ -66,7 +66,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &Upwind9h2) {
match (prev.strides(), fut.strides()) { match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => { ([_, 1], [_, 1]) => {
diff_op_row(Upwind9h2::BLOCK, Upwind9h2::DIAG, false, true, prev, fut); diff_op_row(Upwind9h2::BLOCK, Upwind9h2::DIAG, false, true)(prev, fut);
} }
([1, _], [1, _]) => { ([1, _], [1, _]) => {
diff_op_col(Upwind9h2::BLOCK, Upwind9h2::DIAG, false, true, prev, fut); diff_op_col(Upwind9h2::BLOCK, Upwind9h2::DIAG, false, true, prev, fut);
@ -123,14 +123,7 @@ impl<UO: UpwindOperator1d> UpwindOperator2d for (&UO, &Upwind9h2) {
match (prev.strides(), fut.strides()) { match (prev.strides(), fut.strides()) {
([_, 1], [_, 1]) => { ([_, 1], [_, 1]) => {
diff_op_row( diff_op_row(Upwind9h2::DISS_BLOCK, Upwind9h2::DISS_DIAG, true, true)(prev, fut);
Upwind9h2::DISS_BLOCK,
Upwind9h2::DISS_DIAG,
true,
true,
prev,
fut,
);
} }
([1, _], [1, _]) => { ([1, _], [1, _]) => {
diff_op_col( diff_op_col(