From fe2c7f1253b0bd694337cb1b6084f60fcc442987 Mon Sep 17 00:00:00 2001
From: Magnus Ulimoen <flymagnus@gmail.com>
Date: Wed, 8 Apr 2020 23:22:03 +0200
Subject: [PATCH] simplify macro invocation

---
 sbp/src/operators.rs              | 3 +++
 sbp/src/operators/traditional4.rs | 2 +-
 sbp/src/operators/traditional8.rs | 2 +-
 sbp/src/operators/upwind4.rs      | 2 +-
 sbp/src/operators/upwind9.rs      | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sbp/src/operators.rs b/sbp/src/operators.rs
index 1e6d82f..8109d01 100644
--- a/sbp/src/operators.rs
+++ b/sbp/src/operators.rs
@@ -34,6 +34,9 @@ pub trait UpwindOperator: SbpOperator {
 
 #[macro_export]
 macro_rules! diff_op_1d {
+    ($name: ident, $BLOCK: expr, $DIAG: expr) => {
+        diff_op_1d!($name, $BLOCK, $DIAG, false);
+    };
     ($name: ident, $BLOCK: expr, $DIAG: expr, $symmetric: expr) => {
         fn $name(prev: ArrayView1<Float>, mut fut: ArrayViewMut1<Float>) {
             assert_eq!(prev.shape(), fut.shape());
diff --git a/sbp/src/operators/traditional4.rs b/sbp/src/operators/traditional4.rs
index e856f8f..eac5b66 100644
--- a/sbp/src/operators/traditional4.rs
+++ b/sbp/src/operators/traditional4.rs
@@ -6,7 +6,7 @@ use ndarray::{s, ArrayView1, ArrayViewMut1};
 #[derive(Debug)]
 pub struct SBP4 {}
 
-diff_op_1d!(diff_1d, SBP4::BLOCK, SBP4::DIAG, false);
+diff_op_1d!(diff_1d, SBP4::BLOCK, SBP4::DIAG);
 
 impl SBP4 {
     #[rustfmt::skip]
diff --git a/sbp/src/operators/traditional8.rs b/sbp/src/operators/traditional8.rs
index 3b2f44f..8b270bb 100644
--- a/sbp/src/operators/traditional8.rs
+++ b/sbp/src/operators/traditional8.rs
@@ -6,7 +6,7 @@ use ndarray::{s, ArrayView1, ArrayViewMut1};
 #[derive(Debug)]
 pub struct SBP8 {}
 
-diff_op_1d!(diff_1d, SBP8::BLOCK, SBP8::DIAG, false);
+diff_op_1d!(diff_1d, SBP8::BLOCK, SBP8::DIAG);
 
 impl SBP8 {
     #[rustfmt::skip]
diff --git a/sbp/src/operators/upwind4.rs b/sbp/src/operators/upwind4.rs
index acb79e6..d352ebf 100644
--- a/sbp/src/operators/upwind4.rs
+++ b/sbp/src/operators/upwind4.rs
@@ -12,7 +12,7 @@ type SimdT = packed_simd::f32x8;
 #[cfg(not(feature = "f32"))]
 type SimdT = packed_simd::f64x8;
 
-diff_op_1d!(diff_1d, Upwind4::BLOCK, Upwind4::DIAG, false);
+diff_op_1d!(diff_1d, Upwind4::BLOCK, Upwind4::DIAG);
 diff_op_1d!(diss_1d, Upwind4::DISS_BLOCK, Upwind4::DISS_DIAG, true);
 
 macro_rules! diff_simd_row_7_47 {
diff --git a/sbp/src/operators/upwind9.rs b/sbp/src/operators/upwind9.rs
index 1db5fa1..849a1b2 100644
--- a/sbp/src/operators/upwind9.rs
+++ b/sbp/src/operators/upwind9.rs
@@ -6,7 +6,7 @@ use ndarray::{s, ArrayView1, ArrayViewMut1};
 #[derive(Debug)]
 pub struct Upwind9 {}
 
-diff_op_1d!(diff_1d, Upwind9::BLOCK, Upwind9::DIAG, false);
+diff_op_1d!(diff_1d, Upwind9::BLOCK, Upwind9::DIAG);
 diff_op_1d!(diss_1d, Upwind9::DISS_BLOCK, Upwind9::DISS_DIAG, true);
 
 impl Upwind9 {