Require DomainView to be Sync

TEALab-org · Dec 29, 2024 · 7f2463a · 7f2463a
1 parent 1ed1037
commit 7f2463a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/src/domain/bc/periodic.rs b/src/domain/bc/periodic.rs
@@ -20,11 +20,8 @@ impl<
     }
 }
 
-impl<
-        const GRID_DIMENSION: usize,
-        DomainType: DomainView<GRID_DIMENSION> + Sync,
-    > BCCheck<GRID_DIMENSION>
-    for PeriodicCheck<'_, GRID_DIMENSION, DomainType>
+impl<const GRID_DIMENSION: usize, DomainType: DomainView<GRID_DIMENSION>>
+    BCCheck<GRID_DIMENSION> for PeriodicCheck<'_, GRID_DIMENSION, DomainType>
 {
     fn check(&self, world_coord: &Coord<GRID_DIMENSION>) -> Option<f64> {
         let p_coord = &self.domain.aabb().periodic_coord(world_coord);

diff --git a/src/domain/view/mod.rs b/src/domain/view/mod.rs
@@ -9,7 +9,7 @@ pub use slice::*;
 use crate::util::*;
 use rayon::prelude::*;
 
-pub trait DomainView<const GRID_DIMENSION: usize> {
+pub trait DomainView<const GRID_DIMENSION: usize>: Sync {
     fn aabb(&self) -> &AABB<GRID_DIMENSION>;
 
     fn set_aabb(&mut self, aabb: AABB<GRID_DIMENSION>);

diff --git a/src/par_stencil.rs b/src/par_stencil.rs
@@ -8,7 +8,7 @@ pub fn apply<
     Operation,
     const GRID_DIMENSION: usize,
     const NEIGHBORHOOD_SIZE: usize,
-    DomainType: DomainView<GRID_DIMENSION> + Sync,
+    DomainType: DomainView<GRID_DIMENSION>,
 >(
     bc: &BC,
     stencil: &StencilF64<Operation, GRID_DIMENSION, NEIGHBORHOOD_SIZE>,

diff --git a/src/solver/direct.rs b/src/solver/direct.rs
@@ -7,7 +7,7 @@ pub fn box_apply<
     Operation,
     const GRID_DIMENSION: usize,
     const NEIGHBORHOOD_SIZE: usize,
-    DomainType: DomainView<GRID_DIMENSION> + Sync,
+    DomainType: DomainView<GRID_DIMENSION>,
 >(
     bc: &BC,
     stencil: &StencilF64<Operation, GRID_DIMENSION, NEIGHBORHOOD_SIZE>,

diff --git a/src/solver/periodic_direct.rs b/src/solver/periodic_direct.rs
@@ -6,7 +6,7 @@ pub fn direct_periodic_apply<
     Operation,
     const GRID_DIMENSION: usize,
     const NEIGHBORHOOD_SIZE: usize,
-    DomainType: DomainView<GRID_DIMENSION> + Sync,
+    DomainType: DomainView<GRID_DIMENSION>,
 >(
     stencil: &StencilF64<Operation, GRID_DIMENSION, NEIGHBORHOOD_SIZE>,
     input: &mut DomainType,

diff --git a/src/solver/trapezoid.rs b/src/solver/trapezoid.rs
@@ -22,7 +22,7 @@ pub fn trapezoid_apply<
     Operation,
     const GRID_DIMENSION: usize,
     const NEIGHBORHOOD_SIZE: usize,
-    DomainType: DomainView<GRID_DIMENSION> + Sync,
+    DomainType: DomainView<GRID_DIMENSION>,
 >(
     bc: &BC,
     stencil: &StencilF64<Operation, GRID_DIMENSION, NEIGHBORHOOD_SIZE>,