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

putting fabs in right spot in prunevoids

Browse source
This commit is contained in:
P.M. Sutter 2012-12-10 21:01:25 -06:00
parent 6a7f507843
commit 0b9673b24b
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
c_tools/stacking/pruneVoids.cpp
View file

@ -311,13 +311,13 @@ int main(int argc, char **argv) {
voids[iVoid].barycenter[2] = 0.; voids[iVoid].barycenter[2] = 0.;
for (p = 0; p < voids[iVoid].numPart; p++) { for (p = 0; p < voids[iVoid].numPart; p++) {
dist[0] = voidPart[p].x - voids[iVoid].center[0]; dist[0] = fabs(voidPart[p].x - voids[iVoid].center[0]);
dist[1] = voidPart[p].y - voids[iVoid].center[1]; dist[1] = fabs(voidPart[p].y - voids[iVoid].center[1]);
dist[2] = voidPart[p].z - voids[iVoid].center[2]; dist[2] = fabs(voidPart[p].z - voids[iVoid].center[2]);
if (periodicX) dist[0] = fmin(dist[0], fabs(boxLen[0]-dist[0])); if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]);
if (periodicY) dist[1] = fmin(dist[1], fabs(boxLen[1]-dist[1])); if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]);
if (periodicZ) dist[2] = fmin(dist[2], fabs(boxLen[2]-dist[2])); if (periodicZ) dist[2] = fmin(dist[2], boxLen[2]-dist[2]);
voids[iVoid].barycenter[0] += voidPart[p].vol*(dist[0]); voids[iVoid].barycenter[0] += voidPart[p].vol*(dist[0]);
voids[iVoid].barycenter[1] += voidPart[p].vol*(dist[1]); voids[iVoid].barycenter[1] += voidPart[p].vol*(dist[1]);
@ -336,13 +336,13 @@ int main(int argc, char **argv) {
centralRad *= centralRad; centralRad *= centralRad;
centralDen = 0.; centralDen = 0.;
for (p = 0; p < voids[iVoid].numPart; p++) { for (p = 0; p < voids[iVoid].numPart; p++) {
dist[0] = voidPart[p].x - voids[iVoid].barycenter[0]; dist[0] = fabs(voidPart[p].x - voids[iVoid].barycenter[0]);
dist[1] = voidPart[p].y - voids[iVoid].barycenter[1]; dist[1] = fabs(voidPart[p].y - voids[iVoid].barycenter[1]);
dist[2] = voidPart[p].z - voids[iVoid].barycenter[2]; dist[2] = fabs(voidPart[p].z - voids[iVoid].barycenter[2]);
if (periodicX) dist[0] = fmin(dist[0], fabs(boxLen[0]-dist[0])); if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]);
if (periodicY) dist[1] = fmin(dist[1], fabs(boxLen[1]-dist[1])); if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]);
if (periodicZ) dist[2] = fmin(dist[2], fabs(boxLen[2]-dist[2])); if (periodicZ) dist[2] = fmin(dist[2], boxLen[2]-dist[2]);
dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2); dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2);
if (dist2 < centralRad) centralDen += 1; if (dist2 < centralRad) centralDen += 1;
@ -370,13 +370,13 @@ int main(int argc, char **argv) {
maxDist = 0.; maxDist = 0.;
for (p = 0; p < voids[iVoid].numPart; p++) { for (p = 0; p < voids[iVoid].numPart; p++) {
dist[0] = voidPart[p].x - voids[iVoid].barycenter[0]; dist[0] = fabs(voidPart[p].x - voids[iVoid].barycenter[0]);
dist[0] = voidPart[p].y - voids[iVoid].barycenter[1]; dist[0] = fabs(voidPart[p].y - voids[iVoid].barycenter[1]);
dist[0] = voidPart[p].z - voids[iVoid].barycenter[2]; dist[0] = fabs(voidPart[p].z - voids[iVoid].barycenter[2]);
if (periodicX) dist[0] = fmin(dist[0], fabs(boxLen[0]-dist[0])); if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]);
if (periodicY) dist[1] = fmin(dist[1], fabs(boxLen[1]-dist[1])); if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]);
if (periodicZ) dist[2] = fmin(dist[2], fabs(boxLen[2]-dist[2])); if (periodicZ) dist[2] = fmin(dist[2], boxLen[2]-dist[2]);
dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2); dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2);
if (dist2 > maxDist) maxDist = dist2; if (dist2 > maxDist) maxDist = dist2;