From 9bf2a1513cf9aa0375c0c945c520d02c23dece5d Mon Sep 17 00:00:00 2001
From: Magnus Ulimoen <flymagnus@gmail.com>
Date: Sat, 11 Apr 2020 19:56:44 +0200
Subject: [PATCH] use explicit integration routine

---
 sbp/src/euler.rs     |  4 ++--
 sbp/src/integrate.rs | 18 ------------------
 sbp/src/maxwell.rs   |  4 ++--
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/sbp/src/euler.rs b/sbp/src/euler.rs
index 99b74ab..90b9ea3 100644
--- a/sbp/src/euler.rs
+++ b/sbp/src/euler.rs
@@ -43,7 +43,7 @@ impl<SBP: SbpOperator> System<SBP> {
             let boundaries = boundary_extractor(y, grid, &bc);
             RHS_trad(k, y, metrics, &boundaries, wb)
         };
-        integrate::rk4(
+        integrate::integrate::<integrate::Rk4, _, _, _, _>(
             rhs_trad,
             &self.sys.0,
             &mut self.sys.1,
@@ -103,7 +103,7 @@ impl<UO: UpwindOperator> System<UO> {
             let boundaries = boundary_extractor(y, grid, &bc);
             RHS_upwind(k, y, metrics, &boundaries, wb)
         };
-        integrate::rk4(
+        integrate::integrate::<integrate::Rk4, _, _, _, _>(
             rhs_upwind,
             &self.sys.0,
             &mut self.sys.1,
diff --git a/sbp/src/integrate.rs b/sbp/src/integrate.rs
index 68cef3c..9214f6e 100644
--- a/sbp/src/integrate.rs
+++ b/sbp/src/integrate.rs
@@ -140,21 +140,3 @@ pub fn integrate<'a, BTableau, F: 'a, RHS, MT, C>(
         rhs(&mut k[i], &fut, simtime, constants, &mut mutables);
     }
 }
-
-pub(crate) fn rk4<'a, F: 'a, RHS, MT, C>(
-    rhs: RHS,
-    prev: &F,
-    fut: &mut F,
-    time: &mut Float,
-    dt: Float,
-    k: &mut [F; 4],
-
-    constants: C,
-    mutables: &mut MT,
-) where
-    C: Copy,
-    F: std::ops::Deref<Target = Array3<Float>> + std::ops::DerefMut<Target = Array3<Float>>,
-    RHS: Fn(&mut F, &F, Float, C, &mut MT),
-{
-    integrate::<Rk6, F, RHS, MT, C>(rhs, prev, fut, time, dt, k, constants, mutables)
-}
diff --git a/sbp/src/maxwell.rs b/sbp/src/maxwell.rs
index d26d4e8..e253944 100644
--- a/sbp/src/maxwell.rs
+++ b/sbp/src/maxwell.rs
@@ -126,7 +126,7 @@ impl<SBP: SbpOperator> System<SBP> {
             RHS(fut, prev, grid, metrics, m);
         }
         let mut _time = 0.0;
-        integrate::rk4(
+        integrate::integrate::<integrate::Rk4, _, _, _, _>(
             rhs_adaptor,
             &self.sys.0,
             &mut self.sys.1,
@@ -154,7 +154,7 @@ impl<UO: UpwindOperator> System<UO> {
             RHS_upwind(fut, prev, grid, metrics, m);
         }
         let mut _time = 0.0;
-        integrate::rk4(
+        integrate::integrate::<integrate::Rk4, _, _, _, _>(
             rhs_adaptor,
             &self.sys.0,
             &mut self.sys.1,