Correct bugs in support cell gradient arrays in vtkmGradient.

Accelerators/Vtkm/Testing/Cxx/CMakeLists.txt

@@ -6,7 +6,8 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
   TestVTKMCleanGrid.cxx
   TestVTKMClip.cxx
   TestVTKMClipWithImplicitFunction.cxx
-  # TestVTKMGradientAndVorticity.cxx,NO_VALID
+  TestVTKMGradient.cxx,NO_VALID
+  TestVTKMGradientAndVorticity.cxx,NO_VALID
   TestVTKMExternalFaces.cxx
   TestVTKMExtractVOI.cxx
   TestVTKMLevelOfDetail.cxx

Accelerators/Vtkm/Testing/Cxx/TestVTKMGradient.cxx

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    TestGradientAndVorticity.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+/*----------------------------------------------------------------------------
+ Copyright (c) Sandia Corporation
+ See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details.
+----------------------------------------------------------------------------*/
+
+#include "vtkArrayCalculator.h"
+#include "vtkCell.h"
+#include "vtkCellData.h"
+#include "vtkDoubleArray.h"
+#include "vtkImageData.h"
+#include "vtkmCleanGrid.h"
+#include "vtkmGradient.h"
+#include "vtkNew.h"
+#include "vtkPointData.h"
+#include "vtkRTAnalyticSource.h"
+#include "vtkUnstructuredGrid.h"
+
+#include <vector>
+
+namespace
+{
+  double Tolerance = 0.00001;
+
+  bool ArePointsWithinTolerance(double v1, double v2)
+  {
+    if(v1 == v2 || fabs(v1)+fabs(v2) < Tolerance)
+    {
+      return true;
+    }
+
+    if(v1 == 0.0)
+    {
+      if(fabs(v2) < Tolerance)
+      {
+        return true;
+      }
+      std::cout << fabs(v2) << " (fabs(v2)) should be less than "
+           << Tolerance << std::endl;
+      return false;
+    }
+    if(fabs(v1/v2) < Tolerance)
+    {
+      return true;
+    }
+    std::cout << fabs(v1/v2) << " (fabs(v1/v2)) should be less than "
+         << Tolerance << std::endl;
+    return false;
+  }
+
+//-----------------------------------------------------------------------------
+  int IsGradientCorrect(vtkDoubleArray* gradients,
+                        vtkDoubleArray* correct)
+  {
+    int numberOfComponents = gradients->GetNumberOfComponents();
+    for(vtkIdType i=0;i<gradients->GetNumberOfTuples();i++)
+    {
+      bool invalid = false;
+      for(int j=0;j<numberOfComponents;j++)
+      {
+        double value = gradients->GetTypedComponent(i, j);
+        double expected = correct->GetTypedComponent(i, j);
+
+        if( (value - expected) > Tolerance)
+        {
+          invalid = true;
+        }
+      }
+
+      if(invalid)
+      {
+        std::vector<double> values; values.resize(numberOfComponents);
+        std::vector<double> expected; expected.resize(numberOfComponents);
+
+        gradients->GetTypedTuple(i, values.data());
+        correct->GetTypedTuple(i, expected.data());
+
+        std::cout << "Gradient[ i ] should look like: " << std::endl;
+        std::cout << expected[0] << ", " << expected[1] << ", " <<  expected[2] << std::endl;
+        if(numberOfComponents > 3)
+        {
+          std::cout << expected[3] << ", " <<  expected[4] << ", " <<  expected[5] << std::endl;
+          std::cout << expected[6] << ", " <<  expected[7] << ", " <<  expected[8] << std::endl;
+        }
+
+        std::cout << "Gradient[ i ] actually looks like: " << std::endl;
+        std::cout << values[0] << ", " << values[1] << ", " <<  values[2] << std::endl;
+        if(numberOfComponents > 3)
+        {
+          std::cout << values[3] << ", " <<  values[4] << ", " <<  values[5] << std::endl;
+          std::cout << values[6] << ", " <<  values[7] << ", " <<  values[8] << std::endl;
+        }
+        std::cout << std::endl;
+      }
+
+      if(i>10 && invalid)
+      {
+        return 0;
+      }
+    }
+  return 1;
+  }
+
+//-----------------------------------------------------------------------------
+// we assume that the gradients are correct and so we can compute the "real"
+// vorticity from it
+  int IsVorticityCorrect(vtkDoubleArray* gradients, vtkDoubleArray* vorticity)
+  {
+    if(gradients->GetNumberOfComponents() != 9 ||
+       vorticity->GetNumberOfComponents() != 3)
+    {
+      vtkGenericWarningMacro("Bad number of components.");
+      return 0;
+    }
+    for(vtkIdType i=0;i<gradients->GetNumberOfTuples();i++)
+    {
+      double* g = gradients->GetTuple(i);
+      double* v = vorticity->GetTuple(i);
+      if(!ArePointsWithinTolerance(v[0], g[7]-g[5]))
+      {
+        vtkGenericWarningMacro("Bad vorticity[0] value " << v[0] << " " <<
+                               g[7]-g[5] << " difference is " << (v[0]-g[7]+g[5]));
+        return 0;
+      }
+      else if(!ArePointsWithinTolerance(v[1], g[2]-g[6]))
+      {
+        vtkGenericWarningMacro("Bad vorticity[1] value " << v[1] << " " <<
+                               g[2]-g[6] << " difference is " << (v[1]-g[2]+g[6]));
+        return 0;
+      }
+      else if(!ArePointsWithinTolerance(v[2], g[3]-g[1]))
+      {
+        vtkGenericWarningMacro("Bad vorticity[2] value " << v[2] << " " <<
+                               g[3]-g[1] << " difference is " << (v[2]-g[3]+g[1]));
+        return 0;
+      }
+    }
+
+    return 1;
+  }
+
+//-----------------------------------------------------------------------------
+// we assume that the gradients are correct and so we can compute the "real"
+// Q criterion from it
+  int IsQCriterionCorrect(vtkDoubleArray* gradients, vtkDoubleArray* qCriterion)
+  {
+    if(gradients->GetNumberOfComponents() != 9 ||
+       qCriterion->GetNumberOfComponents() != 1)
+    {
+      vtkGenericWarningMacro("Bad number of components.");
+      return 0;
+    }
+    for(vtkIdType i=0;i<gradients->GetNumberOfTuples();i++)
+    {
+      double* g = gradients->GetTuple(i);
+      double qc = qCriterion->GetValue(i);
+
+      double t1 = .25*(
+        (g[7]-g[5])*(g[7]-g[5]) +
+        (g[3]-g[1])*(g[3]-g[1]) +
+        (g[2]-g[6])*(g[2]-g[6]) );
+      double t2 = .5 * ( g[0]*g[0]+g[4]*g[4]+
+                         g[8]*g[8]+ .5 *(
+                           (g[3]+g[1])*(g[3]+g[1]) +
+                           (g[6]+g[2])*(g[6]+g[2]) +
+                           (g[7]+g[5])*(g[7]+g[5]) ) );
+
+      if(!ArePointsWithinTolerance(qc, t1 - t2))
+      {
+        vtkGenericWarningMacro("Bad Q-criterion value " << qc << " " <<
+                               t1-t2 << " difference is " << (qc-t1+t2));
+        return 0;
+      }
+    }
+
+    return 1;
+  }
+
+//-----------------------------------------------------------------------------
+// we assume that the gradients are correct and so we can compute the "real"
+// divergence from it
+  int IsDivergenceCorrect(vtkDoubleArray* gradients, vtkDoubleArray* divergence)
+  {
+    if(gradients->GetNumberOfComponents() != 9 ||
+       divergence->GetNumberOfComponents() != 1)
+    {
+      vtkGenericWarningMacro("Bad number of components.");
+      return 0;
+    }
+    for(vtkIdType i=0;i<gradients->GetNumberOfTuples();i++)
+    {
+      double* g = gradients->GetTuple(i);
+      double div = divergence->GetValue(i);
+      double gValue = g[0]+g[4]+g[8];
+
+      if(!ArePointsWithinTolerance(div, gValue))
+      {
+        vtkGenericWarningMacro("Bad divergence value " << div << " " <<
+                               gValue << " difference is " << (div-gValue));
+        return 0;
+      }
+    }
+
+    return 1;
+  }
+
+//-----------------------------------------------------------------------------
+  int PerformTest(vtkDataSet* grid)
+  {
+    // Cleaning out the existing field data so that I can replace it with
+    // an analytic function that I know the gradient of
+    grid->GetPointData()->Initialize();
+    const char fieldName[] = "LinearField";
+
+    vtkNew<vtkArrayCalculator> calculator;
+    calculator->SetInputData(grid);
+    calculator->SetResultArrayName(fieldName);
+    calculator->SetFunction("coordsY*iHat+coordsX*jHat+coordsZ*kHat");
+    calculator->SetAttributeModeToUsePointData();
+    calculator->AddCoordinateScalarVariable("coordsX", 0);
+    calculator->AddCoordinateScalarVariable("coordsY", 1);
+    calculator->AddCoordinateScalarVariable("coordsZ", 2);
+
+    const char resultName[] = "Result";
+
+    vtkNew<vtkmGradient> pointGradients;
+    pointGradients->SetInputConnection(calculator->GetOutputPort());
+    pointGradients->SetInputScalars(
+      vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName);
+    pointGradients->SetResultArrayName(resultName);
+
+    vtkNew<vtkGradientFilter> correctPointGradients;
+    correctPointGradients->SetInputConnection(calculator->GetOutputPort());
+    correctPointGradients->SetInputScalars(
+      vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName);
+    correctPointGradients->SetResultArrayName(resultName);
+
+    pointGradients->Update();
+    correctPointGradients->Update();
+
+    vtkDoubleArray* gradPointArray = vtkArrayDownCast<vtkDoubleArray>(
+      vtkDataSet::SafeDownCast(
+        pointGradients->GetOutput())->GetPointData()->GetArray(resultName));
+
+    vtkDoubleArray* correctPointArray = vtkArrayDownCast<vtkDoubleArray>(
+      vtkDataSet::SafeDownCast(
+        correctPointGradients->GetOutput())->GetPointData()->GetArray(resultName));
+    std::cout << "testing point gradients" << std::endl;
+    if(!IsGradientCorrect(gradPointArray, correctPointArray))
+    {
+      return EXIT_FAILURE;
+    }
+
+    vtkNew<vtkmGradient> pointVorticity;
+    pointVorticity->SetInputConnection(calculator->GetOutputPort());
+    pointVorticity->SetInputScalars(
+      vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName);
+    pointVorticity->SetResultArrayName(resultName);
+    pointVorticity->SetComputeVorticity(1);
+    pointVorticity->SetComputeQCriterion(1);
+    pointVorticity->SetComputeDivergence(1);
+    pointVorticity->Update();
+
+    std::cout << "testing point vorticity" << std::endl;
+    // point stuff
+    vtkDoubleArray* vorticityPointArray = vtkArrayDownCast<vtkDoubleArray>(
+      vtkDataSet::SafeDownCast(
+        pointVorticity->GetOutput())->GetPointData()->GetArray("Vorticity"));
+    if(!IsVorticityCorrect(gradPointArray, vorticityPointArray))
+    {
+      return EXIT_FAILURE;
+    }
+
+    std::cout << "testing point divergence" << std::endl;
+    vtkDoubleArray* divergencePointArray = vtkArrayDownCast<vtkDoubleArray>(
+      vtkDataSet::SafeDownCast(
+        pointVorticity->GetOutput())->GetPointData()->GetArray("Divergence"));
+    if(!IsDivergenceCorrect(gradPointArray, divergencePointArray))
+    {
+      return EXIT_FAILURE;
+    }
+
+    std::cout << "testing point QCriterion" << std::endl;
+    vtkDoubleArray* qCriterionPointArray = vtkArrayDownCast<vtkDoubleArray>(
+      vtkDataSet::SafeDownCast(
+        pointVorticity->GetOutput())->GetPointData()->GetArray("Q-criterion"));
+    if(!IsQCriterionCorrect(gradPointArray, qCriterionPointArray))
+    {
+      return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
+  }
+} // end local namespace
+
+//-----------------------------------------------------------------------------
+int TestVTKMGradient(int argc, char *argv[])
+{
+
+  vtkNew<vtkRTAnalyticSource> wavelet;
+  wavelet->SetWholeExtent(-10, 10, -10, 10, -10, 10);
+  wavelet->SetCenter(0, 0, 0);
+  wavelet->Update();
+
+  vtkDataSet* grid = vtkDataSet::SafeDownCast(
+    wavelet->GetOutput());
+
+  if(PerformTest(grid))
+  {
+    return EXIT_FAILURE;
+  }
+
+  // convert the structured grid to an unstructured grid
+  vtkNew<vtkmCleanGrid> ug;
+  ug->SetInputConnection(wavelet->GetOutputPort());
+  ug->Update();
+
+  grid = vtkDataSet::SafeDownCast(ug->GetOutput());
+  return PerformTest(grid);
+}

Accelerators/Vtkm/Testing/Cxx/TestVTKMGradientAndVorticity.cxx

@@ -17,6 +17,7 @@
  See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details.
 ----------------------------------------------------------------------------*/
 
+#include "vtkArrayCalculator.h"
 #include "vtkCell.h"
 #include "vtkCellData.h"
 #include "vtkDoubleArray.h"
@@ -114,41 +115,56 @@ namespace
   }
 
 //-----------------------------------------------------------------------------
-  int IsGradientCorrect(vtkDoubleArray* gradients, int offset)
+  int IsGradientCorrect(vtkDoubleArray* gradients,
+                        vtkDoubleArray* correct)
   {
     int numberOfComponents = gradients->GetNumberOfComponents();
     for(vtkIdType i=0;i<gradients->GetNumberOfTuples();i++)
     {
-      double* values = gradients->GetTuple(i);
-      for(int origComp=0;origComp<numberOfComponents/3;origComp++)
+      bool invalid = false;
+      for(int j=0;j<numberOfComponents;j++)
+      {
+        double value = gradients->GetTypedComponent(i, j);
+        double expected = correct->GetTypedComponent(i, j);
+
+        if( (value - expected) > Tolerance)
+        {
+          invalid = true;
+        }
+      }
+
+      if(invalid)
       {
-        for(int gradDir=0;gradDir<3;gradDir++)
+        std::vector<double> values; values.resize(numberOfComponents);
+        std::vector<double> expected; expected.resize(numberOfComponents);
+
+        gradients->GetTypedTuple(i, values.data());
+        correct->GetTypedTuple(i, expected.data());
+
+        std::cout << "Gradient[ i ] should look like: " << std::endl;
+        std::cout << expected[0] << ", " << expected[1] << ", " <<  expected[2] << std::endl;
+        if(numberOfComponents > 3)
+        {
+          std::cout << expected[3] << ", " <<  expected[4] << ", " <<  expected[5] << std::endl;
+          std::cout << expected[6] << ", " <<  expected[7] << ", " <<  expected[8] << std::endl;
+        }
+
+        std::cout << "Gradient[ i ] actually looks like: " << std::endl;
+        std::cout << values[0] << ", " << values[1] << ", " <<  values[2] << std::endl;
+        if(numberOfComponents > 3)
         {
-          if((origComp-gradDir+offset)%3 == 0)
-          {
-            if(fabs(values[origComp*3+gradDir]-1.) > Tolerance)
-            {
-              vtkGenericWarningMacro("Gradient[ "
-                                     << (origComp*3+gradDir)
-                                     << " ] value should be one but is "
-                                     << values[origComp*3+gradDir]);
-              if(i>10)
-              return 0;
-            }
-          }
-          else if(fabs(values[origComp*3+gradDir]) > Tolerance)
-          {
-            vtkGenericWarningMacro("Gradient[ "
-                                     << (origComp*3+gradDir)
-                                     << " ] value should be zero but is "
-                                     << values[origComp*3+gradDir]);
-            if(i>10)
-            return 0;
-          }
+          std::cout << values[3] << ", " <<  values[4] << ", " <<  values[5] << std::endl;
+          std::cout << values[6] << ", " <<  values[7] << ", " <<  values[8] << std::endl;
         }
+        std::cout << std::endl;
+      }
+
+      if(i>10 && invalid)
+      {
+        return 0;
       }
     }
-    return 1;
+  return 1;
   }
 
 //-----------------------------------------------------------------------------
@@ -275,25 +291,44 @@ namespace
       vtkDataObject::FIELD_ASSOCIATION_CELLS, fieldName);
     cellGradients->SetResultArrayName(resultName);
 
+    VTK_CREATE(vtkGradientFilter, correctCellGradients);
+    correctCellGradients->SetInputData(grid);
+    correctCellGradients->SetInputScalars(
+      vtkDataObject::FIELD_ASSOCIATION_CELLS, fieldName);
+    correctCellGradients->SetResultArrayName(resultName);
+
     VTK_CREATE(vtkmGradient, pointGradients);
     pointGradients->SetInputData(grid);
     pointGradients->SetInputScalars(
       vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName);
     pointGradients->SetResultArrayName(resultName);
 
+    VTK_CREATE(vtkGradientFilter, correctPointGradients);
+    correctPointGradients->SetInputData(grid);
+    correctPointGradients->SetInputScalars(
+      vtkDataObject::FIELD_ASSOCIATION_POINTS, fieldName);
+    correctPointGradients->SetResultArrayName(resultName);
+
     cellGradients->Update();
     pointGradients->Update();
 
+    correctCellGradients->Update();
+    correctPointGradients->Update();
+
     vtkDoubleArray* gradCellArray = vtkArrayDownCast<vtkDoubleArray>(
       vtkDataSet::SafeDownCast(
         cellGradients->GetOutput())->GetCellData()->GetArray(resultName));
 
+    vtkDoubleArray* correctCellArray = vtkArrayDownCast<vtkDoubleArray>(
+      vtkDataSet::SafeDownCast(
+        correctCellGradients->GetOutput())->GetCellData()->GetArray(resultName));
+
     if(!grid->IsA("vtkUnstructuredGrid"))
     {
       // ignore cell gradients if this is an unstructured grid
       // because the accuracy is so lousy
       std::cout << "testing cell gradients" << std::endl;
-      if(!IsGradientCorrect(gradCellArray, offset))
+      if(!IsGradientCorrect(gradCellArray, correctCellArray))
       {
         return EXIT_FAILURE;
       }
@@ -302,8 +337,12 @@ namespace
     vtkDoubleArray* gradPointArray = vtkArrayDownCast<vtkDoubleArray>(
       vtkDataSet::SafeDownCast(
         pointGradients->GetOutput())->GetPointData()->GetArray(resultName));
+
+    vtkDoubleArray* correctPointArray = vtkArrayDownCast<vtkDoubleArray>(
+      vtkDataSet::SafeDownCast(
+        correctPointGradients->GetOutput())->GetPointData()->GetArray(resultName));
     std::cout << "testing point gradients" << std::endl;
-    if(!IsGradientCorrect(gradPointArray, offset))
+    if(!IsGradientCorrect(gradPointArray, correctPointArray))
     {
       return EXIT_FAILURE;
     }
@@ -327,33 +366,36 @@ namespace
     pointVorticity->SetComputeDivergence(1);
     pointVorticity->Update();
 
+    std::cout << "testing cell vorticity" << std::endl;
     // cell stuff
     vtkDoubleArray* vorticityCellArray = vtkArrayDownCast<vtkDoubleArray>(
       vtkDataSet::SafeDownCast(
         cellVorticity->GetOutput())->GetCellData()->GetArray("Vorticity"));
-
     if(!IsVorticityCorrect(gradCellArray, vorticityCellArray))
     {
       return EXIT_FAILURE;
     }
 
+    std::cout << "testing point vorticity" << std::endl;
     // point stuff
     vtkDoubleArray* vorticityPointArray = vtkArrayDownCast<vtkDoubleArray>(
       vtkDataSet::SafeDownCast(
         pointVorticity->GetOutput())->GetPointData()->GetArray("Vorticity"));
-
     if(!IsVorticityCorrect(gradPointArray, vorticityPointArray))
     {
       return EXIT_FAILURE;
     }
+
+    std::cout << "testing point divergence" << std::endl;
     vtkDoubleArray* divergencePointArray = vtkArrayDownCast<vtkDoubleArray>(
       vtkDataSet::SafeDownCast(
         pointVorticity->GetOutput())->GetPointData()->GetArray("Divergence"));
-
     if(!IsDivergenceCorrect(gradPointArray, divergencePointArray))
     {
       return EXIT_FAILURE;
     }
+
+    std::cout << "testing point QCriterion" << std::endl;
     vtkDoubleArray* qCriterionPointArray = vtkArrayDownCast<vtkDoubleArray>(
       vtkDataSet::SafeDownCast(
         pointVorticity->GetOutput())->GetPointData()->GetArray("Q-criterion"));

Accelerators/Vtkm/vtkmGradient.cxx

@@ -15,6 +15,7 @@
 //=============================================================================
 #include "vtkmGradient.h"
 
+#include "vtkCellData.h"
 #include "vtkDataSet.h"
 #include "vtkInformation.h"
 #include "vtkInformationVector.h"
@@ -38,8 +39,10 @@ vtkStandardNewMacro(vtkmGradient)
 
 namespace
 {
-struct GradientOutTypes
+struct GradientTypes
     : vtkm::ListTagBase<
+                        vtkm::Float32,
+                        vtkm::Float64,
                         vtkm::Vec<vtkm::Float32,3>,
                         vtkm::Vec<vtkm::Float64,3>,
                         vtkm::Vec< vtkm::Vec<vtkm::Float32,3>, 3>,
@@ -49,19 +52,19 @@ struct GradientOutTypes
 };
 
 //------------------------------------------------------------------------------
-class vtkmGradientOutputFilterPolicy
-      : public vtkm::filter::PolicyBase<vtkmGradientOutputFilterPolicy>
+class vtkmGradientFilterPolicy
+      : public vtkm::filter::PolicyBase<vtkmGradientFilterPolicy>
   {
   public:
-    typedef GradientOutTypes FieldTypeList;
+    typedef GradientTypes FieldTypeList;
     typedef tovtkm::TypeListTagVTMOut FieldStorageList;
 
-    typedef tovtkm::CellListStructuredOutVTK StructuredCellSetList;
-    typedef tovtkm::CellListUnstructuredOutVTK UnstructuredCellSetList;
-    typedef tovtkm::CellListAllOutVTK AllCellSetList;
+    typedef tovtkm::CellListStructuredInVTK StructuredCellSetList;
+    typedef tovtkm::CellListUnstructuredInVTK UnstructuredCellSetList;
+    typedef tovtkm::CellListAllInVTK AllCellSetList;
 
     typedef vtkm::TypeListTagFieldVec3 CoordinateTypeList;
-    typedef tovtkm::PointListOutVTK CoordinateStorageList;
+    typedef tovtkm::PointListInVTK CoordinateStorageList;
 
     typedef vtkm::filter::PolicyDefault::DeviceAdapterList DeviceAdapterList;
   };
@@ -101,31 +104,30 @@ int vtkmGradient::RequestData(vtkInformation* request,
   // grab the input array to process to determine the field want to compute
   // the gradient for
   int association = this->GetInputArrayAssociation(0, inputVector);
-  if(association != vtkDataObject::FIELD_ASSOCIATION_POINTS)
-  {
-    vtkWarningMacro(<< "VTK-m Gradient currently only support point based fields.\n"
-                    << "Falling back to vtkGradientFilter."
-                    );
-    return this->Superclass::RequestData(request, inputVector, outputVector