From 0b9673b24b0c27d999985c644a9703257951784d Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Mon, 10 Dec 2012 21:01:25 -0600 Subject: [PATCH] putting fabs in right spot in prunevoids --- c_tools/stacking/pruneVoids.cpp | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/c_tools/stacking/pruneVoids.cpp b/c_tools/stacking/pruneVoids.cpp index 814a7f0..f418c5d 100644 --- a/c_tools/stacking/pruneVoids.cpp +++ b/c_tools/stacking/pruneVoids.cpp @@ -311,13 +311,13 @@ int main(int argc, char **argv) { voids[iVoid].barycenter[2] = 0.; for (p = 0; p < voids[iVoid].numPart; p++) { - dist[0] = voidPart[p].x - voids[iVoid].center[0]; - dist[1] = voidPart[p].y - voids[iVoid].center[1]; - dist[2] = voidPart[p].z - voids[iVoid].center[2]; + dist[0] = fabs(voidPart[p].x - voids[iVoid].center[0]); + dist[1] = fabs(voidPart[p].y - voids[iVoid].center[1]); + dist[2] = fabs(voidPart[p].z - voids[iVoid].center[2]); - if (periodicX) dist[0] = fmin(dist[0], fabs(boxLen[0]-dist[0])); - if (periodicY) dist[1] = fmin(dist[1], fabs(boxLen[1]-dist[1])); - if (periodicZ) dist[2] = fmin(dist[2], fabs(boxLen[2]-dist[2])); + if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]); + if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]); + if (periodicZ) dist[2] = fmin(dist[2], boxLen[2]-dist[2]); voids[iVoid].barycenter[0] += voidPart[p].vol*(dist[0]); voids[iVoid].barycenter[1] += voidPart[p].vol*(dist[1]); @@ -336,13 +336,13 @@ int main(int argc, char **argv) { centralRad *= centralRad; centralDen = 0.; for (p = 0; p < voids[iVoid].numPart; p++) { - dist[0] = voidPart[p].x - voids[iVoid].barycenter[0]; - dist[1] = voidPart[p].y - voids[iVoid].barycenter[1]; - dist[2] = voidPart[p].z - voids[iVoid].barycenter[2]; + dist[0] = fabs(voidPart[p].x - voids[iVoid].barycenter[0]); + dist[1] = fabs(voidPart[p].y - voids[iVoid].barycenter[1]); + dist[2] = fabs(voidPart[p].z - voids[iVoid].barycenter[2]); - if (periodicX) dist[0] = fmin(dist[0], fabs(boxLen[0]-dist[0])); - if (periodicY) dist[1] = fmin(dist[1], fabs(boxLen[1]-dist[1])); - if (periodicZ) dist[2] = fmin(dist[2], fabs(boxLen[2]-dist[2])); + if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]); + if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]); + if (periodicZ) dist[2] = fmin(dist[2], boxLen[2]-dist[2]); dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2); if (dist2 < centralRad) centralDen += 1; @@ -370,13 +370,13 @@ int main(int argc, char **argv) { maxDist = 0.; for (p = 0; p < voids[iVoid].numPart; p++) { - dist[0] = voidPart[p].x - voids[iVoid].barycenter[0]; - dist[0] = voidPart[p].y - voids[iVoid].barycenter[1]; - dist[0] = voidPart[p].z - voids[iVoid].barycenter[2]; + dist[0] = fabs(voidPart[p].x - voids[iVoid].barycenter[0]); + dist[0] = fabs(voidPart[p].y - voids[iVoid].barycenter[1]); + dist[0] = fabs(voidPart[p].z - voids[iVoid].barycenter[2]); - if (periodicX) dist[0] = fmin(dist[0], fabs(boxLen[0]-dist[0])); - if (periodicY) dist[1] = fmin(dist[1], fabs(boxLen[1]-dist[1])); - if (periodicZ) dist[2] = fmin(dist[2], fabs(boxLen[2]-dist[2])); + if (periodicX) dist[0] = fmin(dist[0], boxLen[0]-dist[0]); + if (periodicY) dist[1] = fmin(dist[1], boxLen[1]-dist[1]); + if (periodicZ) dist[2] = fmin(dist[2], boxLen[2]-dist[2]); dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2); if (dist2 > maxDist) maxDist = dist2;