- removed special cases for small particle numbers

Author: janbender

TreeNSearch/source/TreeNSearch.cpp

@@ -137,20 +137,15 @@ void tns::TreeNSearch::set_cell_size(const double cell_size)
 }
 void tns::TreeNSearch::run()
 {
-	if (this->get_total_n_points() < this->number_of_too_few_particles) {
-		this->run_scalar();
-	}
-	else {
-		// Run in SIMD mode
-		this->_set_up();
-		this->_check();
-		this->_clear_neighborlists();
-		this->_update_world_AABB_simd();
-		this->_points_to_cells_simd();
-		this->_build_octree_and_gather_leaves_simd();
-		this->_solve_leaves(/* use_simd = */ true);
-		this->are_cells_valid = true;
-	}
+	// Run in SIMD mode
+	this->_set_up();
+	this->_check();
+	this->_clear_neighborlists();
+	this->_update_world_AABB_simd();
+	this->_points_to_cells_simd();
+	this->_build_octree_and_gather_leaves_simd();
+	this->_solve_leaves(/* use_simd = */ true);
+	this->are_cells_valid = true;
 }
 void tns::TreeNSearch::run_scalar()
 {
@@ -432,24 +427,6 @@ void tns::TreeNSearch::_update_world_AABB()
 	std::array<float, 3> new_bottom = { MAXf, MAXf, MAXf };
 	std::array<float, 3> new_top = { MINf, MINf, MINf };
 
-	// Sequentual computation if points are too few
-	if (this->get_total_n_points() < this->number_of_too_few_particles) {
-		for (int set_i = 0; set_i < this->n_sets; set_i++) {
-			const float* points = this->set_points[set_i];
-			const int n_points = this->get_n_points_in_set(set_i);
-
-			for (int point_i = 0; point_i < n_points; point_i++) {
-				new_bottom[0] = std::min(new_bottom[0], points[3 * point_i]);
-				new_bottom[1] = std::min(new_bottom[1], points[3 * point_i + 1]);
-				new_bottom[2] = std::min(new_bottom[2], points[3 * point_i + 2]);
-
-				new_top[0] = std::max(new_top[0], points[3 * point_i]);
-				new_top[1] = std::max(new_top[1], points[3 * point_i + 1]);
-				new_top[2] = std::max(new_top[2], points[3 * point_i + 2]);
-			}
-		}
-	}
-
 	// Parallel version
 	// Note: Paralelized across points and sets
 	for (int set_i = 0; set_i < this->n_sets; set_i++) {
@@ -2603,11 +2580,6 @@ void tns::TreeNSearch::prepare_zsort()
 		and then find the new point indices concatenating the cell's points in order.
 	*/
 
-	// Minimum number of points for zsort
-	if (this->get_total_n_points() < this->number_of_too_few_particles) {
-		this->are_cells_valid = false; // Ensures we do a global zsort
-	}
-
 	// Set up
 	this->_set_up();
 

TreeNSearch/source/TreeNSearch.h

@@ -380,7 +380,6 @@ namespace tns
 		std::vector<int> set_offsets;  // Assuming all point sets are concatenated, the offset ofa set is the index to the first point
 		std::vector<std::vector<float>> set_points_buffers;  // When declared as double, point data is casted and store as float here
 		std::vector<std::vector<float>> set_radii_buffers;  // When declared as double, point data is casted and store as float here
-		int number_of_too_few_particles = 1000; // Less than this will bypass complex procedures
 
 		// Neighborhood search
 		bool symmetric_search = true;