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

Cleanup some development cruft and re-enable openmp clause in jozov2

Browse source
This commit is contained in:
Guilhem Lavaux 2013-04-02 09:06:56 -05:00
parent 5c40a6c226
commit 85546379cf
3 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

19
c_tools/zobov2/jozov2_watershed.cpp
View file

@ -50,23 +50,9 @@ static void build_process_queue(ZoneQueue& q, ZONE *z, char *inyet, int h)
void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, float voltol)
{
int *iord;
double *sorter = new double[numZones+1];
/* Assign sorter by probability (could use volume instead) */
for (int h = 0; h < numZones; h++)
sorter[h] = (double)z[h].core;
/* Text output file */
printf("about to sort (pre-watershed sort) ...\n");FF;
iord = new int[numZones];
// findrtop(sorter, numZones, iord, numZones);
delete[] sorter;
//#pragma omp parallel
#pragma omp parallel
{
char *inyet, *inyet2;
int *zonelist, *zonelist2;
@ -82,7 +68,7 @@ void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, flo
fill(inyet2, inyet2 + numZones, 0);
nhl = 0;
//#pragma omp for schedule(dynamic,1)
#pragma omp for schedule(dynamic,1)
for (int h = 0; h < numZones; h++)
{
int nhlcount = 0;
@ -244,7 +230,6 @@ void doWatershed(PARTICLE *p, pid_t np, ZONE *z, int numZones, float maxvol, flo
delete[] inyet2;
}
delete[] iord;
double maxdenscontrast = 0;
#pragma omp parallel shared(maxdenscontrast)