Merge pull request #338 from MiloniAtal/Updates

Improved Parallel Algorithm for Octree and Compressed Octree
pypr · Feb 16, 2022 · 8a5d979 · 8a5d979
2 parents 48f9195 + ef81ac8
commit 8a5d979
Show file tree

Hide file tree

Showing 6 changed files with 760 additions and 173 deletions.
diff --git a/pysph/base/octree.pxd b/pysph/base/octree.pxd
@@ -75,7 +75,6 @@ cdef class Octree:
     cdef public double length
     cdef public int depth
     cdef public bint test_parallel
-    cdef public int method
     cdef double machine_eps
 
     cdef double xmin[3]
@@ -104,7 +103,7 @@ cdef class Octree:
 
     cdef int _c_build_tree_bfs(self, NNPSParticleArrayWrapper pa,
             u_int* p_indices, vector[cOctreeNode *]* level_nodes,
-            int level) nogil
+            int level, int num_threads) nogil
 
     cdef void _plot_tree(self, OctreeNode node, ax)