Remove splash detection

Author: w1th0utnam3

splashsurf/src/reconstruction.rs

@@ -44,10 +44,7 @@ pub struct ReconstructSubcommandArgs {
     /// The smoothing length radius used for the SPH kernel, the kernel compact support radius will be twice the smoothing length (in multiplies of the particle radius)
     #[structopt(long)]
     smoothing_length: f64,
-    /// If a particle has no neighbors in this radius (in multiplies of the particle radius) it is considered as a free particle
-    #[structopt(long)]
-    splash_detection_radius: Option<f64>,
-    /// The marching cubes grid size in multiplies of the particle radius
+    /// The cube edge length used for marching cubes in multiplies of the particle radius, corresponds to the cell size of the implicit background grid
     #[structopt(long)]
     cube_size: f64,
     /// The iso-surface threshold for the density, i.e. value of the reconstructed density that indicates the fluid surface (in multiplies of the rest density)
@@ -224,9 +221,6 @@ mod arguments {
 
             // Scale kernel radius and cube size by particle radius
             let compact_support_radius = args.particle_radius * 2.0 * args.smoothing_length;
-            let splash_detection_radius = args
-                .splash_detection_radius
-                .map(|r| args.particle_radius * r);
             let cube_size = args.particle_radius * args.cube_size;
 
             let spatial_decomposition = if !args.octree_decomposition.into_bool() {
@@ -267,7 +261,6 @@ mod arguments {
                 particle_radius: args.particle_radius,
                 rest_density: args.rest_density,
                 compact_support_radius,
-                splash_detection_radius,
                 cube_size,
                 iso_surface_threshold: args.surface_threshold,
                 domain_aabb,

splashsurf_lib/benches/benches/bench_full.rs

@@ -24,7 +24,6 @@ pub fn surface_reconstruction_canyon(c: &mut Criterion) {
         particle_radius,
         rest_density: 1000.0,
         compact_support_radius: compact_support_radius,
-        splash_detection_radius: None,
         cube_size,
         iso_surface_threshold: 0.6,
         domain_aabb: None,
@@ -97,7 +96,6 @@ pub fn surface_reconstruction_dam_break(c: &mut Criterion) {
         particle_radius,
         rest_density: 1000.0,
         compact_support_radius: compact_support_radius,
-        splash_detection_radius: None,
         cube_size,
         iso_surface_threshold: 0.6,
         domain_aabb: None,
@@ -175,7 +173,6 @@ pub fn surface_reconstruction_double_dam_break(c: &mut Criterion) {
         particle_radius,
         rest_density: 1000.0,
         compact_support_radius: compact_support_radius,
-        splash_detection_radius: None,
         cube_size,
         iso_surface_threshold: 0.6,
         domain_aabb: None,
@@ -253,7 +250,6 @@ pub fn surface_reconstruction_double_dam_break_inplace(c: &mut Criterion) {
         particle_radius,
         rest_density: 1000.0,
         compact_support_radius: compact_support_radius,
-        splash_detection_radius: None,
         cube_size,
         iso_surface_threshold: 0.6,
         domain_aabb: None,

splashsurf_lib/src/lib.rs

@@ -170,9 +170,6 @@ pub struct Parameters<R: Real> {
     pub rest_density: R,
     /// Compact support radius of the kernel, i.e. distance from the particle where kernel reaches zero (in distance units, not relative to particle radius)
     pub compact_support_radius: R,
-    /// Particles without neighbors within the splash detection radius are considered "splash" or "free particles".
-    /// They are filtered out and processed separately. Currently they are only skipped during the surface reconstruction.
-    pub splash_detection_radius: Option<R>,
     /// Edge length of the marching cubes implicit background grid (in distance units, not relative to particle radius)
     pub cube_size: R,
     /// Density threshold value to distinguish between the inside (above threshold) and outside (below threshold) of the fluid
@@ -194,10 +191,6 @@ impl<R: Real> Parameters<R> {
             particle_radius: self.particle_radius.try_convert()?,
             rest_density: self.rest_density.try_convert()?,
             compact_support_radius: self.compact_support_radius.try_convert()?,
-            splash_detection_radius: map_option!(
-                &self.splash_detection_radius,
-                r => r.try_convert()?
-            ),
             cube_size: self.cube_size.try_convert()?,
             iso_surface_threshold: self.iso_surface_threshold.try_convert()?,
             domain_aabb: map_option!(&self.domain_aabb, aabb => aabb.try_convert()?),

splashsurf_lib/src/reconstruction.rs

@@ -41,26 +41,6 @@ pub(crate) fn reconstruct_surface_global<'a, I: Index, R: Real>(
         &mut output_surface.mesh,
     );
 
-    /*
-    let particle_indices = splash_detection_radius.map(|splash_detection_radius| {
-        let neighborhood_list = neighborhood_search::search::<I, R>(
-            &grid.aabb(),
-            particle_positions,
-            splash_detection_radius,
-            enable_multi_threading,
-        );
-
-        let mut active_particles = Vec::new();
-        for (particle_i, neighbors) in neighborhood_list.iter().enumerate() {
-            if !neighbors.is_empty() {
-                active_particles.push(particle_i);
-            }
-        }
-
-        active_particles
-    });
-    */
-
     // TODO: Set this correctly
     output_surface.density_map = None;
 }

splashsurf_lib/tests/integration_tests/test_full.rs

@@ -30,7 +30,6 @@ fn params<R: Real>(
         particle_radius,
         rest_density: R::from_f64(1000.0).unwrap(),
         compact_support_radius,
-        splash_detection_radius: None,
         cube_size,
         iso_surface_threshold: R::from_f64(0.6).unwrap(),
         domain_aabb: None,