diff_op_col as function factory

This commit is contained in:
Magnus Ulimoen
2020-04-29 19:59:48 +02:00
parent ff2a141505
commit cc5399a940
6 changed files with 56 additions and 76 deletions

View File

@@ -43,7 +43,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &SBP4) {
diff_op_row(SBP4::BLOCK, SBP4::DIAG, false, false)(prev, fut);
}
([1, _], [1, _]) => {
diff_op_col(SBP4::BLOCK, SBP4::DIAG, false, false, prev, fut);
diff_op_col(SBP4::BLOCK, SBP4::DIAG, false, false)(prev, fut);
}
([_, _], [_, _]) => {
// Fallback, work row by row

View File

@@ -47,7 +47,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &SBP8) {
diff_op_row(SBP8::BLOCK, SBP8::DIAG, false, false)(prev, fut);
}
([1, _], [1, _]) => {
diff_op_col(SBP8::BLOCK, SBP8::DIAG, false, false, prev, fut);
diff_op_col(SBP8::BLOCK, SBP8::DIAG, false, false)(prev, fut);
}
([_, _], [_, _]) => {
// Fallback, work row by row

View File

@@ -61,7 +61,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &Upwind4h2) {
diff_op_row(Upwind4h2::BLOCK, Upwind4h2::DIAG, false, true)(prev, fut);
}
([1, _], [1, _]) => {
diff_op_col(Upwind4h2::BLOCK, Upwind4h2::DIAG, false, true, prev, fut);
diff_op_col(Upwind4h2::BLOCK, Upwind4h2::DIAG, false, true)(prev, fut);
}
([_, _], [_, _]) => {
// Fallback, work row by row
@@ -84,14 +84,7 @@ impl<UO: UpwindOperator1d> UpwindOperator2d for (&UO, &Upwind4h2) {
diff_op_row(Upwind4h2::DISS_BLOCK, Upwind4h2::DISS_DIAG, true, true)(prev, fut);
}
([1, _], [1, _]) => {
diff_op_col(
Upwind4h2::DISS_BLOCK,
Upwind4h2::DISS_DIAG,
true,
true,
prev,
fut,
);
diff_op_col(Upwind4h2::DISS_BLOCK, Upwind4h2::DISS_DIAG, true, true)(prev, fut);
}
([_, _], [_, _]) => {
// Fallback, work row by row

View File

@@ -66,7 +66,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &Upwind9) {
diff_op_row(Upwind9::BLOCK, Upwind9::DIAG, false, false)(prev, fut);
}
([1, _], [1, _]) => {
diff_op_col(Upwind9::BLOCK, Upwind9::DIAG, false, false, prev, fut);
diff_op_col(Upwind9::BLOCK, Upwind9::DIAG, false, false)(prev, fut);
}
([_, _], [_, _]) => {
// Fallback, work row by row
@@ -99,14 +99,7 @@ impl<UO: UpwindOperator1d> UpwindOperator2d for (&UO, &Upwind9) {
diff_op_row(Upwind9::DISS_BLOCK, Upwind9::DISS_DIAG, true, false)(prev, fut);
}
([1, _], [1, _]) => {
diff_op_col(
Upwind9::DISS_BLOCK,
Upwind9::DISS_DIAG,
true,
false,
prev,
fut,
);
diff_op_col(Upwind9::DISS_BLOCK, Upwind9::DISS_DIAG, true, false)(prev, fut);
}
([_, _], [_, _]) => {
// Fallback, work row by row

View File

@@ -69,7 +69,7 @@ impl<SBP: SbpOperator1d> SbpOperator2d for (&SBP, &Upwind9h2) {
diff_op_row(Upwind9h2::BLOCK, Upwind9h2::DIAG, false, true)(prev, fut);
}
([1, _], [1, _]) => {
diff_op_col(Upwind9h2::BLOCK, Upwind9h2::DIAG, false, true, prev, fut);
diff_op_col(Upwind9h2::BLOCK, Upwind9h2::DIAG, false, true)(prev, fut);
}
([_, _], [_, _]) => {
// Fallback, work row by row
@@ -126,14 +126,7 @@ impl<UO: UpwindOperator1d> UpwindOperator2d for (&UO, &Upwind9h2) {
diff_op_row(Upwind9h2::DISS_BLOCK, Upwind9h2::DISS_DIAG, true, true)(prev, fut);
}
([1, _], [1, _]) => {
diff_op_col(
Upwind9h2::DISS_BLOCK,
Upwind9h2::DISS_DIAG,
true,
true,
prev,
fut,
);
diff_op_col(Upwind9h2::DISS_BLOCK, Upwind9h2::DISS_DIAG, true, true)(prev, fut);
}
([_, _], [_, _]) => {
// Fallback, work row by row