From 661b666406954d424f1dc42201c0d0bd5101acee Mon Sep 17 00:00:00 2001 From: James E McClure Date: Wed, 26 Aug 2015 08:21:12 -0400 Subject: [PATCH] Debuggin Euler characteristic --- common/TwoPhase.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/common/TwoPhase.cpp b/common/TwoPhase.cpp index 5fecca7e..4486fd03 100644 --- a/common/TwoPhase.cpp +++ b/common/TwoPhase.cpp @@ -606,23 +606,23 @@ void TwoPhase::ComponentAverages() // Check side A-B bool newside = true; - if (A.x - double(i) > 1e-7 && B.x-double(i) > 1e-12) newside=false; - if (A.y - double(j) > 1e-7 && B.y-double(j) > 1e-12) newside=false; - if (A.z - double(k) > 1e-7 && B.z-double(k) > 1e-12) newside=false; + if (A.x - double(i) < 1e-12 && B.x-double(i) < 1e-12) newside=false; + if (A.y - double(j) < 1e-12 && B.y-double(j) < 1e-12) newside=false; + if (A.z - double(k) < 1e-12 && B.z-double(k) < 1e-12) newside=false; if (!newside) nside-=1; // Check side A-C newside = true; - if (A.x - double(i) > 1e-7 && C.x-double(i) > 1e-12) newside=false; - if (A.y - double(j) > 1e-7 && C.y-double(j) > 1e-12) newside=false; - if (A.z - double(k) > 1e-7 && C.z-double(k) > 1e-12) newside=false; + if (A.x - double(i) < 1e-12 && C.x-double(i) < 1e-12) newside=false; + if (A.y - double(j) < 1e-12 && C.y-double(j) < 1e-12) newside=false; + if (A.z - double(k) < 1e-12 && C.z-double(k) < 1e-12) newside=false; if (!newside) nside-=1; // Check side B-C newside = true; - if (B.x - double(i) > 1e-7 && C.x-double(i) > 1e-12) newside=false; - if (B.y - double(j) > 1e-7 && C.y-double(j) > 1e-12) newside=false; - if (B.z - double(k) > 1e-7 && C.z-double(k) > 1e-12) newside=false; + if (B.x - double(i) < 1e-12 && C.x-double(i) < 1e-12) newside=false; + if (B.y - double(j) < 1e-12 && C.y-double(j) < 1e-12) newside=false; + if (B.z - double(k) < 1e-12 && C.z-double(k) < 1e-12) newside=false; if (!newside) nside-=1; } @@ -634,23 +634,23 @@ void TwoPhase::ComponentAverages() // Check side A-B bool newside = true; - if (A.x - double(i) > 1e-7 && B.x-double(i) > 1e-12) newside=false; - if (A.y - double(j) > 1e-7 && B.y-double(j) > 1e-12) newside=false; - if (A.z - double(k) > 1e-7 && B.z-double(k) > 1e-12) newside=false; + if (A.x - double(i) < 1e-12 && B.x-double(i) < 1e-12) newside=false; + if (A.y - double(j) < 1e-12 && B.y-double(j) < 1e-12) newside=false; + if (A.z - double(k) < 1e-12 && B.z-double(k) < 1e-12) newside=false; if (!newside) nside-=1; // Check side A-C newside = true; - if (A.x - double(i) > 1e-7 && C.x-double(i) > 1e-12) newside=false; - if (A.y - double(j) > 1e-7 && C.y-double(j) > 1e-12) newside=false; - if (A.z - double(k) > 1e-7 && C.z-double(k) > 1e-12) newside=false; + if (A.x - double(i) < 1e-12 && C.x-double(i) < 1e-12) newside=false; + if (A.y - double(j) < 1e-12 && C.y-double(j) < 1e-12) newside=false; + if (A.z - double(k) < 1e-12 && C.z-double(k) < 1e-12) newside=false; if (!newside) nside-=1; // Check side B-C newside = true; - if (B.x - double(i) > 1e-7 && C.x-double(i) > 1e-12) newside=false; - if (B.y - double(j) > 1e-7 && C.y-double(j) > 1e-12) newside=false; - if (B.z - double(k) > 1e-7 && C.z-double(k) > 1e-12) newside=false; + if (B.x - double(i) < 1e-12 && C.x-double(i) < 1e-12) newside=false; + if (B.y - double(j) < 1e-12 && C.y-double(j) < 1e-12) newside=false; + if (B.z - double(k) < 1e-12 && C.z-double(k) < 1e-12) newside=false; if (!newside) nside-=1; } // Add the counts for the vertices, sides and faces from the local cube