diff --git a/src/euler.rs b/src/euler.rs index 876a479..86b0614 100644 --- a/src/euler.rs +++ b/src/euler.rs @@ -1,4 +1,4 @@ -use super::integrate::integrate_rk4; +use super::integrate; use super::operators::{SbpOperator, UpwindOperator}; use super::Grid; use ndarray::azip; @@ -29,7 +29,7 @@ impl System { } pub fn advance(&mut self, dt: f32) { - integrate_rk4( + integrate::rk4( RHS_trad, &self.sys.0, &mut self.sys.1, @@ -96,7 +96,7 @@ impl System { impl System { pub fn advance_upwind(&mut self, dt: f32) { - integrate_rk4( + integrate::rk4( RHS_upwind, &self.sys.0, &mut self.sys.1, diff --git a/src/integrate.rs b/src/integrate.rs index 57f26e4..80c6a63 100644 --- a/src/integrate.rs +++ b/src/integrate.rs @@ -2,7 +2,7 @@ use super::grid::Grid; use super::operators::SbpOperator; use ndarray::{Array3, Zip}; -pub(crate) fn integrate_rk4<'a, F: 'a, SBP, RHS, WB>( +pub(crate) fn rk4<'a, F: 'a, SBP, RHS, WB>( rhs: RHS, prev: &F, fut: &mut F, diff --git a/src/maxwell.rs b/src/maxwell.rs index d5fb860..a123523 100644 --- a/src/maxwell.rs +++ b/src/maxwell.rs @@ -1,4 +1,4 @@ -use super::integrate::integrate_rk4; +use super::integrate; use super::operators::{SbpOperator, UpwindOperator}; use super::Grid; use ndarray::azip; @@ -106,7 +106,7 @@ impl System { } pub fn advance(&mut self, dt: f32) { - integrate_rk4( + integrate::rk4( RHS, &self.sys.0, &mut self.sys.1, @@ -122,7 +122,7 @@ impl System { impl System { /// Using artificial dissipation with the upwind operator pub fn advance_upwind(&mut self, dt: f32) { - integrate_rk4( + integrate::rk4( RHS_upwind, &self.sys.0, &mut self.sys.1,