Merge topic 'fix-unstructuredbase-to-unstructured-shallowcopy'

69f3874a Add proper comment with test code origin
c0ae71b1 Add vtkMappedUnstructuredGrid to vtkUnstructuredGrid shallow copy unit test
8c9a9171 Fix #18722: vtkUnstructuredGrid::ShallowCopy creates connectivity if needed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Cory Quammen <cory.quammen@kitware.com>
Merge-request: !9702

CMake/VTKcppcheckSuppressions.txt

@@ -110,6 +110,7 @@ uninitMemberVar:*/Charts/Core/vtkScatterPlotMatrix.cxx
 uninitMemberVar:*/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx
 uninitMemberVar:*/Common/ComputationalGeometry/vtkParametricSpline.cxx
 uninitMemberVar:*/Common/DataModel/Testing/Cxx/TestMappedGridDeepCopy.cxx
+uninitMemberVar:*/Common/DataModel/Testing/Cxx/TestMappedGridShallowCopy.cxx
 uninitMemberVar:*/Common/DataModel/vtkAbstractCellLocator.cxx
 uninitMemberVar:*/Common/DataModel/vtkAttributesErrorMetric.cxx
 uninitMemberVar:*/Common/DataModel/vtkBiQuadraticQuad.cxx

Common/DataModel/Testing/Cxx/CMakeLists.txt

@@ -47,6 +47,7 @@ vtk_add_test_cxx(vtkCommonDataModelCxxTests tests
   TestInterpolationDerivs.cxx
   TestInterpolationFunctions.cxx
   TestMappedGridDeepCopy.cxx
+  TestMappedGridShallowCopy.cxx
   TestPath.cxx
   TestPentagonalPrism.cxx
   TestPiecewiseFunction.cxx

Common/DataModel/Testing/Cxx/TestMappedGridShallowCopy.cxx

+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    TestMappedGridShallowCopy
+
+  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.
+
+=========================================================================*/
+/*----------------------------------------------------------------------------
+  This was taken from TestMappedGridDeepCopy and modified by Bengt Rosenberger.
+----------------------------------------------------------------------------*/
+
+#include "vtkCell.h" // for cell types
+#include "vtkCellData.h"
+#include "vtkCellIterator.h"
+#include "vtkDataArray.h"
+#include "vtkDebugLeaks.h"
+#include "vtkDoubleArray.h"
+#include "vtkIdList.h"
+#include "vtkIdTypeArray.h"
+#include "vtkInformation.h"
+#include "vtkIntArray.h"
+#include "vtkMappedUnstructuredGridGenerator.h"
+#include "vtkNew.h"
+#include "vtkPointData.h"
+#include "vtkPoints.h"
+#include "vtkTestUtilities.h"
+#include "vtkUnstructuredGrid.h"
+#include "vtkXMLUnstructuredGridReader.h"
+#include "vtkXMLUnstructuredGridWriter.h"
+
+#include <algorithm>
+#include <fstream>
+
+int TestMappedGridShallowCopy(int vtkNotUsed(argc), char*[] vtkNotUsed(argv))
+{
+  vtkUnstructuredGridBase* original;
+  vtkMappedUnstructuredGridGenerator::GenerateMappedUnstructuredGrid(&original);
+
+  // This simulates the executive calling vtkUnstructuredGrid::Initialize
+  // when preparing an algorithm output
+  vtkUnstructuredGrid* copy = vtkUnstructuredGrid::New();
+  copy->Initialize();
+
+  // Make sure shallow copy succeeds after call to Initialize
+  copy->ShallowCopy(original);
+
+  // Compare number of points
+  if (copy->GetNumberOfPoints() != original->GetNumberOfPoints())
+  {
+    cerr << "Number of points do not match" << endl;
+    return EXIT_FAILURE;
+  }
+
+  // Compare number of cells
+  if (copy->GetNumberOfCells() != original->GetNumberOfCells())
+  {
+    cerr << "Number of cells do not match" << endl;
+    return EXIT_FAILURE;
+  }
+
+  // Comparison code below taken from TestMappedGridDeepCopy.cxx
+  vtkCellIterator* oIt = original->NewCellIterator();
+  vtkCellIterator* cIt = copy->NewCellIterator();
+
+  vtkNew<vtkGenericCell> orig, copied;
+  for (cIt->InitTraversal(), oIt->InitTraversal();
+       !cIt->IsDoneWithTraversal() && !oIt->IsDoneWithTraversal();
+       cIt->GoToNextCell(), oIt->GoToNextCell())
+  {
+    oIt->GetCell(orig.GetPointer());
+    cIt->GetCell(copied.GetPointer());
+
+    if (cIt->GetCellType() != oIt->GetCellType())
+    {
+      cerr << "Cell types do not match" << endl;
+      return EXIT_FAILURE;
+    }
+
+    if (cIt->GetCellType() == VTK_POLYHEDRON)
+    {
+      vtkIdList* oFaces = oIt->GetFaces();
+      vtkIdList* cFaces = cIt->GetFaces();
+
+      if (cFaces->GetNumberOfIds() != oFaces->GetNumberOfIds())
+      {
+        cerr << "Face id list length does not match" << endl;
+        cerr << "Original: ";
+        for (vtkIdType i = 0; i < oFaces->GetNumberOfIds(); ++i)
+        {
+          cerr << oFaces->GetId(i) << " ";
+        }
+        cerr << endl;
+
+        cerr << "Copied:   ";
+        for (vtkIdType i = 0; i < cFaces->GetNumberOfIds(); ++i)
+          cerr << cFaces->GetId(i) << " ";
+        cerr << endl;
+
+        return EXIT_FAILURE;
+      }
+
+      for (vtkIdType i = 0; i < cFaces->GetNumberOfIds(); ++i)
+      {
+        vtkIdType c = cFaces->GetId(i);
+        vtkIdType o = oFaces->GetId(i);
+
+        if (c != o)
+        {
+          cerr << "Face id list content does not match at" << i << endl;
+          return EXIT_FAILURE;
+        }
+      }
+    }
+  }
+  oIt->Delete();
+  cIt->Delete();
+
+  original->Delete();
+  copy->Delete();
+  return EXIT_SUCCESS;
+}

Common/DataModel/vtkUnstructuredGrid.cxx

@@ -1923,6 +1923,13 @@ void vtkUnstructuredGrid::ShallowCopy(vtkDataObject* dataObject)
   }
   else if (vtkUnstructuredGridBase* ugb = vtkUnstructuredGridBase::SafeDownCast(dataObject))
   {
+    bool isNewAlloc = false;
+    if (!this->Connectivity || !this->Types)
+    {
+      this->AllocateEstimate(ugb->GetNumberOfCells(), ugb->GetMaxCellSize());
+      isNewAlloc = true;
+    }
+
     // The source object has vtkUnstructuredGrid topology, but a different
     // cell implementation. Deep copy the cells, and shallow copy the rest:
     auto cellIter = vtkSmartPointer<vtkCellIterator>::Take(ugb->NewCellIterator());
@@ -1932,6 +1939,11 @@ void vtkUnstructuredGrid::ShallowCopy(vtkDataObject* dataObject)
         cellIter->GetPointIds()->GetPointer(0), cellIter->GetNumberOfFaces(),
         cellIter->GetFaces()->GetPointer(1));
     }
+
+    if (isNewAlloc)
+    {
+      this->Squeeze();
+    }
   }
 }