Merge topic 'append-filters-preserve-global-ids'

dd5e5d3 extend TestAppendFilter to check for global ids
ae5d870 make append filters preserve global ids.

Acked-by: Kitware Robot <[email protected]>
Acked-by: David E. DeMarle <[email protected]>
Acked-by: Bill Lorensen <[email protected]>
Merge-request: !5008

Author: utkarshayachit

Filters/Core/Testing/Cxx/TestAppendFilter.cxx

@@ -15,9 +15,10 @@
 
 #include <vtkAppendFilter.h>
 #include <vtkCellData.h>
-#include <vtkDataSet.h>
 #include <vtkDataSetAttributes.h>
+#include <vtkDataSet.h>
 #include <vtkIdList.h>
+#include <vtkIdTypeArray.h>
 #include <vtkIntArray.h>
 #include <vtkMath.h>
 #include <vtkNew.h>
@@ -26,6 +27,8 @@
 #include <vtkSmartPointer.h>
 #include <vtkUnstructuredGrid.h>
 
+#include <numeric> // for iota
+
 //////////////////////////////////////////////////////////////////////////////
 namespace {
 
@@ -111,6 +114,29 @@ void CreateDataset(vtkPolyData* dataset,
   }
 
   dataset->SetPoints( points );
+
+  // Add global point and cell ids.
+  static int next_point_gid = 0;
+  if (auto nodeids = vtkSmartPointer<vtkIntArray>::New())
+  {
+    nodeids->SetName("GlobalNodeIds");
+    nodeids->SetNumberOfTuples(numberOfPoints);
+    std::iota(nodeids->GetPointer(0), nodeids->GetPointer(0) + numberOfPoints, next_point_gid);
+    dataset->GetPointData()->SetGlobalIds(nodeids);
+
+    next_point_gid += numberOfPoints;
+  }
+
+  static int next_cell_gid = 0;
+  if (auto elementids = vtkSmartPointer<vtkIntArray>::New())
+  {
+    elementids->SetName("GlobalElementIds");
+    elementids->SetNumberOfTuples(numberOfCells);
+    std::iota(elementids->GetPointer(0), elementids->GetPointer(0) + numberOfCells, next_cell_gid);
+    dataset->GetCellData()->SetGlobalIds(elementids);
+
+    next_cell_gid += numberOfCells;
+  }
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -135,10 +161,9 @@ int strcmp_null(const char* s1, const char* s2)
 //////////////////////////////////////////////////////////////////////////////
 // Prints and checks point/cell data
 //////////////////////////////////////////////////////////////////////////////
-int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
-                  vtkDataSetAttributes*(*selector)(vtkDataSet*))
+int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output, int fieldType)
 {
-  vtkDataSetAttributes* dataArrays = selector(output);
+  vtkDataSetAttributes* dataArrays = output->GetAttributes(fieldType);
   std::cout << "Evaluating '" << dataArrays->GetClassName() << "'\n";
 
   for (int arrayIndex = 0; arrayIndex < dataArrays->GetNumberOfArrays(); ++arrayIndex)
@@ -180,7 +205,7 @@ int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
     vtkIdType numInputTuples = 0;
     for (size_t inputIndex = 0; inputIndex < inputs.size(); ++inputIndex)
     {
-      vtkDataArray* array = selector(inputs[inputIndex])->GetArray(arrayName);
+      vtkDataArray* array = inputs[inputIndex]->GetAttributes(fieldType)->GetArray(arrayName);
       if (!array)
       {
         std::cerr << "No array named '" << arrayName << "' in input " << inputIndex << "\n";
@@ -198,7 +223,7 @@ int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
     vtkIdType offset = 0;
     for (size_t inputIndex = 0; inputIndex < inputs.size(); ++inputIndex)
     {
-      vtkDataArray* array = selector(inputs[inputIndex])->GetArray(arrayName);
+      vtkDataArray* array = inputs[inputIndex]->GetAttributes(fieldType)->GetArray(arrayName);
       for (int i = 0; i < array->GetNumberOfTuples(); ++i)
       {
         for (int j = 0; j < array->GetNumberOfComponents(); ++j)
@@ -233,7 +258,7 @@ int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
     for (size_t inputIndex = 0; inputIndex < inputs.size(); ++inputIndex)
     {
       vtkAbstractArray* inputAttributeArray =
-        selector(inputs[inputIndex])->GetAbstractAttribute(attributeIndex);
+        inputs[inputIndex]->GetAttributes(fieldType)->GetAbstractAttribute(attributeIndex);
 
       if (outputAttributeArray && !inputAttributeArray)
       {
@@ -258,7 +283,7 @@ int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
     for (size_t inputIndex = 0; inputIndex < inputs.size(); ++inputIndex)
     {
       vtkAbstractArray* inputAttributeArray =
-        selector(inputs[inputIndex])->GetAbstractAttribute(attributeIndex);
+        inputs[inputIndex]->GetAttributes(fieldType)->GetAbstractAttribute(attributeIndex);
       if (!inputAttributeArray)
       {
         allInputsHaveAttribute = false;
@@ -268,11 +293,11 @@ int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
     if (allInputsHaveAttribute)
     {
       vtkAbstractArray* firstAttributeArray =
-        selector(inputs[0])->GetAbstractAttribute(attributeIndex);
+        inputs[0]->GetAttributes(fieldType)->GetAbstractAttribute(attributeIndex);
       for (size_t inputIndex = 1; inputIndex < inputs.size(); ++inputIndex)
       {
         vtkAbstractArray* inputAttributeArray =
-          selector(inputs[inputIndex])->GetAbstractAttribute(attributeIndex);
+          inputs[inputIndex]->GetAttributes(fieldType)->GetAbstractAttribute(attributeIndex);
         if (strcmp_null(firstAttributeArray->GetName(), inputAttributeArray->GetName()) != 0)
         {
           allInputsHaveSameName = false;
@@ -284,7 +309,7 @@ int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
     if (allInputsHaveAttribute && allInputsHaveSameName)
     {
       const char* attributeArrayName =
-        selector(inputs[0])->GetAbstractAttribute(attributeIndex)->GetName();
+        inputs[0]->GetAttributes(fieldType)->GetAbstractAttribute(attributeIndex)->GetName();
       if (!outputAttributeArray)
       {
         std::cerr << "Inputs all have the attribute '" << attributeName << "' set to the name '"
@@ -306,7 +331,7 @@ int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
         vtkIdType offset = 0;
         for (size_t inputIndex = 0; inputIndex < inputs.size(); ++inputIndex)
         {
-          vtkDataArray* attributeArray = selector(inputs[inputIndex])->GetAttribute(attributeIndex);
+          vtkDataArray* attributeArray = inputs[inputIndex]->GetAttributes(fieldType)->GetAttribute(attributeIndex);
           if (!attributeArray)
           {
             continue;
@@ -332,30 +357,6 @@ int PrintAndCheck(const std::vector<vtkPolyData*>& inputs, vtkDataSet* output,
   return 1;
 }
 
-
-//////////////////////////////////////////////////////////////////////////////
-// Selectors for point and cell data
-//////////////////////////////////////////////////////////////////////////////
-vtkDataSetAttributes* PointDataSelector(vtkDataSet* ds)
-{
-  if (ds)
-  {
-    return ds->GetPointData();
-  }
-
-  return nullptr;
-}
-
-vtkDataSetAttributes* CellDataSelector(vtkDataSet* ds)
-{
-  if (ds)
-  {
-    return ds->GetCellData();
-  }
-
-  return nullptr;
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // Returns 1 on success, 0 otherwise
 //////////////////////////////////////////////////////////////////////////////
@@ -379,6 +380,17 @@ int AppendDatasetsAndCheckMergedArrayLengths(vtkAppendFilter* append)
     return 0;
   }
 
+  if (output->GetPointData()->GetGlobalIds() != nullptr)
+  {
+    std::cerr << "Point global ids should have been discarded after merge!\n";
+    return 0;
+  }
+  if (output->GetCellData()->GetGlobalIds() == nullptr)
+  {
+    std::cerr << "Cell global ids should have been preserved after merge!\n";
+    return 0;
+  }
+
   return 1;
 }
 
@@ -395,12 +407,24 @@ int AppendDatasetsAndPrint(const std::vector<vtkPolyData*>& inputs)
   append->Update();
   vtkUnstructuredGrid * output = append->GetOutput();
 
-  if (!PrintAndCheck(inputs, output, PointDataSelector))
+  if (!PrintAndCheck(inputs, output, vtkDataObject::POINT))
+  {
+    return 0;
+  }
+  if (!PrintAndCheck(inputs, output, vtkDataObject::CELL))
+  {
+    return 0;
+  }
+
+  if (output->GetPointData()->GetGlobalIds() == nullptr)
   {
+    std::cerr << "Point global ids should have been preserved!\n";
     return 0;
   }
-  if (!PrintAndCheck(inputs, output, CellDataSelector))
+
+  if (output->GetCellData()->GetGlobalIds() == nullptr)
   {
+    std::cerr << "Cell global ids should have been preserved!\n";
     return 0;
   }
 

Filters/Core/vtkAppendFilter.cxx

@@ -332,6 +332,14 @@ int vtkAppendFilter::RequestData(
     ptOffset += dataSetNumPts;
   }
 
+  // this filter can copy global ids except for global point ids when merging
+  // points (see paraview/paraview#18666).
+  // Note, not copying global ids is the default behavior.
+  if (reallyMergePoints == false)
+  {
+    output->GetPointData()->CopyAllOn(vtkDataSetAttributes::COPYTUPLE);
+  }
+  output->GetCellData()->CopyAllOn(vtkDataSetAttributes::COPYTUPLE);
 
   // Now copy the array data
   this->AppendArrays(

Filters/Core/vtkAppendPolyData.cxx

@@ -331,6 +331,11 @@ int vtkAppendPolyData::ExecuteAppend(vtkPolyData* output,
     return 0;
   }
 
+  // Since points are cells are not merged,
+  // this filter can easily pass all field arrays, including global ids.
+  outputPD->CopyAllOn(vtkDataSetAttributes::COPYTUPLE);
+  outputCD->CopyAllOn(vtkDataSetAttributes::COPYTUPLE);
+
   // Allocate the point and cell data
   outputPD->CopyAllocate(ptList,numPts);
   outputCD->CopyAllocate(cellList,numCells);