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

move boundary extraction into parallel section

Browse Source
This commit is contained in:
Magnus Ulimoen
2020-04-22 22:22:19 +02:00
parent dd7edd46d5
commit 35c4b25be3
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
multigrid/src/main.rs
View File

@@ -81,26 +81,31 @@ impl System {
let grids = &self.grids;
let bt = &self.bt;
let wb = &mut self.wb;
let mut eb = &mut self.eb;
let eb = &mut self.eb;
let operators = &self.operators;
let rhs = move |fut: &mut [euler::Field], prev: &[euler::Field], time: Float| {
let bc = euler::extract_boundaries(prev, &bt, &mut eb, &grids, time);
let prev_all = &prev;
pool.scope(|s| {
for (((((fut, prev), bc), wb), metrics), op) in fut
for (((((((fut, prev), wb), grid), metrics), op), bt), eb) in fut
.iter_mut()
.zip(prev.iter())
.zip(bc)
.zip(wb.iter_mut())
.zip(grids)
.zip(metrics.iter())
.zip(operators.iter())
.zip(bt.iter())
.zip(eb.iter_mut())
{
s.spawn(move |_| match op.as_ref() {
Left(sbp) => {
euler::RHS_trad(&**sbp, fut, prev, metrics, &bc, &mut wb.0);
}
Right(uo) => {
euler::RHS_upwind(&**uo, fut, prev, metrics, &bc, &mut wb.0);
s.spawn(move |_| {
let bc = euler::boundary_extracts(prev_all, bt, prev, grid, eb, time);
match op.as_ref() {
Left(sbp) => {
euler::RHS_trad(&**sbp, fut, prev, metrics, &bc, &mut wb.0);
}
Right(uo) => {
euler::RHS_upwind(&**uo, fut, prev, metrics, &bc, &mut wb.0);
}
}
})
}