mulimoen/SummationByParts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

relax Fn bound on integrate functions

Browse Source
This commit is contained in:
Magnus Ulimoen
2020-04-13 18:39:21 +02:00
parent fe2621df11
commit 2adf91e1ce
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sbp/src/integrate.rs
View File

@@ -89,7 +89,7 @@ impl ButcherTableau for Rk6 {
#[allow(clippy::too_many_arguments)]
pub fn integrate<'a, BTableau, F: 'a, RHS, MT, C>(
rhs: RHS,
mut rhs: RHS,
prev: &F,
fut: &mut F,
time: &mut Float,
@@ -101,7 +101,7 @@ pub fn integrate<'a, BTableau, F: 'a, RHS, MT, C>(
) 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),
RHS: FnMut(&mut F, &F, Float, C, &mut MT),
BTableau: ButcherTableau,
{
assert_eq!(prev.shape(), fut.shape());
@@ -147,7 +147,7 @@ pub fn integrate<'a, BTableau, F: 'a, RHS, MT, C>(
#[cfg(feature = "rayon")]
#[allow(clippy::too_many_arguments)]
pub fn integrate_multigrid<'a, BTableau, F: 'a, RHS, MT, C>(
rhs: RHS,
mut rhs: RHS,
prev: &[F],
fut: &mut [F],
time: &mut Float,
@@ -163,7 +163,7 @@ pub fn integrate_multigrid<'a, BTableau, F: 'a, RHS, MT, C>(
+ std::ops::DerefMut<Target = Array3<Float>>
+ Send
+ Sync,
RHS: Fn(&mut [F], &[F], Float, C, &mut MT),
RHS: FnMut(&mut [F], &[F], Float, C, &mut MT),
BTableau: ButcherTableau,
{
for i in 0.. {