rename integrate_rk4

This commit is contained in:
Magnus Ulimoen 2020-01-29 21:16:09 +01:00
parent 3229554d6b
commit fc5565dbcd
3 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
use super::integrate::integrate_rk4; use super::integrate;
use super::operators::{SbpOperator, UpwindOperator}; use super::operators::{SbpOperator, UpwindOperator};
use super::Grid; use super::Grid;
use ndarray::azip; use ndarray::azip;
@ -29,7 +29,7 @@ impl<SBP: SbpOperator> System<SBP> {
} }
pub fn advance(&mut self, dt: f32) { pub fn advance(&mut self, dt: f32) {
integrate_rk4( integrate::rk4(
RHS_trad, RHS_trad,
&self.sys.0, &self.sys.0,
&mut self.sys.1, &mut self.sys.1,
@ -96,7 +96,7 @@ impl<SBP: SbpOperator> System<SBP> {
impl<UO: UpwindOperator> System<UO> { impl<UO: UpwindOperator> System<UO> {
pub fn advance_upwind(&mut self, dt: f32) { pub fn advance_upwind(&mut self, dt: f32) {
integrate_rk4( integrate::rk4(
RHS_upwind, RHS_upwind,
&self.sys.0, &self.sys.0,
&mut self.sys.1, &mut self.sys.1,

View File

@ -2,7 +2,7 @@ use super::grid::Grid;
use super::operators::SbpOperator; use super::operators::SbpOperator;
use ndarray::{Array3, Zip}; 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, rhs: RHS,
prev: &F, prev: &F,
fut: &mut F, fut: &mut F,

View File

@ -1,4 +1,4 @@
use super::integrate::integrate_rk4; use super::integrate;
use super::operators::{SbpOperator, UpwindOperator}; use super::operators::{SbpOperator, UpwindOperator};
use super::Grid; use super::Grid;
use ndarray::azip; use ndarray::azip;
@ -106,7 +106,7 @@ impl<SBP: SbpOperator> System<SBP> {
} }
pub fn advance(&mut self, dt: f32) { pub fn advance(&mut self, dt: f32) {
integrate_rk4( integrate::rk4(
RHS, RHS,
&self.sys.0, &self.sys.0,
&mut self.sys.1, &mut self.sys.1,
@ -122,7 +122,7 @@ impl<SBP: SbpOperator> System<SBP> {
impl<UO: UpwindOperator> System<UO> { impl<UO: UpwindOperator> System<UO> {
/// Using artificial dissipation with the upwind operator /// Using artificial dissipation with the upwind operator
pub fn advance_upwind(&mut self, dt: f32) { pub fn advance_upwind(&mut self, dt: f32) {
integrate_rk4( integrate::rk4(
RHS_upwind, RHS_upwind,
&self.sys.0, &self.sys.0,
&mut self.sys.1, &mut self.sys.1,