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

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

4
c_tools/zobov2/jozov2.cpp
View file

@ -139,10 +139,10 @@ int main(int argc,char **argv)
if (z[i].np == 1)
continue;
txt << format("%d %d %d %e %e %d %d %e %d %f %6.2e %f")
txt << format("%d %d %d %e %e %d %d %e %d %f %6.2e")
% (h+1) % i % z[i].core % p[z[i].core].dens % z[i].vol
% z[i].np % z[i].nhl % z[i].voljoin % z[i].npjoin
% z[i].denscontrast % prob % z[i].leak << endl;
% z[i].denscontrast % prob << endl;
} /* h+1 to start from 1, not zero */
txt.close();

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)

7
c_tools/zobov2/jozov2_zones.cpp
View file

@ -39,10 +39,13 @@ void buildInitialZones(PARTICLE *p, pid_t np, pid_t* jumped,
}
(cout << "Post-jump ..." << endl).flush();
numZones = 0;
pid_t loc_NumZones = 0;
#pragma omp parallel for schedule(static) reduction(+:loc_NumZones)
for (pid_t i = 0; i < np; i++)
if (numinh[i] > 0)
numZones++;
loc_NumZones++;
numZones = loc_NumZones;
cout << format("%d initial zones found") % numZones << endl;
delete[] jumper;