Fixed bugs in common/TwoPhase.h from Euler characteristic computation

This commit is contained in:
James McClure 2015-08-25 15:02:04 -04:00
parent df7264fcde
commit dfd4206423

View File

@ -721,14 +721,14 @@ void TwoPhase::ComponentAverages(){
if (newside) ComponentAverages_NWP(NSIDE,LabelNWP) += 1;
// Check side A-C
bool newside = true;
newside = true;
if (A.x - double(i) > 1e-7 && C.x-double(i) > 1e-7) newside=false;
if (A.y - double(j) > 1e-7 && C.y-double(j) > 1e-7) newside=false;
if (A.z - double(k) > 1e-7 && C.z-double(k) > 1e-7) newside=false;
if (newside) ComponentAverages_NWP(NSIDE,LabelNWP) += 1;
// Check side B-C
bool newside = true;
newside = true;
if (B.x - double(i) > 1e-7 && C.x-double(i) > 1e-7) newside=false;
if (B.y - double(j) > 1e-7 && C.y-double(j) > 1e-7) newside=false;
if (B.z - double(k) > 1e-7 && C.z-double(k) > 1e-7) newside=false;
@ -757,14 +757,14 @@ void TwoPhase::ComponentAverages(){
if (newside) ComponentAverages_NWP(NSIDE,LabelNWP) += 1;
// Check side A-C
bool newside = true;
newside = true;
if (A.x - double(i) > 1e-7 && C.x-double(i) > 1e-7) newside=false;
if (A.y - double(j) > 1e-7 && C.y-double(j) > 1e-7) newside=false;
if (A.z - double(k) > 1e-7 && C.z-double(k) > 1e-7) newside=false;
if (newside) ComponentAverages_NWP(NSIDE,LabelNWP) += 1;
// Check side B-C
bool newside = true;
newside = true;
if (B.x - double(i) > 1e-7 && C.x-double(i) > 1e-7) newside=false;
if (B.y - double(j) > 1e-7 && C.y-double(j) > 1e-7) newside=false;
if (B.z - double(k) > 1e-7 && C.z-double(k) > 1e-7) newside=false;