From 45c9d4d62a80bbbac986da2bac1c0090bb14342d Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Mon, 1 Apr 2013 10:25:15 -0400 Subject: [PATCH] Temporarily disable new done_zones array --- c_tools/zobov2/jozov2_watershed.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/c_tools/zobov2/jozov2_watershed.cpp b/c_tools/zobov2/jozov2_watershed.cpp index dcbe087..78f6694 100644 --- a/c_tools/zobov2/jozov2_watershed.cpp +++ b/c_tools/zobov2/jozov2_watershed.cpp @@ -121,7 +121,8 @@ void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, flo for (int l = 0; l < nl; l++) { - if (!done_zones[links[l]]) /* Equivalent to p[z[links[l]].core].dens < p[z[h].core].dens) as zones are sorted. */ + //if (!done_zones[links[l]]) /* Equivalent to p[z[links[l]].core].dens < p[z[h].core].dens) as zones are sorted. */ + if (p[z[links[l]].core].dens < p[z[h].core].dens) beaten = true; } @@ -155,7 +156,8 @@ void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, flo if ((inyet[link2]+inyet2[link2]) == 0) { interior = false; if (z[h2].slv[za] <= lowvol) { - if (!done_zones[link2]) { // Equivalent to p[z[link2].core].dens < p[z[h].core].dens) + //if (!done_zones[link2]) { // Equivalent to p[z[link2].core].dens < p[z[h].core].dens) + if (p[z[link2].core].dens < p[z[h].core].dens) beaten = true; break; }