CMake/vtkCI.cmake

+if (NOT DEFINED ENV{CI})
+  return ()
+endif ()
+
+if (DEFINED ENV{GITLAB_CI})
+  message(STATUS
+    "GitLab CI Pipeline: $ENV{CI_PIPELINE_URL}")
+  message(STATUS
+    "GitLab CI Job: $ENV{CI_JOB_URL}")
+  if (DEFINED ENV{CI_MERGE_REQUEST_PROJECT_URL})
+    message(STATUS
+      "GitLab Merge Request: $ENV{CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/$ENV{CI_MERGE_REQUEST_IID}")
+  endif ()
+  if (DEFINED ENV{CI_PIPELINE_SCHEDULE_DESCRIPTION})
+    message(STATUS
+      "GitLab Scheduled Pipeline: $ENV{CI_PIPELINE_SCHEDULE_DESCRIPTION}")
+  endif ()
+else ()
+  message(STATUS
+    "CI detected, but no known backend")
+endif ()

CMake/vtkVersion.cmake

@@ -6,7 +6,7 @@ set(VTK_MINOR_VERSION 4)
 # the date component is updated while it is in progress, the bump of the minor
 # version ends up conflicting with the patch version update.
 
-set(VTK_BUILD_VERSION 20250311)
+set(VTK_BUILD_VERSION 20250316)
 
 if (NOT VTK_MINOR_VERSION LESS 100)
   message(FATAL_ERROR

CMakeLists.txt

@@ -12,6 +12,7 @@ endif ()
 
 set(vtk_cmake_dir "${VTK_SOURCE_DIR}/CMake")
 list(INSERT CMAKE_MODULE_PATH 0 "${vtk_cmake_dir}")
+include(vtkCI)
 
 if (APPLE)
   include(vtkApple)

Common/Core/vtkObject.cxx

@@ -4,6 +4,7 @@
 
 #include "vtkCommand.h"
 #include "vtkDebugLeaks.h"
+#include "vtkDeprecation.h"
 #include "vtkGarbageCollector.h"
 #include "vtkObjectFactory.h"
 #include "vtkTimeStamp.h"
@@ -714,6 +715,17 @@ void vtkSubjectHelper::PrintSelf(ostream& os, vtkIndent indent)
 //--------------------------------vtkObject observer-----------------------
 unsigned long vtkObject::AddObserver(unsigned long event, vtkCommand* cmd, float p)
 {
+  // VTK_DEPRECATED_IN_9_5_0()
+  // Remove this "#if/#endif" code block when removing 9.5.0 deprecations
+#if VTK_DEPRECATION_LEVEL >= VTK_VERSION_CHECK(9, 4, 20241008)
+  if (event == vtkCommand::WindowResizeEvent && this->IsA("vtkRenderWindowInteractor"))
+  {
+    vtkWarningMacro(
+      "WindowResizeEvent will not be generated by vtkRenderWindowInteractor after VTK 9.6.\n"
+      "Use ConfigureEvent instead, or observe WindowResizeEvent on the vtkRenderWindow.");
+  }
+#endif
+
   if (!this->SubjectHelper)
   {
     this->SubjectHelper = new vtkSubjectHelper;

Common/DataModel/vtkAMRInformation.cxx

@@ -6,6 +6,7 @@
 #include "vtkDoubleArray.h"
 #include "vtkIntArray.h"
 #include "vtkMath.h"
+#include "vtkMathUtilities.h"
 #include "vtkObjectFactory.h"
 #include "vtkStructuredGrid.h"
 #include "vtkUnsignedIntArray.h"
@@ -231,6 +232,26 @@ bool vtkAMRInformation::Audit()
         vtkErrorMacro("Invalid spacing at level " << i << endl);
       }
     }
+
+    if (this->HasRefinementRatio())
+    {
+      double ratio = this->Refinement->GetTuple1(0);
+      unsigned int nextLevel = i + 1;
+      if (nextLevel < this->GetNumberOfLevels())
+      {
+        double nextSpacing[3];
+        this->GetSpacing(nextLevel, nextSpacing);
+        for (int axis = 0; axis < 3; axis++)
+        {
+          if (axis != emptyDimension &&
+            !vtkMathUtilities::NearlyEqual(
+              ratio, vtkMathUtilities::SafeDivision(h[axis], nextSpacing[axis]), 10e-6))
+          {
+            vtkErrorMacro("Spacing and refinement ratio are inconsistent for level " << i << endl);
+          }
+        }
+      }
+    }
   }
 
   // check amr boxes

Common/DataModel/vtkOverlappingAMR.h

@@ -2,15 +2,25 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /**
  * @class   vtkOverlappingAMR
- * @brief   hierarchical dataset of vtkUniformGrids
+ * @brief   a multi-resolution dataset based on vtkUniformGrid allowing overlaps
  *
+ * vtkOverlappingAMR groups vtkUniformGrid into level of different refinement
+ * (AMR stands for Adaptive Mesh Refinement). See SetDataSet to add a new grid.
  *
- * vtkOverlappingAMR extends vtkUniformGridAMR by exposing access to the
- * amr meta data, which stores all structural information represented
- * by an vtkAMRInformation object
+ * The grids of a level are expected to have the same spacing and refinement ratio.
+ * The refinement ratio represent the spacing factor between a level and the
+ * previous one. This class does not ensure the link between spacing and refinement
+ * ratio: please set them carefully.
+ *
+ * Associated to each grid, a vtkAMRBox object describes the main information
+ * of the grid: origin, extent, spacing. When creating a vtkOverlappingAMR,
+ * you should call SetAMRBox for each block of each level.
+ *
+ * In a distributed environement, the structure should be shared across all rank:
+ * the vtkAMRInformation and vtkAMRBox should be duplicated as needed.
  *
  * @sa
- * vtkAMRInformation
+ * vtkAMRInformation, vtkNonOverlappingAMR, vtkUniformGridAMR, vtkAMRBox
  */
 
 #ifndef vtkOverlappingAMR_h
@@ -54,7 +64,16 @@ public:
 
   ///@{
   /**
-   * Get/Set the grid spacing at a given level
+   * Get/Set the grid spacing at a given level.
+   * Note that is expected (but not enforeced) that spacing evolves according
+   * to RefinementRatio factor from previous level to current.
+   * In pseudo code, you should ensure the following:
+   * ```
+   * GetSpacing(lvl, spacing)
+   * SetSpacing(lvl + 1, spacing / RefinementRatio)
+   * ```
+   *
+   * See SetRefinementRatio.
    */
   void SetSpacing(unsigned int level, const double spacing[3]);
   void GetSpacing(unsigned int level, double spacing[3]);

Common/DataModel/vtkUniformGridAMR.h

@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /**
  * @class   vtkUniformGridAMR
- * @brief   a concrete implementation of vtkCompositeDataSet
+ * @brief   a multi-resolution dataset based on vtkUniformGrid
  *
- * vtkUniformGridAMR is an AMR (hierarchical) composite dataset that holds vtkUniformGrids.
+ * vtkUniformGridAMR (AMR stands for Adaptive Mesh Refinement)
+ * is a container for vtkUniformGrid. Each grid is added as a block of a given level.
+ *
+ * The structure of the container is described in a vtkAMRInformation object.
  *
  * @sa
- * vtkUniformGridAMRDataIterator
+ * vtkOverlappingAMR, vtkNonOverlappingAMR, vtkAMRInformation, vtkUniformGridAMRDataIterator
  */
 
 #ifndef vtkUniformGridAMR_h

Documentation/release/dev/add-qt-configure-event.md

+## Generate ConfigureEvent for Qt QResizeEvent
+
+The QVTKInteractorAdapter now translates QResizeEvent into
+a VTK ConfigureEvent.  This brings its behavior in line with
+the native X11/Windows/macOS event handling, which generate
+ConfigureEvent in response to the native UI resize events.

Documentation/release/dev/fix-particle-tracer-unstructured.md

+## Fix vtkParticleTracer with unstructured data
+
+Fix an issue leading to crash in vtkParticleTracer where the locators
+for unstructured data would not have been created.
+
+## vtkParticleTracer::CachedData private
+
+Previously protected member vtkParticleTracer::CachedData is now a private
+member. It is not intended to be used by classes inheriting vtkParticleTracer.

Documentation/release/dev/pbr-lighting.md

+## Fix lighting calculations for PBR interpolation
+
+When both directional and positional lights were intermixed in the view, the polydata mapper treated
+directional lights as positional and generated incorrect renderings. This issue is now fixed.
+
+|Before|After|
+|:--:|:--:|
+|![](./pbr_light_before.png)|![](https://vtk.org/files/ExternalData/SHA512/01b2f3261b9dc1550b1dae1abcc32ab45c170964500115ee66efba9200ff46485d2bee6efe1e13c6972630661c29dfac5abc83de7ac88b21d566a3db215936d4)|
+
+In the images above, there are two lights - a positional light in front of the lower left sphere and
+a directional light in front of the third sphere in the second-last row.
+
+As visible in the **Before** image, the directional light is treated as positional (see light
+reflected in the neighborhood spheres) and has a conical intensity fall-off.
+
+In the **After** image, once can see that the directional light is treated as a point light located
+at an infinite distance from the scene.

Documentation/release/dev/update-fast_float-8.0.2.md

+## Update fast_float to be based on 8.0.2
+
+Update fast_float third party library to be based
+on [fast_float 8.0.2](https://github.com/fastfloat/fast_float/releases/tag/v8.0.2).

Documentation/release/dev/vtkhdf-writer-composite-temporal.md

+## VTKHDF Writer: Support writing composite temporal datasets
+
+The vtkHDFWriter support now extends to composite and temporal datasets (multiblock and partitioned dataset collection), all written in a same file.

Examples/AMR/Cxx/AMRCommon.h

@@ -16,6 +16,7 @@
 #include "vtkCompositeDataWriter.h"
 #include "vtkImageToStructuredGrid.h"
 #include "vtkMultiBlockDataSet.h"
+#include "vtkNew.h"
 #include "vtkOverlappingAMR.h"
 #include "vtkStructuredGridWriter.h"
 #include "vtkUniformGrid.h"
@@ -35,15 +36,13 @@ void WriteUniformGrid(vtkUniformGrid* g, const std::string& prefix)
 {
   assert("pre: Uniform grid (g) is NULL!" && (g != nullptr));
 
-  vtkXMLImageDataWriter* imgWriter = vtkXMLImageDataWriter::New();
+  vtkNew<vtkXMLImageDataWriter> imgWriter;
 
   std::ostringstream oss;
   oss << prefix << "." << imgWriter->GetDefaultFileExtension();
   imgWriter->SetFileName(oss.str().c_str());
   imgWriter->SetInputData(g);
   imgWriter->Write();
-
-  imgWriter->Delete();
 }
 
 //------------------------------------------------------------------------------
@@ -54,14 +53,13 @@ void WriteAMRData(vtkOverlappingAMR* amrData, const std::string& prefix)
   // Sanity check
   assert("pre: AMR dataset is NULL!" && (amrData != nullptr));
 
-  vtkCompositeDataWriter* writer = vtkCompositeDataWriter::New();
+  vtkNew<vtkCompositeDataWriter> writer;
 
   std::ostringstream oss;
   oss << prefix << ".vthb";
   writer->SetFileName(oss.str().c_str());
   writer->SetInputData(amrData);
   writer->Write();
-  writer->Delete();
 }
 
 //------------------------------------------------------------------------------
@@ -98,7 +96,7 @@ void WriteMultiBlockData(vtkMultiBlockDataSet* mbds, const std::string& prefix)
 {
   // Sanity check
   assert("pre: Multi-block dataset is NULL" && (mbds != nullptr));
-  vtkXMLMultiBlockDataWriter* writer = vtkXMLMultiBlockDataWriter::New();
+  vtkNew<vtkXMLMultiBlockDataWriter> writer;
 
   std::ostringstream oss;
   oss.str("");
@@ -107,7 +105,6 @@ void WriteMultiBlockData(vtkMultiBlockDataSet* mbds, const std::string& prefix)
   writer->SetFileName(oss.str().c_str());
   writer->SetInputData(mbds);
   writer->Write();
-  writer->Delete();
 }
 
 //------------------------------------------------------------------------------
@@ -115,7 +112,7 @@ void WriteMultiBlockData(vtkMultiBlockDataSet* mbds, const std::string& prefix)
 // origin, grid spacing and dimensions.
 vtkUniformGrid* GetGrid(double* origin, double* h, int* ndim)
 {
-  vtkUniformGrid* grd = vtkUniformGrid::New();
+  vtkNew<vtkUniformGrid> grd;
   grd->Initialize();
   grd->SetOrigin(origin);
   grd->SetSpacing(h);
@@ -136,10 +133,9 @@ void ComputeCellCenter(vtkUniformGrid* grid, const int cellIdx, double c[3])
   assert("post: cell is NULL" && (myCell != nullptr));
 
   double pCenter[3];
-  double* weights = new double[myCell->GetNumberOfPoints()];
+  std::vector<double> weights(myCell->GetNumberOfPoints());
   int subId = myCell->GetParametricCenter(pCenter);
-  myCell->EvaluateLocation(subId, pCenter, c, weights);
-  delete[] weights;
+  myCell->EvaluateLocation(subId, pCenter, c, weights.data());
 }
 
 VTK_ABI_NAMESPACE_END

Examples/AMR/Cxx/Generate2DAMRDataSetWithPulse.cxx

@@ -65,11 +65,10 @@ int main(int argc, char** argv)
   SetPulse();
 
   // STEP 1: Get the AMR dataset
-  vtkOverlappingAMR* amrDataSet = GetAMRDataSet();
+  auto amrDataSet = vtkSmartPointer<vtkOverlappingAMR>::Take(GetAMRDataSet());
   assert("pre: nullptr AMR dataset" && (amrDataSet != nullptr));
 
   AMRCommon::WriteAMRData(amrDataSet, "Gaussian2D");
-  amrDataSet->Delete();
   return 0;
 }
 
@@ -89,7 +88,7 @@ void AttachPulseToGrid(vtkUniformGrid* grid)
 {
   assert("pre: grid is nullptr!" && (grid != nullptr));
 
-  vtkDoubleArray* xyz = vtkDoubleArray::New();
+  vtkNew<vtkDoubleArray> xyz;
   xyz->SetName("GaussianPulse");
   xyz->SetNumberOfComponents(1);
   xyz->SetNumberOfTuples(grid->GetNumberOfCells());
@@ -111,7 +110,6 @@ void AttachPulseToGrid(vtkUniformGrid* grid)
   } // END for all cells
 
   grid->GetCellData()->AddArray(xyz);
-  xyz->Delete();
 }
 
 //------------------------------------------------------------------------------
@@ -123,7 +121,7 @@ vtkOverlappingAMR* GetAMRDataSet()
   origin[0] = origin[1] = -2.0;
   origin[2] = 0.0;
 
-  vtkOverlappingAMR* data = vtkOverlappingAMR::New();
+  vtkNew<vtkOverlappingAMR> data;
   data->Initialize(NumLevels, BlocksPerLevel);
   data->SetOrigin(origin);
   data->SetGridDescription(VTK_XY_PLANE);
@@ -139,14 +137,13 @@ vtkOverlappingAMR* GetAMRDataSet()
 
   int blockId = 0;
   int level = 0;
-  vtkUniformGrid* root = AMRCommon::GetGrid(origin, h, ndim);
+  auto root = vtkSmartPointer<vtkUniformGrid>::Take(AMRCommon::GetGrid(origin, h, ndim));
   vtkAMRBox box(origin, ndim, h, data->GetOrigin(), data->GetGridDescription());
   AttachPulseToGrid(root);
 
   data->SetSpacing(level, h);
   data->SetAMRBox(level, blockId, box);
   data->SetDataSet(level, blockId, root);
-  root->Delete();
 
   // Block 1,0
   ndim[0] = ndim[1] = 9;
@@ -156,14 +153,13 @@ vtkOverlappingAMR* GetAMRDataSet()
   origin[2] = 0.0;
   blockId = 0;
   level = 1;
-  vtkUniformGrid* grid1 = AMRCommon::GetGrid(origin, h, ndim);
+  auto grid1 = vtkSmartPointer<vtkUniformGrid>::Take(AMRCommon::GetGrid(origin, h, ndim));
   vtkAMRBox box1(origin, ndim, h, data->GetOrigin(), data->GetGridDescription());
   AttachPulseToGrid(grid1);
 
   data->SetSpacing(level, h);
   data->SetAMRBox(level, blockId, box1);
   data->SetDataSet(level, blockId, grid1);
-  grid1->Delete();
 
   // Block 1,1
   ndim[0] = ndim[1] = 9;
@@ -173,14 +169,13 @@ vtkOverlappingAMR* GetAMRDataSet()
   origin[1] = origin[2] = 0.0;
   blockId = 1;
   level = 1;
-  vtkUniformGrid* grid3 = AMRCommon::GetGrid(origin, h, ndim);
-  vtkAMRBox box3(origin, ndim, h, data->GetOrigin(), data->GetGridDescription());
+  auto grid2 = vtkSmartPointer<vtkUniformGrid>::Take(AMRCommon::GetGrid(origin, h, ndim));
+  vtkAMRBox box2(origin, ndim, h, data->GetOrigin(), data->GetGridDescription());
 
-  AttachPulseToGrid(grid3);
+  AttachPulseToGrid(grid2);
   data->SetSpacing(level, h);
-  data->SetAMRBox(level, blockId, box3);
-  data->SetDataSet(level, blockId, grid3);
-  grid3->Delete();
+  data->SetAMRBox(level, blockId, box2);
+  data->SetDataSet(level, blockId, grid2);
 
   vtkAMRUtilities::BlankCells(data);
   data->Audit();

Examples/AMR/Cxx/Generate3DAMRDataSetWithPulse.cxx

@@ -65,11 +65,10 @@ int main(int argc, char** argv)
   SetPulse();
 
   // STEP 1: Get the AMR dataset
-  vtkOverlappingAMR* amrDataSet = GetAMRDataSet();
-  assert("pre: nullptr AMR dataset" && (amrDataSet != nullptr));
+  vtkSmartPointer<vtkOverlappingAMR> amrDataSet;
+  amrDataSet.TakeReference(GetAMRDataSet());
 
   AMRCommon::WriteAMRData(amrDataSet, "Gaussian3D");
-  amrDataSet->Delete();
   return 0;
 }
 
@@ -89,7 +88,7 @@ void AttachPulseToGrid(vtkUniformGrid* grid)
 {
   assert("pre: grid is nullptr!" && (grid != nullptr));
 
-  vtkDoubleArray* xyz = vtkDoubleArray::New();
+  vtkNew<vtkDoubleArray> xyz;
   xyz->SetName("GaussianPulse");
   xyz->SetNumberOfComponents(1);
   xyz->SetNumberOfTuples(grid->GetNumberOfCells());
@@ -111,12 +110,11 @@ void AttachPulseToGrid(vtkUniformGrid* grid)
   } // END for all cells
 
   grid->GetCellData()->AddArray(xyz);
-  xyz->Delete();
 }
 //------------------------------------------------------------------------------
 vtkOverlappingAMR* GetAMRDataSet()
 {
-  vtkOverlappingAMR* data = vtkOverlappingAMR::New();
+  vtkNew<vtkOverlappingAMR> data;
   int blocksPerLevel[2] = { 1, 3 };
   double globalOrigin[3] = { -2.0, -2.0, -2.0 };
   data->Initialize(2, blocksPerLevel);
@@ -134,12 +132,12 @@ vtkOverlappingAMR* GetAMRDataSet()
   origin[0] = origin[1] = origin[2] = -2.0;
   int blockId = 0;
   int level = 0;
-  vtkUniformGrid* root = AMRCommon::GetGrid(origin, h, ndim);
+  vtkSmartPointer<vtkUniformGrid> root;
+  root.TakeReference(AMRCommon::GetGrid(origin, h, ndim));
   vtkAMRBox box(origin, ndim, h, data->GetOrigin(), data->GetGridDescription());
   AttachPulseToGrid(root);
   data->SetAMRBox(level, blockId, box);
   data->SetDataSet(level, blockId, root);
-  root->Delete();
 
   // Block 1
   ndim[0] = 3;
@@ -148,12 +146,12 @@ vtkOverlappingAMR* GetAMRDataSet()
   origin[0] = origin[1] = origin[2] = -2.0;
   blockId = 0;
   level = 1;
-  vtkUniformGrid* grid1 = AMRCommon::GetGrid(origin, h, ndim);
+  vtkSmartPointer<vtkUniformGrid> grid1;
+  root.TakeReference(AMRCommon::GetGrid(origin, h, ndim));
   AttachPulseToGrid(grid1);
   vtkAMRBox box1(origin, ndim, h, data->GetOrigin(), data->GetGridDescription());
   data->SetAMRBox(level, blockId, box1);
   data->SetDataSet(level, blockId, grid1);
-  grid1->Delete();
 
   // Block 2
   ndim[0] = 3;
@@ -163,12 +161,12 @@ vtkOverlappingAMR* GetAMRDataSet()
   origin[1] = origin[2] = -1.0;
   blockId = 1;
   level = 1;
-  vtkUniformGrid* grid2 = AMRCommon::GetGrid(origin, h, ndim);
+  vtkSmartPointer<vtkUniformGrid> grid2;
+  grid2.TakeReference(AMRCommon::GetGrid(origin, h, ndim));
   AttachPulseToGrid(grid2);
   vtkAMRBox box2(origin, ndim, h, data->GetOrigin(), data->GetGridDescription());
   data->SetAMRBox(level, blockId, box2);
   data->SetDataSet(level, blockId, grid2);
-  grid2->Delete();
 
   // Block 3
   ndim[0] = 3;
@@ -178,13 +176,16 @@ vtkOverlappingAMR* GetAMRDataSet()
   origin[1] = origin[2] = -1.0;
   blockId = 2;
   level = 1;
-  vtkUniformGrid* grid3 = AMRCommon::GetGrid(origin, h, ndim);
+  vtkSmartPointer<vtkUniformGrid> grid3;
+  grid3.TakeReference(AMRCommon::GetGrid(origin, h, ndim));
   vtkAMRBox box3(origin, ndim, h, data->GetOrigin(), data->GetGridDescription());
   AttachPulseToGrid(grid3);
   data->SetAMRBox(level, blockId, box3);
   data->SetDataSet(level, blockId, grid3);
-  grid3->Delete();
 
   vtkAMRUtilities::BlankCells(data);
+
+  data->Audit();
+
   return (data);
 }

Filters/FlowPaths/Testing/CMakeLists.txt

 vtk_module_test_data(
   Data/clt.vtm
   Data/clt/,REGEX:.*
-  Data/ParticleTracers/pathline.vtp
-  Data/ParticleTracers/streakline.vtp
-  Data/ParticleTracers/tracer.vtp)
+  Data/ParticleTracers/image_pathline.vtp
+  Data/ParticleTracers/image_streakline.vtp
+  Data/ParticleTracers/image_tracer.vtp
+  Data/ParticleTracers/ug_pathline.vtp
+  Data/ParticleTracers/ug_streakline.vtp
+  Data/ParticleTracers/ug_tracer.vtp)
 
 if (NOT vtk_testing_cxx_disabled)
   add_subdirectory(Cxx)

Filters/FlowPaths/Testing/Cxx/TestParticleTracers.cxx

 // SPDX-FileCopyrightText: Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
 // SPDX-License-Identifier: BSD-3-Clause
 
+#include "vtkAppendDataSets.h"
 #include "vtkGenerateTimeSteps.h"
 #include "vtkGradientFilter.h"
+#include "vtkImageData.h"
 #include "vtkLogger.h"
 #include "vtkNew.h"
 #include "vtkParticlePathFilter.h"
@@ -21,12 +23,14 @@
 namespace
 {
 template <class TracerT>
-bool Execute(vtkAlgorithm* input, vtkPolyData* seeds, vtkSmartPointer<vtkDataObject>&& expected)
+bool Execute(vtkAlgorithm* input, vtkPolyData* seeds, bool vorticity,
+  vtkSmartPointer<vtkDataObject>&& expected)
 {
   vtkNew<TracerT> tracer;
   tracer->SetInputConnection(0, input->GetOutputPort());
   tracer->SetInputData(1, seeds);
   tracer->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, "Gradients");
+  tracer->SetComputeVorticity(vorticity);
 
   for (int t = 0; t < 10; ++t)
   {
@@ -43,7 +47,8 @@ bool Execute(vtkAlgorithm* input, vtkPolyData* seeds, vtkSmartPointer<vtkDataObj
 }
 } // anonymous namespace
 
-int TestParticleTracers(int argc, char* argv[])
+bool TestParticleTracersInput(
+  int argc, char* argv[], vtkDataSet* input, std::string_view prefix, bool vorticity)
 {
   auto getBaseline = [&](std::string&& name)
   {
@@ -54,10 +59,8 @@ int TestParticleTracers(int argc, char* argv[])
     return vtkSmartPointer<vtkDataObject>(reader->GetOutputDataObject(0));
   };
 
-  vtkNew<vtkRTAnalyticSource> wavelet;
   vtkNew<vtkGradientFilter> gradient;
   vtkNew<vtkGenerateTimeSteps> temporal;
-  vtkNew<vtkParticleTracer> tracer;
 
   vtkNew<vtkPolyData> seeds;
   vtkNew<vtkPoints> points;
@@ -71,15 +74,42 @@ int TestParticleTracers(int argc, char* argv[])
   std::iota(timesteps.begin(), timesteps.end(), 0);
   temporal->SetTimeStepValues(10, timesteps.data());
 
-  gradient->SetInputConnection(wavelet->GetOutputPort());
+  gradient->SetInputData(input);
   temporal->SetInputConnection(gradient->GetOutputPort());
 
+  bool retVal = true;
+  ::Execute<vtkParticleTracer>(
+    temporal, seeds, vorticity, getBaseline(std::string(prefix) + "tracer.vtp"));
+  retVal &= ::Execute<vtkParticlePathFilter>(
+    temporal, seeds, vorticity, getBaseline(std::string(prefix) + "pathline.vtp"));
+  retVal &= ::Execute<vtkStreaklineFilter>(
+    temporal, seeds, vorticity, getBaseline(std::string(prefix) + "streakline.vtp"));
+
+  if (!retVal)
+  {
+    vtkLog(ERROR, "With an input of type " << input->GetClassName());
+  }
+  return retVal;
+}
+
+int TestParticleTracers(int argc, char* argv[])
+{
+  bool retVal = true;
+
+  // Test image input
+  vtkNew<vtkRTAnalyticSource> wavelet;
   // mimicking catalyst environment
   wavelet->SetNoPriorTemporalAccessInformationKey();
+  wavelet->Update();
+  retVal &= ::TestParticleTracersInput(argc, argv, wavelet->GetOutput(), "image_", true);
+
+  // Test unstructured grid input
+  vtkNew<vtkAppendDataSets> append;
+  append->SetInputConnection(wavelet->GetOutputPort());
+  append->Update();
 
-  bool retVal = ::Execute<vtkParticleTracer>(temporal, seeds, getBaseline("tracer.vtp"));
-  retVal &= ::Execute<vtkParticlePathFilter>(temporal, seeds, getBaseline("pathline.vtp"));
-  retVal &= ::Execute<vtkStreaklineFilter>(temporal, seeds, getBaseline("streakline.vtp"));
+  // Because of https://gitlab.kitware.com/vtk/vtk/-/issues/19632, disable vorticity computation
+  retVal &= ::TestParticleTracersInput(argc, argv, append->GetOutput(), "ug_", false);
 
   return retVal ? EXIT_SUCCESS : EXIT_FAILURE;
 }

Filters/FlowPaths/vtkParticleTracerBase.cxx

@@ -135,12 +135,7 @@ vtkParticleTracerBase::~vtkParticleTracerBase()
 {
   this->SetParticleWriter(nullptr);
   this->SetParticleFileName(nullptr);
-
-  this->CachedData[0] = nullptr;
-  this->CachedData[1] = nullptr;
-
   this->SetIntegrator(nullptr);
-
   this->SetController(nullptr);
 }
 
@@ -764,19 +759,6 @@ int vtkParticleTracerBase::Initialize(
     return 0;
   }
 
-  // TODO DUPLICATE CODE FIXME
-  if (auto composite = vtkCompositeDataSet::SafeDownCast(input))
-  {
-    this->CachedData[1]->ShallowCopy(composite);
-  }
-  else
-  {
-    auto pds = vtkSmartPointer<vtkPartitionedDataSet>::New();
-    pds->SetNumberOfPartitions(1);
-    pds->SetPartition(0, input);
-    this->CachedData[1] = pds;
-  }
-
   this->OutputPointData->InterpolateAllocate(inputs.front()->GetPointData());
 
   this->ParticleAge->Initialize();
@@ -875,6 +857,21 @@ int vtkParticleTracerBase::Initialize(
   return 1;
 }
 
+//------------------------------------------------------------------------------
+void vtkParticleTracerBase::InitializeNextCachedData(vtkDataObject* input)
+{
+  this->CachedData[1].TakeReference(vtkPartitionedDataSet::New());
+  if (auto composite = vtkCompositeDataSet::SafeDownCast(input))
+  {
+    this->CachedData[1]->CompositeShallowCopy(composite);
+  }
+  else
+  {
+    this->CachedData[1]->SetNumberOfPartitions(1);
+    this->CachedData[1]->SetPartition(0, input);
+  }
+}
+
 //------------------------------------------------------------------------------
 int vtkParticleTracerBase::Execute(
   vtkInformation*, vtkInformationVector** inputVector, vtkInformationVector*)
@@ -889,18 +886,21 @@ int vtkParticleTracerBase::Execute(
   vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
   vtkDataObject* input = inInfo->Get(vtkDataObject::DATA_OBJECT());
   double currentTimeStep = this->GetCurrentTimeStep();
-  std::swap(this->CachedData[0], this->CachedData[1]);
 
-  if (auto composite = vtkCompositeDataSet::SafeDownCast(input))
+  if (this->CachedData[0].Get() == nullptr || this->CachedData[1].Get() == nullptr)
   {
-    this->CachedData[1]->ShallowCopy(composite);
+    // First execution
+    // Initialize the next cached data then copy it to current cached data
+    this->InitializeNextCachedData(input);
+    this->CachedData[0] = this->CachedData[1];
   }
   else
   {
-    auto pds = vtkSmartPointer<vtkPartitionedDataSet>::New();
-    pds->SetNumberOfPartitions(1);
-    pds->SetPartition(0, input);
-    this->CachedData[1] = pds;
+    // Not the first execution:
+    // Copy next data to current data then initialized
+    // next cached data with input
+    this->CachedData[0] = this->CachedData[1];
+    this->InitializeNextCachedData(input);
   }
 
   if (this->InitializeInterpolator() != VTK_OK)

Filters/FlowPaths/vtkParticleTracerBase.h

@@ -45,6 +45,7 @@ class vtkInitialValueProblemSolver;
 class vtkIntArray;
 class vtkMultiBlockDataSet;
 class vtkMultiProcessController;
+class vtkPartitionedDataSet;
 class vtkPointData;
 class vtkPoints;
 class vtkPolyData;
@@ -579,9 +580,6 @@ protected:
   // The velocity interpolator
   vtkSmartPointer<vtkTemporalInterpolatedVelocityField> Interpolator;
 
-  // Data for time step CurrentTimeStep-1 and CurrentTimeStep
-  vtkSmartPointer<vtkCompositeDataSet> CachedData[2];
-
   // MPI controller needed when running in parallel
   vtkSmartPointer<vtkMultiProcessController> Controller;
 
@@ -639,6 +637,13 @@ protected:
   friend class StreaklineFilterInternal;
 
   static const double Epsilon;
+
+private:
+  // Internal method to initialize CachedData[1] using the provided input
+  void InitializeNextCachedData(vtkDataObject* input);
+
+  // Data for time step CurrentTimeStep-1 and CurrentTimeStep
+  vtkSmartPointer<vtkPartitionedDataSet> CachedData[2];
 };
 
 VTK_ABI_NAMESPACE_END