sparse QuadTree_get_repulsive_force: remove 'flag' that is always set to 0

diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c
index f9ee807feec16eabd8b925db31803c7af0d1a569..745b3eda3d351ad13aa7334566f674763c71ba76 100644 (file)
--- a/lib/sfdpgen/spring_electrical.c
+++ b/lib/sfdpgen/spring_electrical.c
@@ -547,9 +547,7 @@ void spring_electrical_embedding_fast(int dim, SparseMatrix A0, spring_electrica
     start = clock();
 #endif
 
-    QuadTree_get_repulsive_force(qt, force, x, ctrl->bh, p, KP, counts, flag);
-
-    assert(!(*flag));
+    QuadTree_get_repulsive_force(qt, force, x, ctrl->bh, p, KP, counts);
 
 #ifdef TIME
     end = clock();

diff --git a/lib/sparse/QuadTree.c b/lib/sparse/QuadTree.c
index bf73ede9393d12db7428c80df22c74e8e86deb3b..6b322b428782136ac57993e804b59220db12bf8a 100644 (file)
--- a/lib/sparse/QuadTree.c
+++ b/lib/sparse/QuadTree.c
@@ -311,7 +311,7 @@ static void QuadTree_repulsive_force_accumulate(QuadTree qt, double *force, doub
 
 }
 
-void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double bh, double p, double KP, double *counts, int *flag){
+void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double bh, double p, double KP, double *counts){
   /* get repulsice force by a more efficient algortihm: we consider two cells, if they are well separated, we
      calculate the overall repulsive force on the cell level, if not well separated, we divide one of the cell.
      If both cells are at the leaf level, we calcuaulate repulsicve force among individual nodes. Finally
@@ -332,8 +332,6 @@ void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double
 
   for (i = 0; i < 4; i++) counts[i] = 0;
 
-  *flag = 0;
-
   for (i = 0; i < dim*n; i++) force[i] = 0;
 
   QuadTree_repulsive_force_interact(qt, qt, x, force, bh, p, KP, counts);

diff --git a/lib/sparse/QuadTree.h b/lib/sparse/QuadTree.h
index 6e0c7d8fc7f3b1bfe1c35f95e3682546f21b0619..f58eed59fb1ca0435528c7602611c16c5ae7c230 100644 (file)
--- a/lib/sparse/QuadTree.h
+++ b/lib/sparse/QuadTree.h
@@ -53,7 +53,7 @@ double point_distance(double *p1, double *p2, int dim);
 void QuadTree_get_supernodes(QuadTree qt, double bh, double *point, int nodeid, int *nsuper, 
                             int *nsupermax, double **center, double **supernode_wgts, double **distances, double *counts, int *flag);
 
-void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double bh, double p, double KP, double *counts, int *flag);
+void QuadTree_get_repulsive_force(QuadTree qt, double *force, double *x, double bh, double p, double KP, double *counts);
 
 /* find the nearest point and put in ymin, index in imin and distance in min */
 void QuadTree_get_nearest(QuadTree qt, double *x, double *ymin, int *imin, double *min);