From f360eb1ecb9c3184ea63757fc5c65003abaecf20 Mon Sep 17 00:00:00 2001 From: James McClure Date: Wed, 22 May 2019 17:33:10 -0600 Subject: [PATCH] add geometric test for 3D topo --- tests/TestTopo3D.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestTopo3D.cpp b/tests/TestTopo3D.cpp index e7676a67..4b8cd17f 100644 --- a/tests/TestTopo3D.cpp +++ b/tests/TestTopo3D.cpp @@ -127,7 +127,7 @@ int main(int argc, char **argv) //.............................................................................. if (x <= 0 || y<=0) { // Single torus - Object.distance(i,j,k) = sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z) - R2; + Object.distance(i,j,k) = R2 - sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z); } else { double d1 = R2-sqrt(x*x +(y-R1)*(y-R1) + z*z); @@ -201,7 +201,7 @@ int main(int argc, char **argv) //.............................................................................. // Bowl if (z > 0 ){ - Object.distance(i,j,k) = sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z) - R2; + Object.distance(i,j,k) = R2-sqrt((sqrt(x*x+y*y) - R1)*(sqrt(x*x+y*y) - R1) + z*z); } else {