From 6a7f50784302a121b7e6bc5537b8db72c4b38489 Mon Sep 17 00:00:00 2001 From: "P.M. Sutter" Date: Mon, 10 Dec 2012 20:03:51 -0600 Subject: [PATCH] switch abs to fabs in pruneVoids --- c_tools/stacking/pruneVoids.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/c_tools/stacking/pruneVoids.cpp b/c_tools/stacking/pruneVoids.cpp index fbaf8d4..814a7f0 100644 --- a/c_tools/stacking/pruneVoids.cpp +++ b/c_tools/stacking/pruneVoids.cpp @@ -315,9 +315,9 @@ int main(int argc, char **argv) { dist[1] = voidPart[p].y - voids[iVoid].center[1]; dist[2] = voidPart[p].z - voids[iVoid].center[2]; - if (periodicX) dist[0] = fmin(dist[0], abs(boxLen[0]-dist[0])); - if (periodicY) dist[1] = fmin(dist[1], abs(boxLen[1]-dist[1])); - if (periodicZ) dist[2] = fmin(dist[2], abs(boxLen[2]-dist[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])); voids[iVoid].barycenter[0] += voidPart[p].vol*(dist[0]); voids[iVoid].barycenter[1] += voidPart[p].vol*(dist[1]); @@ -340,9 +340,9 @@ int main(int argc, char **argv) { dist[1] = voidPart[p].y - voids[iVoid].barycenter[1]; dist[2] = voidPart[p].z - voids[iVoid].barycenter[2]; - if (periodicX) dist[0] = fmin(dist[0], abs(boxLen[0]-dist[0])); - if (periodicY) dist[1] = fmin(dist[1], abs(boxLen[1]-dist[1])); - if (periodicZ) dist[2] = fmin(dist[2], abs(boxLen[2]-dist[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])); dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2); if (dist2 < centralRad) centralDen += 1; @@ -374,9 +374,9 @@ int main(int argc, char **argv) { dist[0] = voidPart[p].y - voids[iVoid].barycenter[1]; dist[0] = voidPart[p].z - voids[iVoid].barycenter[2]; - if (periodicX) dist[0] = fmin(dist[0], abs(boxLen[0]-dist[0])); - if (periodicY) dist[1] = fmin(dist[1], abs(boxLen[1]-dist[1])); - if (periodicZ) dist[2] = fmin(dist[2], abs(boxLen[2]-dist[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])); dist2 = pow(dist[0],2) + pow(dist[1],2) + pow(dist[2],2); if (dist2 > maxDist) maxDist = dist2;