Merge topic 'ghost-test-cleaning'

214d034 Ghost cells generator: cleaning legacy tests

Acked-by: Kitware Robot <[email protected]>
Acked-by: Utkarsh Ayachit <[email protected]>
Merge-request: !8203

Author: yohannbearzi

Filters/Geometry/Testing/Cxx/CMakeLists.txt

@@ -10,16 +10,13 @@ vtk_add_test_cxx(vtkFiltersGeometryCxxTests tests
   TestProjectSphereFilter.cxx,NO_VALID
   TestRegularGridDataSetSurfaceFilter.cxx
   TestStructuredAMRNeighbor.cxx,NO_VALID
-  TestUniformGridGhostDataGenerator.cxx,NO_VALID
   TestUnstructuredGridGeometryFilter.cxx
-  TestUnstructuredGridGeometryFilterGhostCells.cxx,NO_VALID
   )
 vtk_add_test_cxx(vtkFiltersGeometryCxxTests no_data_tests
   NO_DATA NO_VALID NO_OUTPUT
   TestGeometryFilterCellData.cxx
   TestStructuredAMRGridConnectivity.cxx
   TestStructuredGridConnectivity.cxx
-  TestStructuredGridGhostDataGenerator.cxx
   UnitTestDataSetSurfaceFilter.cxx
   UnitTestProjectSphereFilter.cxx
   )

Filters/Geometry/vtk.module

@@ -19,7 +19,6 @@ TEST_DEPENDS
   VTK::CommonSystem
   VTK::FiltersGeneral
   VTK::FiltersGeometry
-  VTK::FiltersParallelDIY2
   VTK::FiltersSources
   VTK::IOImage
   VTK::IOXML

Filters/ParallelDIY2/Testing/Cxx/CMakeLists.txt

@@ -8,9 +8,14 @@ if (TARGET VTK::mpi)
     TestPResampleToImage.cxx
     TestPResampleWithDataSet2.cxx
     TestPResampleWithDataSet.cxx
+    TestPUniformGridGhostDataGenerator.cxx,NO_VALID
+    TestPUnstructuredGridGhostCellsGenerator.cxx,NO_VALID
     TestProbeLineFilter.cxx
     TestRedistributeDataSetFilter.cxx
-    TestRedistributeDataSetFilterOnIoss.cxx,NO_VALID)
+    TestRedistributeDataSetFilterOnIoss.cxx,NO_VALID
+    TestStructuredGridGhostDataGenerator.cxx,NO_VALID
+    TestUniformGridGhostDataGenerator.cxx,NO_VALID
+    TestUnstructuredGridGeometryFilterGhostCells.cxx,NO_VALID)
 
 # We want 4 processes to test the vtkAggregateDataSetFilter
 # properly.

Filters/ParallelGeometry/Testing/Cxx/TestPStructuredGridGhostDataGenerator.cxx Filters/ParallelDIY2/Testing/Cxx/TestPStructuredGridGhostDataGenerator.cxx

@@ -1,7 +1,7 @@
 /*=========================================================================
 
   Program:   Visualization Toolkit
-  Module:    TestPUniformGridGhostDataGenerator.cxx
+  Module:    TestGhostCellsGenerator.cxx
 
   Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
   All rights reserved.
@@ -12,7 +12,7 @@
      PURPOSE.  See the above copyright notice for more information.
 
 =========================================================================*/
-// .NAME TestPUniformGridGhostDataGenerator.cxx -- Tests ghost data generation
+// .NAME TestGhostCellsGenerator.cxx -- Tests ghost data generation
 //
 // .SECTION Description
 // Parallel test that exercises the parallel uniform grid ghost data generator
@@ -27,12 +27,12 @@
 #include "vtkCell.h"
 #include "vtkCellData.h"
 #include "vtkDoubleArray.h"
+#include "vtkGhostCellsGenerator.h"
 #include "vtkInformation.h"
 #include "vtkMPIController.h"
 #include "vtkMathUtilities.h"
 #include "vtkMultiBlockDataSet.h"
 #include "vtkMultiProcessController.h"
-#include "vtkPUniformGridGhostDataGenerator.h"
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkUniformGrid.h"
@@ -410,15 +410,15 @@ int Test2D(const bool hasNodeData, const bool hasCellData, const int factor, con
   }
   WriteDistributedDataSet("P2DInitial", mbds);
 
-  vtkPUniformGridGhostDataGenerator* ghostGenerator = vtkPUniformGridGhostDataGenerator::New();
+  vtkGhostCellsGenerator* ghostGenerator = vtkGhostCellsGenerator::New();
 
   ghostGenerator->SetInputData(mbds);
   ghostGenerator->SetNumberOfGhostLayers(NG);
   ghostGenerator->SetController(Controller);
-  ghostGenerator->Initialize();
   ghostGenerator->Update();
 
-  vtkMultiBlockDataSet* ghostedDataSet = ghostGenerator->GetOutput();
+  vtkMultiBlockDataSet* ghostedDataSet =
+    vtkMultiBlockDataSet::SafeDownCast(ghostGenerator->GetOutputDataObject(0));
   WriteDistributedDataSet("GHOSTED2D", ghostedDataSet);
 
   rc = CheckFields(ghostedDataSet, hasNodeData, hasCellData);
@@ -475,15 +475,16 @@ int Test3D(const bool hasNodeData, const bool hasCellData, const int factor, con
   }
   WriteDistributedDataSet("P3DInitial", mbds);
 
-  vtkPUniformGridGhostDataGenerator* ghostGenerator = vtkPUniformGridGhostDataGenerator::New();
+  vtkGhostCellsGenerator* ghostGenerator = vtkGhostCellsGenerator::New();
 
   ghostGenerator->SetInputData(mbds);
   ghostGenerator->SetNumberOfGhostLayers(NG);
   ghostGenerator->SetController(Controller);
   ghostGenerator->Initialize();
   ghostGenerator->Update();
 
-  vtkMultiBlockDataSet* ghostedDataSet = ghostGenerator->GetOutput();
+  vtkMultiBlockDataSet* ghostedDataSet =
+    vtkMultiBlockDataSet::SafeDownCast(ghostGenerator->GetOutputDataObject(0));
   WriteDistributedDataSet("GHOSTED3D", ghostedDataSet);
 
   rc = CheckFields(ghostedDataSet, hasNodeData, hasCellData);

Filters/ParallelGeometry/Testing/Cxx/TestPUniformGridGhostDataGenerator.cxx Filters/ParallelDIY2/Testing/Cxx/TestPUniformGridGhostDataGenerator.cxx

@@ -30,6 +30,7 @@ TEST_DEPENDS
   VTK::ParallelCore
   VTK::IOExodus
   VTK::IOIoss
+  VTK::IOParallelXML
   VTK::RenderingOpenGL2
   VTK::RenderingParallel
   VTK::TestingCore

Filters/ParallelGeometry/Testing/Cxx/TestPUnstructuredGridGhostCellsGenerator.cxx Filters/ParallelDIY2/Testing/Cxx/TestPUnstructuredGridGhostCellsGenerator.cxx

@@ -1,9 +1,6 @@
 set(vtkFiltersParallelGeometryCxxTests-MPI_NUMPROCS 4)
 set(Tests_SRCS
-  TestPStructuredGridConnectivity.cxx
-  TestPStructuredGridGhostDataGenerator.cxx
-  TestPUnstructuredGridGhostCellsGenerator.cxx
-  TestPUniformGridGhostDataGenerator.cxx)
+  TestPStructuredGridConnectivity.cxx)
 
 vtk_add_test_mpi(vtkFiltersParallelGeometryCxxTests-MPI tests ${Tests_SRCS})
 

Filters/Geometry/Testing/Cxx/TestStructuredGridGhostDataGenerator.cxx Filters/ParallelDIY2/Testing/Cxx/TestStructuredGridGhostDataGenerator.cxx

@@ -26,7 +26,6 @@ PRIVATE_DEPENDS
 TEST_DEPENDS
   VTK::CommonDataModel
   VTK::FiltersGeneral
-  VTK::FiltersParallelDIY2
   VTK::FiltersParallelMPI
   VTK::IOParallel
   VTK::IOParallelXML