Move integrate to separate crate

multigrid/Cargo.toml

@@ -6,9 +6,10 @@ edition = "2018"
 
 
 [dependencies]
-sbp = { path = "../sbp", features = ["rayon", "serde1", "fast-float"] }
+sbp = { path = "../sbp", features = ["serde1", "fast-float"] }
 euler = { path = "../euler", features = ["serde1"] }
 hdf5 = "0.7.0"
+integrate = { path = "../utils/integrate", features = ["rayon"] }
 rayon = "1.3.0"
 indicatif = "0.15.0"
 structopt = "0.3.14"

multigrid/src/file.rs

@@ -38,7 +38,8 @@ impl OutputThread {
         match self.rx.as_ref().unwrap().try_recv() {
             Ok(mut copy_fields) => {
                 for (from, to) in fields.iter().zip(copy_fields.iter_mut()) {
-                    to.assign(&from);
+                    use integrate::Integrable;
+                    euler::Field::assign(to, from);
                 }
                 self.tx
                     .as_ref()

multigrid/src/main.rs

@@ -106,7 +106,7 @@ impl System {
             .iter_mut()
             .map(|k| k.as_mut_slice())
             .collect::<Vec<_>>();
-        sbp::integrate::integrate_multigrid::<sbp::integrate::Rk4, _, _, _>(
+        integrate::integrate_multigrid::<integrate::Rk4, euler::Field, _>(
             rhs,
             &self.fnow,
             &mut self.fnext,