Commit af3c942e authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'implicit_function_wrong'

06424786 Correct implicit function test failures when vectorization is enabled.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !356
parents 62dd5e6a 06424786
......@@ -106,10 +106,11 @@ struct TestingImplicitFunctions
vtkm::cont::ArrayHandle<FloatDefault>::PortalConstControl portal =
values.GetPortalConstControl();
bool success = (portal.Get(0) == -(r*r)) &&
(portal.Get(1) == 0.0) &&
(portal.Get(2) == 0.0) &&
(portal.Get(4) == 0.0) &&
test_equal(portal.Get(1), FloatDefault(0.0) ) &&
test_equal(portal.Get(2), FloatDefault(0.0) ) &&
test_equal(portal.Get(4), FloatDefault(0.0) ) &&
(portal.Get(3) > 0.0) &&
(portal.Get(5) > 0.0) &&
(portal.Get(6) > 0.0) &&
......@@ -144,7 +145,7 @@ struct TestingImplicitFunctions
values.GetPortalConstControl();
bool success = (portal.Get(0) < 0.0) &&
(portal.Get(1) < 0.0) &&
(portal.Get(2) == 0.0) &&
test_equal(portal.Get(2), FloatDefault(0.0) ) &&
(portal.Get(3) > 0.0) &&
(portal.Get(4) > 0.0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment