guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-04 15:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temporarily disable new done_zones array

Browse source
This commit is contained in:
Guilhem Lavaux 2013-04-01 10:25:15 -04:00
parent d0901e6d95
commit 45c9d4d62a
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
c_tools/zobov2/jozov2_watershed.cpp
View file

@ -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;
}