Merge pull request #694 from PMEAL/make_openpnm_great_again

Make OpenPNM Great Again!
PMEAL · Jun 26, 2017 · 3221899 · 3221899
2 parents a78d71c + eb0e9ff
commit 3221899
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/OpenPNM/Network/__GenericNetwork__.py b/OpenPNM/Network/__GenericNetwork__.py
@@ -848,8 +848,12 @@ def find_nearby_pores(self, pores, distance, flatten=False, excl_self=True):
                 Pn = sp.array([sp.array([]) for i in range(0, len(pores))])
             return Pn.astype(sp.int64)
         # Create kdTree objects
-        kd = sptl.cKDTree(self['pore.coords'])
-        kd_pores = sptl.cKDTree(self['pore.coords'][pores])
+        kd = sptl.cKDTree(self['pore.coords'],
+                          balanced_tree=False,
+                          compact_nodes=False)
+        kd_pores = sptl.cKDTree(self['pore.coords'][pores],
+                                balanced_tree=False,
+                                compact_nodes=False)
         # Perform search
         Pn = kd_pores.query_ball_tree(kd, r=distance)
         # Sort the indices in each list
@@ -1040,16 +1044,12 @@ def _update_network(self, mode='clear'):
         if mode == 'regenerate':
             self._adjacency_matrix['coo'] = \
                 self.create_adjacency_matrix(sprsfmt='coo')
-            self._adjacency_matrix['csr'] = \
-                self.create_adjacency_matrix(sprsfmt='csr')
-            self._adjacency_matrix['lil'] = \
-                self.create_adjacency_matrix(sprsfmt='lil')
+            self._adjacency_matrix['csr'] = self._adjacency_matrix['coo'].tocsr()
+            self._adjacency_matrix['lil'] = self._adjacency_matrix['coo'].tolil()
             self._incidence_matrix['coo'] = \
                 self.create_incidence_matrix(sprsfmt='coo')
-            self._incidence_matrix['csr'] = \
-                self.create_incidence_matrix(sprsfmt='csr')
-            self._incidence_matrix['lil'] = \
-                self.create_incidence_matrix(sprsfmt='lil')
+            self._incidence_matrix['csr'] = self._incidence_matrix['coo'].tocsr()
+            self._incidence_matrix['lil'] = self._incidence_matrix['coo'].tolil()
 
     def domain_bulk_volume(self):
         raise NotImplementedError()