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

Added more verbosity to track the evolution

Browse source
This commit is contained in:
Guilhem Lavaux 2013-04-01 19:11:19 +02:00
parent 45c9d4d62a
commit 3df580e03e
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
c_tools/zobov2/jozov2_watershed.cpp
View file

@ -37,6 +37,7 @@ void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, flo
int nhl; int nhl;
int *links = new int[NLINKS]; int *links = new int[NLINKS];
bool *done_zones; bool *done_zones;
int prev_ii = -1;
inyet = new char[numZones]; inyet = new char[numZones];
inyet2 = new char[numZones]; inyet2 = new char[numZones];
@ -49,13 +50,17 @@ void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, flo
fill(done_zones, done_zones + numZones, false); fill(done_zones, done_zones + numZones, false);
nhl = 0; nhl = 0;
#pragma omp for schedule(dynamic,100) #pragma omp for schedule(dynamic,1)
for (int ii = 0; ii < numZones; ii++) for (int h = 0; h < numZones; h++)
{ {
int nhlcount = 0; int nhlcount = 0;
int h = iord[ii];
float lowvol; float lowvol;
bool beaten; bool beaten;
if (h/100 > prev_ii)
{
(cout << format("[%d]: Doing %d") % omp_get_thread_num() % h << endl).flush();
prev_ii = h/100;
}
for (int hl = 0; hl < nhl; hl++) for (int hl = 0; hl < nhl; hl++)
inyet[zonelist[hl]] = 0; inyet[zonelist[hl]] = 0;
@ -157,7 +162,7 @@ void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, flo
interior = false; interior = false;
if (z[h2].slv[za] <= lowvol) { 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) if (p[z[link2].core].dens < p[z[h].core].dens) {
beaten = true; beaten = true;
break; break;
} }
@ -190,8 +195,11 @@ void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, flo
} }
} }
if (nhl/10000 > nhlcount) { if (nhl/10000 > nhlcount) {
if (nhlcount == 0)
(cout << format("Zone %d: %d") % h % nhl).flush();
else
(cout << nhl << " ").flush();
nhlcount = nhl/10000; nhlcount = nhl/10000;
printf(" %d",nhl); FF;
} }
} while((lowvol < BIGFLT) && (!beaten)); } while((lowvol < BIGFLT) && (!beaten));