From e70245c0af7f10d18e87614c0e8c62f4fb551fe6 Mon Sep 17 00:00:00 2001
From: "Peter W. Draper" <p.w.draper@durham.ac.uk>
Date: Fri, 28 Oct 2016 12:22:26 +0100
Subject: [PATCH] With tasks costs instead of delta-ticks we don't want to
pre-scale
---
src/partition.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/partition.c b/src/partition.c
index a1047b92a0..3f53861544 100644
--- a/src/partition.c
+++ b/src/partition.c
@@ -370,7 +370,7 @@ static void pick_metis(struct space *s, int nregions, int *vertexw, int *edgew,
/* Dump graph in METIS format */
/* dumpMETISGraph("metis_graph", idx_ncells, one, xadj, adjncy,
- * weights_v, weights_e, NULL);
+ * weights_v, NULL, weights_e);
*/
if (METIS_PartGraphKway(&idx_ncells, &one, xadj, adjncy, weights_v, weights_e,
@@ -420,7 +420,7 @@ static void repart_edge_metis(int partweights, int bothweights, int nodeID,
* assume the same graph structure as used in the part_ calls). */
int nr_cells = s->nr_cells;
struct cell *cells = s->cells_top;
- float wscale = 1e-3, vscale = 1e-3, wscale_buff = 0.0;
+ float wscale = 1.f, wscale_buff = 0.0;
int wtot = 0;
int wmax = 1e9 / nr_nodes;
int wmin;
@@ -609,7 +609,7 @@ static void repart_edge_metis(int partweights, int bothweights, int nodeID,
if (weights_e[k] == 0) weights_e[k] = 1;
if (bothweights)
for (int k = 0; k < nr_cells; k++)
- if ((weights_v[k] *= vscale) == 0) weights_v[k] = 1;
+ if (weights_v[k] == 0) weights_v[k] = 1;
/* And partition, use both weights or not as requested. */
if (bothweights)
--
GitLab