Merge topic 'htg-gen-fields-fix'

b87af858 Init cell center strategy array with zeros and compute for coarse cells

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Reviewed-by: Louis Gombert <louis.gombert@kitware.com>
Reviewed-by: Guillaume Gisbert <guillaume.gisbert@kitware.com>
Merge-request: !11962

Filters/HyperTree/Testing/Cxx/TestHyperTreeGridGenerateFields.cxx

@@ -282,6 +282,57 @@ bool TestCellCenter()
     return false;
   }
 
+  // CellCenter should be computed even for coarse cells
+  pt = cellCenterArray->GetTuple3(0);
+  if (pt[0] != 0.5 || pt[1] != 0.5)
+  {
+    vtkLogF(ERROR, "CellCenter is %f %f but expected 0.5 0.5\n", pt[0], pt[1]);
+    return false;
+  }
+
+  // CellCenter should NOT be computed for masked cells
+  pt = cellCenterArray->GetTuple3(9);
+  if (pt[0] != 0.0 || pt[1] != 0.0)
+  {
+    vtkLogF(ERROR, "CellCenter should not be computed for masked cells\n");
+    return false;
+  }
+
+  return true;
+}
+
+bool TestValidCell()
+{
+  // Create a HTG
+  vtkNew<vtkHyperTreeGridSource> source;
+  source->SetDimensions(3, 4, 1);
+  source->SetMaxDepth(2);
+  source->SetDescriptor("RRRRR.|.... .... .... .... ....");
+  source->UseMaskOn();
+  source->SetMask("111111|1110 1111 1111 1111 1111");
+  source->Update();
+
+  // Apply our filter
+  vtkNew<vtkHyperTreeGridGenerateFields> generateFields;
+  generateFields->SetInputConnection(source->GetOutputPort());
+  generateFields->Update();
+  vtkHyperTreeGrid* outputHTG = generateFields->GetHyperTreeGridOutput();
+
+  auto validCellArray =
+    vtkBitArray::SafeDownCast(outputHTG->GetCellData()->GetAbstractArray("ValidCell"));
+
+  if (validCellArray->GetTuple1(8) == 0)
+  {
+    vtkLogF(ERROR, "Unmasked leaf should be valid");
+    return false;
+  }
+
+  if (validCellArray->GetTuple1(9) == 1)
+  {
+    vtkLogF(ERROR, "Masked cell should be invalid");
+    return false;
+  }
+
   return true;
 }
 
@@ -379,6 +430,7 @@ int TestHyperTreeGridGenerateFields(int argc, char* argv[])
   result &= ::TestTotalVolume();
   result &= ::TestCellCenter();
   result &= ::TestArrayDisabling();
+  result &= ::TestValidCell();
 
   return result ? EXIT_SUCCESS : EXIT_FAILURE;
 }

Filters/HyperTree/vtkHyperTreeGridCellCenterStrategy.cxx

@@ -21,8 +21,6 @@ vtkHyperTreeGridCellCenterStrategy::~vtkHyperTreeGridCellCenterStrategy() = defa
 void vtkHyperTreeGridCellCenterStrategy::PrintSelf(ostream& os, vtkIndent indent)
 {
   this->Superclass::PrintSelf(os, indent);
-  os << indent << "InputMask size: " << (this->InputMask ? this->InputMask->GetNumberOfTuples() : 0)
-     << "\n";
   os << indent
      << "InputGhost size: " << (this->InputGhost ? this->InputGhost->GetNumberOfTuples() : 0)
      << "\n";
@@ -36,35 +34,28 @@ void vtkHyperTreeGridCellCenterStrategy::Initialize(vtkHyperTreeGrid* inputHTG)
   this->CellCentersArray->SetName(this->ArrayName.c_str());
   this->CellCentersArray->SetNumberOfComponents(3);
   this->CellCentersArray->SetNumberOfTuples(inputHTG->GetNumberOfCells());
+  this->CellCentersArray->Fill(0);
 
-  this->InputMask = inputHTG->HasMask() ? inputHTG->GetMask() : nullptr;
   this->InputGhost = inputHTG->GetGhostCells();
 }
 
 //------------------------------------------------------------------------------
 void vtkHyperTreeGridCellCenterStrategy::Compute(vtkHyperTreeGridNonOrientedGeometryCursor* cursor)
 {
-  if (cursor->IsLeaf())
+  vtkIdType currentId = cursor->GetGlobalNodeIndex();
+  if (cursor->IsMasked())
+  {
+    return;
+  }
+  if (this->InputGhost != nullptr && this->InputGhost->GetTuple1(currentId) != 0)
   {
-    vtkIdType currentId = cursor->GetGlobalNodeIndex();
-    bool validity = true;
-    if (this->InputMask != nullptr && this->InputMask->GetTuple1(currentId) != 0)
-    {
-      validity = false;
-    }
-    if (this->InputGhost != nullptr && this->InputGhost->GetTuple1(currentId) != 0)
-    {
-      validity = false;
-    }
+    return;
+  }
 
-    if (validity)
-    {
-      double pt[3];
-      cursor->GetPoint(pt);
+  double pt[3];
+  cursor->GetPoint(pt);
 
-      this->CellCentersArray->SetTuple3(currentId, pt[0], pt[1], pt[2]);
-    }
-  }
+  this->CellCentersArray->SetTuple(currentId, pt);
 }
 
 //------------------------------------------------------------------------------

Filters/HyperTree/vtkHyperTreeGridCellCenterStrategy.h

@@ -51,7 +51,6 @@ private:
   ~vtkHyperTreeGridCellCenterStrategy() override;
 
   // Input data
-  vtkBitArray* InputMask = nullptr;
   vtkUnsignedCharArray* InputGhost = nullptr;
 
   // Output array

Filters/HyperTree/vtkHyperTreeGridValidCellStrategy.cxx

@@ -20,8 +20,6 @@ vtkHyperTreeGridValidCellStrategy::~vtkHyperTreeGridValidCellStrategy() = defaul
 void vtkHyperTreeGridValidCellStrategy::PrintSelf(ostream& os, vtkIndent indent)
 {
   this->Superclass::PrintSelf(os, indent);
-  os << indent << "InputMask size: " << (this->InputMask ? this->InputMask->GetNumberOfTuples() : 0)
-     << "\n";
   os << indent
      << "InputGhost size: " << (this->InputGhost ? this->InputGhost->GetNumberOfTuples() : 0)
      << "\n";
@@ -29,21 +27,6 @@ void vtkHyperTreeGridValidCellStrategy::PrintSelf(ostream& os, vtkIndent indent)
      << (this->ValidCellsArray ? this->ValidCellsArray->GetNumberOfTuples() : 0) << "\n";
 }
 
-//------------------------------------------------------------------------------
-void vtkHyperTreeGridValidCellStrategy::SetLeafValidity(const vtkIdType& index)
-{
-  bool validity = true;
-  if (this->InputMask != nullptr && this->InputMask->GetTuple1(index) != 0)
-  {
-    validity = false;
-  }
-  if (this->InputGhost != nullptr && this->InputGhost->GetTuple1(index) != 0)
-  {
-    validity = false;
-  }
-  this->ValidCellsArray->SetTuple1(index, validity ? 1 : 0);
-}
-
 //------------------------------------------------------------------------------
 void vtkHyperTreeGridValidCellStrategy::Initialize(vtkHyperTreeGrid* inputHTG)
 {
@@ -52,7 +35,6 @@ void vtkHyperTreeGridValidCellStrategy::Initialize(vtkHyperTreeGrid* inputHTG)
   this->ValidCellsArray->SetNumberOfTuples(inputHTG->GetNumberOfCells());
   this->ValidCellsArray->Fill(0);
 
-  this->InputMask = inputHTG->HasMask() ? inputHTG->GetMask() : nullptr;
   this->InputGhost = inputHTG->GetGhostCells();
 }
 
@@ -61,8 +43,16 @@ void vtkHyperTreeGridValidCellStrategy::Compute(vtkHyperTreeGridNonOrientedGeome
 {
   if (cursor->IsLeaf())
   {
-    vtkIdType currentId = cursor->GetGlobalNodeIndex();
-    this->SetLeafValidity(currentId);
+    const vtkIdType currentId = cursor->GetGlobalNodeIndex();
+    if (cursor->IsMasked())
+    {
+      return;
+    }
+    if (this->InputGhost != nullptr && this->InputGhost->GetTuple1(currentId) != 0)
+    {
+      return;
+    }
+    this->ValidCellsArray->SetTuple1(currentId, 1);
   }
 }
 

Filters/HyperTree/vtkHyperTreeGridValidCellStrategy.h

@@ -53,14 +53,7 @@ private:
   vtkHyperTreeGridValidCellStrategy();
   ~vtkHyperTreeGridValidCellStrategy() override;
 
-  /**
-   * Set the valid cell array value to true if the HTG leaf cell `index` is a non-ghost and
-   * non-masked cell.
-   */
-  void SetLeafValidity(const vtkIdType& index);
-
   // Input data
-  vtkBitArray* InputMask = nullptr;
   vtkUnsignedCharArray* InputGhost = nullptr;
 
   // Output array