From 405643ddbbd8370f4e4f61c95a702965ab69be71 Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Thu, 1 Dec 2022 13:07:56 -0700 Subject: [PATCH] Rename NewFilter base classes to Filter During the VTK-m 1.8 and 1.9 development, the filter infrastructure was overhauled. Part of this created a completely new set of base classes. To avoid confusion with the original filter base classes and ease transition, the new filter base classes were named `NewFilter*`. Eventually after all filters were transitioned, the old filter base classes were deprecated. With the release of VTK-m 2.0, the old filter base classes are removed. The "new" filter base classes are no longer new. Thus, they have been renamed simply `Filter` (and `FilterField`). --- docs/changelog/rename-filter-base.md | 11 +++++++++ examples/game_of_life/GameOfLife.cxx | 4 ++-- examples/hello_worklet/HelloWorklet.cxx | 4 ++-- examples/histogram/HistogramMPI.cxx | 2 +- examples/histogram/HistogramMPI.h | 4 ++-- examples/multi_backend/MultiDeviceGradient.h | 4 ++-- .../redistribute_points/RedistributePoints.h | 4 ++-- tutorial/extract_edges.cxx | 4 ++-- tutorial/mag_grad.cxx | 4 ++-- tutorial/point_to_cell.cxx | 4 ++-- vtkm/filter/CMakeLists.txt | 8 +++---- vtkm/filter/{NewFilter.cxx => Filter.cxx} | 24 +++++++++---------- vtkm/filter/{NewFilter.h => Filter.h} | 18 +++++++------- .../{NewFilterField.cxx => FilterField.cxx} | 8 +++---- .../{NewFilterField.h => FilterField.h} | 12 +++++----- vtkm/filter/clean_grid/CleanGrid.h | 4 ++-- .../CellSetConnectivity.h | 5 ++-- .../connected_components/ImageConnectivity.h | 5 ++-- vtkm/filter/contour/ClipWithField.h | 4 ++-- .../filter/contour/ClipWithImplicitFunction.h | 4 ++-- vtkm/filter/contour/Contour.h | 4 ++-- vtkm/filter/contour/MIRFilter.h | 4 ++-- vtkm/filter/density_estimate/Entropy.h | 4 ++-- vtkm/filter/density_estimate/Histogram.cxx | 2 +- vtkm/filter/density_estimate/Histogram.h | 4 ++-- vtkm/filter/density_estimate/NDEntropy.h | 4 ++-- vtkm/filter/density_estimate/NDHistogram.h | 4 ++-- .../density_estimate/ParticleDensityBase.h | 4 ++-- vtkm/filter/entity_extraction/ExternalFaces.h | 4 ++-- .../entity_extraction/ExtractGeometry.h | 4 ++-- vtkm/filter/entity_extraction/ExtractPoints.h | 4 ++-- .../entity_extraction/ExtractStructured.h | 4 ++-- .../entity_extraction/GhostCellRemove.h | 4 ++-- vtkm/filter/entity_extraction/Mask.h | 4 ++-- vtkm/filter/entity_extraction/MaskPoints.h | 4 ++-- vtkm/filter/entity_extraction/Threshold.h | 4 ++-- .../entity_extraction/ThresholdPoints.h | 4 ++-- vtkm/filter/field_conversion/CellAverage.h | 4 ++-- vtkm/filter/field_conversion/PointAverage.h | 4 ++-- .../CylindricalCoordinateTransform.h | 4 ++-- vtkm/filter/field_transform/FieldToColors.h | 4 ++-- vtkm/filter/field_transform/GenerateIds.h | 4 ++-- vtkm/filter/field_transform/LogValues.h | 6 ++--- vtkm/filter/field_transform/PointElevation.h | 4 ++-- vtkm/filter/field_transform/PointTransform.h | 4 ++-- .../SphericalCoordinateTransform.h | 4 ++-- vtkm/filter/field_transform/WarpScalar.h | 4 ++-- vtkm/filter/field_transform/WarpVector.h | 4 ++-- vtkm/filter/flow/CMakeLists.txt | 12 +++++----- ...ection.cxx => FilterParticleAdvection.cxx} | 7 +++--- ...eAdvection.h => FilterParticleAdvection.h} | 10 ++++---- ...=> FilterParticleAdvectionSteadyState.cxx} | 4 ++-- ...h => FilterParticleAdvectionSteadyState.h} | 11 ++++----- ... FilterParticleAdvectionUnsteadyState.cxx} | 9 ++++--- ...=> FilterParticleAdvectionUnsteadyState.h} | 11 ++++----- vtkm/filter/flow/Lagrangian.h | 4 ++-- vtkm/filter/flow/LagrangianStructures.h | 4 ++-- vtkm/filter/flow/ParticleAdvection.h | 4 ++-- vtkm/filter/flow/PathParticle.h | 4 ++-- vtkm/filter/flow/Pathline.h | 4 ++-- vtkm/filter/flow/StreamSurface.h | 4 ++-- vtkm/filter/flow/Streamline.h | 4 ++-- .../geometry_refinement/SplitSharpEdges.h | 4 ++-- .../geometry_refinement/Tetrahedralize.h | 4 ++-- vtkm/filter/geometry_refinement/Triangulate.h | 4 ++-- vtkm/filter/geometry_refinement/Tube.h | 4 ++-- .../geometry_refinement/VertexClustering.h | 4 ++-- vtkm/filter/image_processing/ComputeMoments.h | 4 ++-- .../filter/image_processing/ImageDifference.h | 4 ++-- vtkm/filter/image_processing/ImageMedian.h | 4 ++-- vtkm/filter/mesh_info/CellMeasures.h | 4 ++-- vtkm/filter/mesh_info/GhostCellClassify.h | 6 ++--- vtkm/filter/mesh_info/MeshQuality.cxx | 2 +- vtkm/filter/mesh_info/MeshQuality.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityArea.h | 4 ++-- .../filter/mesh_info/MeshQualityAspectGamma.h | 4 ++-- .../filter/mesh_info/MeshQualityAspectRatio.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityCondition.h | 4 ++-- .../mesh_info/MeshQualityDiagonalRatio.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityDimension.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityJacobian.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityMaxAngle.h | 4 ++-- .../filter/mesh_info/MeshQualityMaxDiagonal.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityMinAngle.h | 4 ++-- .../filter/mesh_info/MeshQualityMinDiagonal.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityOddy.h | 4 ++-- .../MeshQualityRelativeSizeSquared.h | 5 ++-- .../mesh_info/MeshQualityScaledJacobian.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityShape.h | 4 ++-- .../mesh_info/MeshQualityShapeAndSize.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityShear.h | 4 ++-- vtkm/filter/mesh_info/MeshQualitySkew.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityStretch.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityTaper.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityVolume.h | 4 ++-- vtkm/filter/mesh_info/MeshQualityWarpage.h | 4 ++-- vtkm/filter/multi_block/AmrArrays.h | 4 ++-- vtkm/filter/resampling/Probe.h | 4 ++-- .../scalar_topology/ContourTreeUniform.h | 6 ++--- .../ContourTreeUniformAugmented.cxx | 2 +- .../ContourTreeUniformAugmented.h | 4 ++-- .../ContourTreeUniformDistributed.h | 4 ++-- .../DistributedBranchDecompositionFilter.h | 4 ++-- vtkm/filter/vector_analysis/CrossProduct.h | 4 ++-- vtkm/filter/vector_analysis/DotProduct.h | 4 ++-- vtkm/filter/vector_analysis/Gradient.h | 4 ++-- vtkm/filter/vector_analysis/SurfaceNormals.h | 4 ++-- vtkm/filter/vector_analysis/VectorMagnitude.h | 4 ++-- vtkm/filter/zfp/ZFPCompressor1D.h | 4 ++-- vtkm/filter/zfp/ZFPCompressor2D.h | 4 ++-- vtkm/filter/zfp/ZFPCompressor3D.h | 4 ++-- vtkm/filter/zfp/ZFPDecompressor1D.h | 4 ++-- vtkm/filter/zfp/ZFPDecompressor2D.h | 4 ++-- vtkm/filter/zfp/ZFPDecompressor3D.h | 4 ++-- vtkm/source/PerlinNoise.cxx | 4 ++-- 115 files changed, 278 insertions(+), 276 deletions(-) create mode 100644 docs/changelog/rename-filter-base.md rename vtkm/filter/{NewFilter.cxx => Filter.cxx} (83%) rename vtkm/filter/{NewFilter.h => Filter.h} (98%) rename vtkm/filter/{NewFilterField.cxx => FilterField.cxx} (82%) rename vtkm/filter/{NewFilterField.h => FilterField.h} (97%) rename vtkm/filter/flow/{NewFilterParticleAdvection.cxx => FilterParticleAdvection.cxx} (88%) rename vtkm/filter/flow/{NewFilterParticleAdvection.h => FilterParticleAdvection.h} (91%) rename vtkm/filter/flow/{NewFilterParticleAdvectionSteadyState.cxx => FilterParticleAdvectionSteadyState.cxx} (95%) rename vtkm/filter/flow/{NewFilterParticleAdvectionSteadyState.h => FilterParticleAdvectionSteadyState.h} (68%) rename vtkm/filter/flow/{NewFilterParticleAdvectionUnsteadyState.cxx => FilterParticleAdvectionUnsteadyState.cxx} (91%) rename vtkm/filter/flow/{NewFilterParticleAdvectionUnsteadyState.h => FilterParticleAdvectionUnsteadyState.h} (77%) diff --git a/docs/changelog/rename-filter-base.md b/docs/changelog/rename-filter-base.md new file mode 100644 index 000000000..8185e5a88 --- /dev/null +++ b/docs/changelog/rename-filter-base.md @@ -0,0 +1,11 @@ +# Rename NewFilter base classes to Filter + +During the VTK-m 1.8 and 1.9 development, the filter infrastructure was +overhauled. Part of this created a completely new set of base classes. To +avoid confusion with the original filter base classes and ease transition, +the new filter base classes were named `NewFilter*`. Eventually after all +filters were transitioned, the old filter base classes were deprecated. + +With the release of VTK-m 2.0, the old filter base classes are removed. The +"new" filter base classes are no longer new. Thus, they have been renamed +simply `Filter` (and `FilterField`). diff --git a/examples/game_of_life/GameOfLife.cxx b/examples/game_of_life/GameOfLife.cxx index 83649835f..5302cdd52 100644 --- a/examples/game_of_life/GameOfLife.cxx +++ b/examples/game_of_life/GameOfLife.cxx @@ -26,7 +26,7 @@ #include -#include +#include #include #include @@ -95,7 +95,7 @@ struct UpdateLifeState : public vtkm::worklet::WorkletPointNeighborhood }; -class GameOfLife : public vtkm::filter::NewFilterField +class GameOfLife : public vtkm::filter::FilterField { public: VTKM_CONT GameOfLife() { this->SetActiveField("state", vtkm::cont::Field::Association::Points); } diff --git a/examples/hello_worklet/HelloWorklet.cxx b/examples/hello_worklet/HelloWorklet.cxx index a21523cf9..8cfa49b9c 100644 --- a/examples/hello_worklet/HelloWorklet.cxx +++ b/examples/hello_worklet/HelloWorklet.cxx @@ -10,7 +10,7 @@ #include -#include +#include #include #include @@ -43,7 +43,7 @@ namespace vtkm namespace filter { -class HelloField : public vtkm::filter::NewFilterField +class HelloField : public vtkm::filter::FilterField { public: VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& inDataSet) diff --git a/examples/histogram/HistogramMPI.cxx b/examples/histogram/HistogramMPI.cxx index cb2a334c8..417638b37 100644 --- a/examples/histogram/HistogramMPI.cxx +++ b/examples/histogram/HistogramMPI.cxx @@ -160,7 +160,7 @@ VTKM_CONT vtkm::cont::PartitionedDataSet HistogramMPI::DoExecutePartitions( const vtkm::cont::PartitionedDataSet& input) { this->PreExecute(input); - auto result = this->NewFilter::DoExecutePartitions(input); + auto result = this->Filter::DoExecutePartitions(input); this->PostExecute(input, result); return result; } diff --git a/examples/histogram/HistogramMPI.h b/examples/histogram/HistogramMPI.h index 1205a982b..64fab32ae 100644 --- a/examples/histogram/HistogramMPI.h +++ b/examples/histogram/HistogramMPI.h @@ -10,7 +10,7 @@ #ifndef vtk_m_examples_histogram_HistogramMPI_h #define vtk_m_examples_histogram_HistogramMPI_h -#include +#include namespace example { @@ -19,7 +19,7 @@ namespace example /// /// Construct a HistogramMPI with a default of 10 bins. /// -class HistogramMPI : public vtkm::filter::NewFilterField +class HistogramMPI : public vtkm::filter::FilterField { public: //currently the HistogramMPI filter only works on scalar data. diff --git a/examples/multi_backend/MultiDeviceGradient.h b/examples/multi_backend/MultiDeviceGradient.h index 30d1a026b..334873bb0 100644 --- a/examples/multi_backend/MultiDeviceGradient.h +++ b/examples/multi_backend/MultiDeviceGradient.h @@ -10,7 +10,7 @@ #ifndef vtk_m_examples_multibackend_MultiDeviceGradient_h #define vtk_m_examples_multibackend_MultiDeviceGradient_h -#include +#include #include "TaskQueue.h" @@ -22,7 +22,7 @@ using RuntimeTaskQueue = TaskQueue>; /// /// The Policy used with MultiDeviceGradient must include the TBB and CUDA /// backends. -class MultiDeviceGradient : public vtkm::filter::NewFilterField +class MultiDeviceGradient : public vtkm::filter::FilterField { public: //Construct a MultiDeviceGradient and worker pool diff --git a/examples/redistribute_points/RedistributePoints.h b/examples/redistribute_points/RedistributePoints.h index 11a82b7b2..2d293ee14 100644 --- a/examples/redistribute_points/RedistributePoints.h +++ b/examples/redistribute_points/RedistributePoints.h @@ -10,12 +10,12 @@ #ifndef example_RedistributePoints_h #define example_RedistributePoints_h -#include +#include namespace example { -class RedistributePoints : public vtkm::filter::NewFilter +class RedistributePoints : public vtkm::filter::Filter { public: VTKM_CONT RedistributePoints() {} diff --git a/tutorial/extract_edges.cxx b/tutorial/extract_edges.cxx index 15f8247eb..7f236cac9 100644 --- a/tutorial/extract_edges.cxx +++ b/tutorial/extract_edges.cxx @@ -20,9 +20,9 @@ #include #include +#include #include #include -#include #include #include @@ -149,7 +149,7 @@ VTKM_CONT bool DoMapField( } // anonymous namespace -class ExtractEdges : public vtkm::filter::NewFilter +class ExtractEdges : public vtkm::filter::Filter { public: VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& inData) override; diff --git a/tutorial/mag_grad.cxx b/tutorial/mag_grad.cxx index 72e7eaa0d..793e258ff 100644 --- a/tutorial/mag_grad.cxx +++ b/tutorial/mag_grad.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include @@ -32,7 +32,7 @@ struct ComputeMagnitude : vtkm::worklet::WorkletMapField // The filter class used by external code to run the algorithm. Normally the class definition // is in a separate header file. -class FieldMagnitude : public vtkm::filter::NewFilterField +class FieldMagnitude : public vtkm::filter::FilterField { protected: VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& inDataSet) override; diff --git a/tutorial/point_to_cell.cxx b/tutorial/point_to_cell.cxx index d639b299a..acf9ee1dd 100644 --- a/tutorial/point_to_cell.cxx +++ b/tutorial/point_to_cell.cxx @@ -46,14 +46,14 @@ struct ConvertPointFieldToCells : vtkm::worklet::WorkletVisitCellsWithPoints } // namespace worklet } // namespace vtkm -#include +#include namespace vtkm { namespace filter { -struct ConvertPointFieldToCells : vtkm::filter::NewFilterField +struct ConvertPointFieldToCells : vtkm::filter::FilterField { VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& inDataSet) override; }; diff --git a/vtkm/filter/CMakeLists.txt b/vtkm/filter/CMakeLists.txt index 52eb5588f..1e590b716 100644 --- a/vtkm/filter/CMakeLists.txt +++ b/vtkm/filter/CMakeLists.txt @@ -10,20 +10,20 @@ set(core_headers FieldSelection.h - NewFilter.h - NewFilterField.h + Filter.h + FilterField.h MapFieldMergeAverage.h MapFieldPermutation.h TaskQueue.h ) set(core_sources FieldSelection.cxx - NewFilterField.cxx + FilterField.cxx ) set(core_sources_device MapFieldMergeAverage.cxx MapFieldPermutation.cxx - NewFilter.cxx + Filter.cxx ) vtkm_library( diff --git a/vtkm/filter/NewFilter.cxx b/vtkm/filter/Filter.cxx similarity index 83% rename from vtkm/filter/NewFilter.cxx rename to vtkm/filter/Filter.cxx index 46bf44cbc..c1586f965 100644 --- a/vtkm/filter/NewFilter.cxx +++ b/vtkm/filter/Filter.cxx @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include @@ -23,9 +23,7 @@ namespace filter namespace { -void RunFilter(NewFilter* self, - vtkm::filter::DataSetQueue& input, - vtkm::filter::DataSetQueue& output) +void RunFilter(Filter* self, vtkm::filter::DataSetQueue& input, vtkm::filter::DataSetQueue& output) { auto& tracker = vtkm::cont::GetRuntimeDeviceTracker(); bool prevVal = tracker.GetThreadFriendlyMemAlloc(); @@ -44,15 +42,15 @@ void RunFilter(NewFilter* self, } -NewFilter::~NewFilter() = default; +Filter::~Filter() = default; -bool NewFilter::CanThread() const +bool Filter::CanThread() const { return true; } //---------------------------------------------------------------------------- -vtkm::cont::PartitionedDataSet NewFilter::DoExecutePartitions( +vtkm::cont::PartitionedDataSet Filter::DoExecutePartitions( const vtkm::cont::PartitionedDataSet& input) { vtkm::cont::PartitionedDataSet output; @@ -91,22 +89,22 @@ vtkm::cont::PartitionedDataSet NewFilter::DoExecutePartitions( return this->CreateResult(input, output); } -vtkm::cont::DataSet NewFilter::Execute(const vtkm::cont::DataSet& input) +vtkm::cont::DataSet Filter::Execute(const vtkm::cont::DataSet& input) { return this->DoExecute(input); } -vtkm::cont::PartitionedDataSet NewFilter::Execute(const vtkm::cont::PartitionedDataSet& input) +vtkm::cont::PartitionedDataSet Filter::Execute(const vtkm::cont::PartitionedDataSet& input) { VTKM_LOG_SCOPE(vtkm::cont::LogLevel::Perf, - "NewFilter (%d partitions): '%s'", + "Filter (%d partitions): '%s'", (int)input.GetNumberOfPartitions(), vtkm::cont::TypeToString().c_str()); return this->DoExecutePartitions(input); } -vtkm::cont::DataSet NewFilter::CreateResult(const vtkm::cont::DataSet& inDataSet) const +vtkm::cont::DataSet Filter::CreateResult(const vtkm::cont::DataSet& inDataSet) const { auto fieldMapper = [](vtkm::cont::DataSet& out, const vtkm::cont::Field& fieldToPass) { out.AddField(fieldToPass); @@ -114,7 +112,7 @@ vtkm::cont::DataSet NewFilter::CreateResult(const vtkm::cont::DataSet& inDataSet return this->CreateResult(inDataSet, inDataSet.GetCellSet(), fieldMapper); } -vtkm::cont::PartitionedDataSet NewFilter::CreateResult( +vtkm::cont::PartitionedDataSet Filter::CreateResult( const vtkm::cont::PartitionedDataSet& input, const vtkm::cont::PartitionedDataSet& resultPartitions) const { @@ -124,7 +122,7 @@ vtkm::cont::PartitionedDataSet NewFilter::CreateResult( return this->CreateResult(input, resultPartitions, fieldMapper); } -vtkm::Id NewFilter::DetermineNumberOfThreads(const vtkm::cont::PartitionedDataSet& input) +vtkm::Id Filter::DetermineNumberOfThreads(const vtkm::cont::PartitionedDataSet& input) { vtkm::Id numDS = input.GetNumberOfPartitions(); diff --git a/vtkm/filter/NewFilter.h b/vtkm/filter/Filter.h similarity index 98% rename from vtkm/filter/NewFilter.h rename to vtkm/filter/Filter.h index 2435361a6..3e171362a 100644 --- a/vtkm/filter/NewFilter.h +++ b/vtkm/filter/Filter.h @@ -7,8 +7,8 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. //============================================================================ -#ifndef vtk_m_filter_NewFilter_h -#define vtk_m_filter_NewFilter_h +#ifndef vtk_m_filter_Filter_h +#define vtk_m_filter_Filter_h #include #include @@ -79,7 +79,7 @@ namespace filter /// In many uses cases, one subclasses one of the immediate subclasses of this class such as /// FilterField, FilterParticleAdvection, etc. Those may impose additional constraints on the /// methods to implement in the subclasses. Here, we describes the things to consider when directly -/// subclassing vtkm::filter::NewFilter. +/// subclassing vtkm::filter::Filter. /// /// \subsection FilterExecution Execute /// @@ -103,7 +103,7 @@ namespace filter /// it. If there are any errors, the subclass must throw an exception /// (e.g. `vtkm::cont::ErrorFilterExecution`). /// -/// In this simple case, the NewFilter superclass handles iterating over multiple partitions in the +/// In this simple case, the Filter superclass handles iterating over multiple partitions in the /// input PartitionedDataSet and calling `DoExecute(DataSet&)` iteratively. /// /// The aforementioned approach is also suitable for filters that need special handling for @@ -117,7 +117,7 @@ namespace filter /// const vtkm::cont::PartitionedDataSet& input) /// { /// // Do pre execute stuff, e.g. scattering to each DataSet -/// auto output = this->NewFilter::DoExecutePartitions(input); +/// auto output = this->Filter::DoExecutePartitions(input); /// // Do post execute stuff, e.g gather/reduce from DataSets /// return output; /// } @@ -133,8 +133,8 @@ namespace filter /// /// For subclasses that map input fields into output fields, the implementation of its /// `DoExecute(DataSet&)` should create the `DataSet` to be returned with a call to -/// `NewFilter::CreateResult` or a similar method in a subclass (such as -/// `NewFilterField::CreateResultField`). +/// `Filter::CreateResult` or a similar method in a subclass (such as +/// `FilterField::CreateResultField`). /// /// \code{cpp} /// VTKM_CONT DataSet SomeFilter::DoExecute(const vtkm::cont::DataSet& input) @@ -215,11 +215,11 @@ namespace filter /// Implementations of Filter subclass can also override /// `DetermineNumberOfThreads()` to provide implementation specific heuristic. /// -class VTKM_FILTER_CORE_EXPORT NewFilter +class VTKM_FILTER_CORE_EXPORT Filter { public: VTKM_CONT - virtual ~NewFilter(); + virtual ~Filter(); VTKM_CONT virtual bool CanThread() const; diff --git a/vtkm/filter/NewFilterField.cxx b/vtkm/filter/FilterField.cxx similarity index 82% rename from vtkm/filter/NewFilterField.cxx rename to vtkm/filter/FilterField.cxx index 30a5b1f7a..89d85e40f 100644 --- a/vtkm/filter/NewFilterField.cxx +++ b/vtkm/filter/FilterField.cxx @@ -7,15 +7,15 @@ // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notice for more information. //============================================================================ -#include +#include namespace vtkm { namespace filter { -vtkm::cont::DataSet NewFilterField::CreateResultField(const vtkm::cont::DataSet& inDataSet, - const vtkm::cont::Field& resultField) const +vtkm::cont::DataSet FilterField::CreateResultField(const vtkm::cont::DataSet& inDataSet, + const vtkm::cont::Field& resultField) const { vtkm::cont::DataSet outDataSet = this->CreateResult(inDataSet); outDataSet.AddField(resultField); @@ -24,7 +24,7 @@ vtkm::cont::DataSet NewFilterField::CreateResultField(const vtkm::cont::DataSet& return outDataSet; } -void NewFilterField::ResizeIfNeeded(size_t index_st) +void FilterField::ResizeIfNeeded(size_t index_st) { if (this->ActiveFieldNames.size() <= index_st) { diff --git a/vtkm/filter/NewFilterField.h b/vtkm/filter/FilterField.h similarity index 97% rename from vtkm/filter/NewFilterField.h rename to vtkm/filter/FilterField.h index 49c24b32b..1e6d7389c 100644 --- a/vtkm/filter/NewFilterField.h +++ b/vtkm/filter/FilterField.h @@ -8,20 +8,20 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ -#ifndef vtk_m_filter_NewFilterField_h -#define vtk_m_filter_NewFilterField_h +#ifndef vtk_m_filter_FilterField_h +#define vtk_m_filter_FilterField_h -#include +#include namespace vtkm { namespace filter { -class VTKM_FILTER_CORE_EXPORT NewFilterField : public vtkm::filter::NewFilter +class VTKM_FILTER_CORE_EXPORT FilterField : public vtkm::filter::Filter { public: - NewFilterField() { this->SetActiveCoordinateSystem(0); } + FilterField() { this->SetActiveCoordinateSystem(0); } VTKM_CONT void SetOutputFieldName(const std::string& name) { this->OutputFieldName = name; } @@ -300,4 +300,4 @@ private: } // namespace filter } // namespace vtkm -#endif // vtk_m_filter_NewFilterField_h +#endif // vtk_m_filter_FilterField_h diff --git a/vtkm/filter/clean_grid/CleanGrid.h b/vtkm/filter/clean_grid/CleanGrid.h index 9b2c5de5d..1349b4dbf 100644 --- a/vtkm/filter/clean_grid/CleanGrid.h +++ b/vtkm/filter/clean_grid/CleanGrid.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_clean_grid_CleanGrid_h #define vtk_m_filter_clean_grid_CleanGrid_h -#include +#include #include namespace vtkm @@ -37,7 +37,7 @@ struct SharedStates; /// \todo Add a feature to merge points that are coincident or within a /// tolerance. /// -class VTKM_FILTER_CLEAN_GRID_EXPORT CleanGrid : public vtkm::filter::NewFilterField +class VTKM_FILTER_CLEAN_GRID_EXPORT CleanGrid : public vtkm::filter::FilterField { public: /// When the CompactPointFields flag is true, the filter will identify any diff --git a/vtkm/filter/connected_components/CellSetConnectivity.h b/vtkm/filter/connected_components/CellSetConnectivity.h index c727b3c69..44d6e4e2d 100644 --- a/vtkm/filter/connected_components/CellSetConnectivity.h +++ b/vtkm/filter/connected_components/CellSetConnectivity.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_connected_components_CellSetConnectivity_h #define vtk_m_filter_connected_components_CellSetConnectivity_h -#include +#include #include namespace vtkm @@ -28,8 +28,7 @@ namespace connected_components /// number of components and assigns each component a unique integer. /// The result of the filter is a cell field of type vtkm::Id with the default name of 'component'. /// Each entry in the cell field will be a number that identifies to which component the cell belongs. -class VTKM_FILTER_CONNECTED_COMPONENTS_EXPORT CellSetConnectivity - : public vtkm::filter::NewFilterField +class VTKM_FILTER_CONNECTED_COMPONENTS_EXPORT CellSetConnectivity : public vtkm::filter::FilterField { public: VTKM_CONT CellSetConnectivity() { this->SetOutputFieldName("component"); } diff --git a/vtkm/filter/connected_components/ImageConnectivity.h b/vtkm/filter/connected_components/ImageConnectivity.h index c1fc332af..ba2d0d6cf 100644 --- a/vtkm/filter/connected_components/ImageConnectivity.h +++ b/vtkm/filter/connected_components/ImageConnectivity.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_connected_components_ImageConnectivity_h #define vtk_m_filter_connected_components_ImageConnectivity_h -#include +#include #include /// \brief Groups connected points that have the same field value @@ -30,8 +30,7 @@ namespace filter { namespace connected_components { -class VTKM_FILTER_CONNECTED_COMPONENTS_EXPORT ImageConnectivity - : public vtkm::filter::NewFilterField +class VTKM_FILTER_CONNECTED_COMPONENTS_EXPORT ImageConnectivity : public vtkm::filter::FilterField { public: VTKM_CONT ImageConnectivity() { this->SetOutputFieldName("component"); } diff --git a/vtkm/filter/contour/ClipWithField.h b/vtkm/filter/contour/ClipWithField.h index b0bc3375c..ff11a3d0e 100644 --- a/vtkm/filter/contour/ClipWithField.h +++ b/vtkm/filter/contour/ClipWithField.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_contour_ClipWithField_h #define vtk_m_filter_contour_ClipWithField_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace contour /// value are considered outside, and will be discarded. All points that are greater /// are kept. /// The resulting geometry will not be water tight. -class VTKM_FILTER_CONTOUR_EXPORT ClipWithField : public vtkm::filter::NewFilterField +class VTKM_FILTER_CONTOUR_EXPORT ClipWithField : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/contour/ClipWithImplicitFunction.h b/vtkm/filter/contour/ClipWithImplicitFunction.h index d0e27d0b3..e469c04c8 100644 --- a/vtkm/filter/contour/ClipWithImplicitFunction.h +++ b/vtkm/filter/contour/ClipWithImplicitFunction.h @@ -12,7 +12,7 @@ #include -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace contour /// Clip a dataset using a given implicit function value, such as vtkm::Sphere /// or vtkm::Frustum. /// The resulting geometry will not be water tight. -class VTKM_FILTER_CONTOUR_EXPORT ClipWithImplicitFunction : public vtkm::filter::NewFilterField +class VTKM_FILTER_CONTOUR_EXPORT ClipWithImplicitFunction : public vtkm::filter::FilterField { public: void SetImplicitFunction(const vtkm::ImplicitFunctionGeneral& func) { this->Function = func; } diff --git a/vtkm/filter/contour/Contour.h b/vtkm/filter/contour/Contour.h index 062502abb..6ef69d9d2 100644 --- a/vtkm/filter/contour/Contour.h +++ b/vtkm/filter/contour/Contour.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_contour_Contour_h #define vtk_m_filter_contour_Contour_h -#include +#include #include namespace vtkm @@ -27,7 +27,7 @@ namespace contour /// Multiple contour values must be specified to generate the isosurfaces. /// @warning /// This filter is currently only supports 3D volumes. -class VTKM_FILTER_CONTOUR_EXPORT Contour : public vtkm::filter::NewFilterField +class VTKM_FILTER_CONTOUR_EXPORT Contour : public vtkm::filter::FilterField { public: void SetNumberOfIsoValues(vtkm::Id num) diff --git a/vtkm/filter/contour/MIRFilter.h b/vtkm/filter/contour/MIRFilter.h index e8b9eb1bb..2cc2dcee4 100644 --- a/vtkm/filter/contour/MIRFilter.h +++ b/vtkm/filter/contour/MIRFilter.h @@ -11,7 +11,7 @@ #ifndef vtkm_m_filter_contour_MIRFilter_h #define vtkm_m_filter_contour_MIRFilter_h -#include +#include #include namespace vtkm @@ -48,7 +48,7 @@ namespace contour /// total error % of the entire dataset is less than the specified amount (defaults to 1.0, returns after first iteration). Finally, /// the error scaling and scaling decay allows for setting how much the cell VFs should react to the delta between target and calculated cell VFs. /// the error scaling will decay by the decay variable every iteration (multiplicitively). -class VTKM_FILTER_CONTOUR_EXPORT MIRFilter : public vtkm::filter::NewFilterField +class VTKM_FILTER_CONTOUR_EXPORT MIRFilter : public vtkm::filter::FilterField { public: /// @brief Sets the name of the offset/position cellset field in the dataset passed to the filter diff --git a/vtkm/filter/density_estimate/Entropy.h b/vtkm/filter/density_estimate/Entropy.h index e820ab50a..b97e78575 100644 --- a/vtkm/filter/density_estimate/Entropy.h +++ b/vtkm/filter/density_estimate/Entropy.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_density_estimate_Entropy_h #define vtk_m_filter_density_estimate_Entropy_h -#include +#include #include namespace vtkm @@ -24,7 +24,7 @@ namespace density_estimate /// /// Construct a histogram which is used to compute the entropy with a default of 10 bins /// -class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT Entropy : public vtkm::filter::NewFilterField +class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT Entropy : public vtkm::filter::FilterField { public: //currently the Entropy filter only works on scalar data. diff --git a/vtkm/filter/density_estimate/Histogram.cxx b/vtkm/filter/density_estimate/Histogram.cxx index 050a8bf1e..1c3969c84 100644 --- a/vtkm/filter/density_estimate/Histogram.cxx +++ b/vtkm/filter/density_estimate/Histogram.cxx @@ -225,7 +225,7 @@ VTKM_CONT vtkm::cont::PartitionedDataSet Histogram::DoExecutePartitions( const vtkm::cont::PartitionedDataSet& input) { this->PreExecute(input); - auto result = this->NewFilter::DoExecutePartitions(input); + auto result = this->Filter::DoExecutePartitions(input); this->PostExecute(input, result); return result; } diff --git a/vtkm/filter/density_estimate/Histogram.h b/vtkm/filter/density_estimate/Histogram.h index 15dddeb29..5f7c9193a 100644 --- a/vtkm/filter/density_estimate/Histogram.h +++ b/vtkm/filter/density_estimate/Histogram.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_density_estimate_Histogram_h #define vtk_m_filter_density_estimate_Histogram_h -#include +#include #include namespace vtkm @@ -24,7 +24,7 @@ namespace density_estimate /// /// Construct a histogram with a default of 10 bins. /// -class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT Histogram : public vtkm::filter::NewFilterField +class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT Histogram : public vtkm::filter::FilterField { public: //Construct a histogram with a default of 10 bins diff --git a/vtkm/filter/density_estimate/NDEntropy.h b/vtkm/filter/density_estimate/NDEntropy.h index 30bd28601..efb5e2b62 100644 --- a/vtkm/filter/density_estimate/NDEntropy.h +++ b/vtkm/filter/density_estimate/NDEntropy.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_density_estimate_NDEntropy_h #define vtk_m_filter_density_estimate_NDEntropy_h -#include +#include #include namespace vtkm @@ -23,7 +23,7 @@ namespace density_estimate /// /// This filter calculate the entropy of input N-Dims fields. /// -class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT NDEntropy : public vtkm::filter::NewFilterField +class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT NDEntropy : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/density_estimate/NDHistogram.h b/vtkm/filter/density_estimate/NDHistogram.h index 2a4cbeff5..ee63ff4e5 100644 --- a/vtkm/filter/density_estimate/NDHistogram.h +++ b/vtkm/filter/density_estimate/NDHistogram.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_density_estimate_NDHistogram_h #define vtk_m_filter_density_estimate_NDHistogram_h -#include +#include #include namespace vtkm @@ -31,7 +31,7 @@ namespace density_estimate /// The first three numbers are binIDs for FieldA, FieldB and FieldC. Frequency[i] stores /// the frequency for this bin (FieldA[i], FieldB[i], FieldC[i]). /// -class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT NDHistogram : public vtkm::filter::NewFilterField +class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT NDHistogram : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/density_estimate/ParticleDensityBase.h b/vtkm/filter/density_estimate/ParticleDensityBase.h index 4ad69b04f..dd7544d4d 100644 --- a/vtkm/filter/density_estimate/ParticleDensityBase.h +++ b/vtkm/filter/density_estimate/ParticleDensityBase.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_density_estimate_ParticleDensityBase_h #define vtk_m_filter_density_estimate_ParticleDensityBase_h -#include +#include #include namespace vtkm @@ -20,7 +20,7 @@ namespace filter { namespace density_estimate { -class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT ParticleDensityBase : public vtkm::filter::NewFilterField +class VTKM_FILTER_DENSITY_ESTIMATE_EXPORT ParticleDensityBase : public vtkm::filter::FilterField { protected: ParticleDensityBase() = default; diff --git a/vtkm/filter/entity_extraction/ExternalFaces.h b/vtkm/filter/entity_extraction/ExternalFaces.h index f15dd276c..ad7ea9991 100644 --- a/vtkm/filter/entity_extraction/ExternalFaces.h +++ b/vtkm/filter/entity_extraction/ExternalFaces.h @@ -11,7 +11,7 @@ #ifndef vtkm_filter_entity_extraction_ExternalFaces_h #define vtkm_filter_entity_extraction_ExternalFaces_h -#include +#include #include namespace vtkm @@ -32,7 +32,7 @@ namespace entity_extraction /// @warning /// This filter is currently only supports propagation of point properties /// -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ExternalFaces : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ExternalFaces : public vtkm::filter::FilterField { public: ExternalFaces(); diff --git a/vtkm/filter/entity_extraction/ExtractGeometry.h b/vtkm/filter/entity_extraction/ExtractGeometry.h index 03eae6759..468f3c84b 100644 --- a/vtkm/filter/entity_extraction/ExtractGeometry.h +++ b/vtkm/filter/entity_extraction/ExtractGeometry.h @@ -12,7 +12,7 @@ #define vtk_m_fulter_entity_extraction_ExtractGeometry_h #include -#include +#include #include namespace vtkm @@ -36,7 +36,7 @@ namespace entity_extraction /// This differs from Clip in that Clip will subdivide boundary cells into new /// cells, while this filter will not, producing a more 'crinkly' output. /// -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ExtractGeometry : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ExtractGeometry : public vtkm::filter::FilterField { public: // Set the volume of interest to extract diff --git a/vtkm/filter/entity_extraction/ExtractPoints.h b/vtkm/filter/entity_extraction/ExtractPoints.h index f0f839301..3af0f13be 100644 --- a/vtkm/filter/entity_extraction/ExtractPoints.h +++ b/vtkm/filter/entity_extraction/ExtractPoints.h @@ -13,7 +13,7 @@ #include -#include +#include #include namespace vtkm @@ -31,7 +31,7 @@ namespace entity_extraction /// Note that while any geometry type can be provided as input, the output is /// represented by an explicit representation of points using /// vtkm::cont::CellSetSingleType -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ExtractPoints : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ExtractPoints : public vtkm::filter::FilterField { public: /// When CompactPoints is set, instead of copying the points and point fields diff --git a/vtkm/filter/entity_extraction/ExtractStructured.h b/vtkm/filter/entity_extraction/ExtractStructured.h index 5218a0a00..b4f1599d2 100644 --- a/vtkm/filter/entity_extraction/ExtractStructured.h +++ b/vtkm/filter/entity_extraction/ExtractStructured.h @@ -12,7 +12,7 @@ #define vtk_m_filter_entity_extraction_ExtractStructured_h #include -#include +#include #include namespace vtkm @@ -37,7 +37,7 @@ namespace entity_extraction /// for image processing, subsampling large volumes to reduce data size, or /// extracting regions of a volume with interesting data. /// -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ExtractStructured : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ExtractStructured : public vtkm::filter::FilterField { public: // Set the bounding box for the volume of interest diff --git a/vtkm/filter/entity_extraction/GhostCellRemove.h b/vtkm/filter/entity_extraction/GhostCellRemove.h index 691cbcc63..29fcd161f 100644 --- a/vtkm/filter/entity_extraction/GhostCellRemove.h +++ b/vtkm/filter/entity_extraction/GhostCellRemove.h @@ -12,7 +12,7 @@ #define vtk_m_filter_entity_extraction_GhostCellRemove_h #include -#include +#include #include namespace vtkm @@ -23,7 +23,7 @@ namespace entity_extraction { /// \brief Removes ghost cells /// -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT GhostCellRemove : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT GhostCellRemove : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/entity_extraction/Mask.h b/vtkm/filter/entity_extraction/Mask.h index 82c01009d..ea3f91be2 100644 --- a/vtkm/filter/entity_extraction/Mask.h +++ b/vtkm/filter/entity_extraction/Mask.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_entity_extraction_Mask_h #define vtk_m_filter_entity_extraction_Mask_h -#include +#include #include namespace vtkm @@ -23,7 +23,7 @@ namespace entity_extraction /// \brief Subselect cells using a stride /// /// Extract only every Nth cell where N is equal to a stride value -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT Mask : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT Mask : public vtkm::filter::FilterField { public: // When CompactPoints is set, instead of copying the points and point fields diff --git a/vtkm/filter/entity_extraction/MaskPoints.h b/vtkm/filter/entity_extraction/MaskPoints.h index fd78043a6..8c0c13803 100644 --- a/vtkm/filter/entity_extraction/MaskPoints.h +++ b/vtkm/filter/entity_extraction/MaskPoints.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_entity_extraction_MaskPoints_h #define vtk_m_filter_entity_extraction_MaskPoints_h -#include +#include #include namespace vtkm @@ -23,7 +23,7 @@ namespace entity_extraction /// \brief Subselect points using a stride /// /// Extract only every Nth point where N is equal to a stride value -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT MaskPoints : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT MaskPoints : public vtkm::filter::FilterField { public: // When CompactPoints is set, instead of copying the points and point fields diff --git a/vtkm/filter/entity_extraction/Threshold.h b/vtkm/filter/entity_extraction/Threshold.h index 4e99a6a9a..3542249cb 100644 --- a/vtkm/filter/entity_extraction/Threshold.h +++ b/vtkm/filter/entity_extraction/Threshold.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_entity_extraction_Threshold_h #define vtk_m_filter_entity_extraction_Threshold_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace entity_extraction /// The output of this filter is an permutation of the input dataset. /// /// You can threshold either on point or cell fields -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT Threshold : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT Threshold : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/entity_extraction/ThresholdPoints.h b/vtkm/filter/entity_extraction/ThresholdPoints.h index 58ce00b47..fa38df409 100644 --- a/vtkm/filter/entity_extraction/ThresholdPoints.h +++ b/vtkm/filter/entity_extraction/ThresholdPoints.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_entity_extraction_ThresholdPoints_h #define vtk_m_filter_entity_extraction_ThresholdPoints_h -#include +#include #include namespace vtkm @@ -20,7 +20,7 @@ namespace filter { namespace entity_extraction { -class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ThresholdPoints : public vtkm::filter::NewFilterField +class VTKM_FILTER_ENTITY_EXTRACTION_EXPORT ThresholdPoints : public vtkm::filter::FilterField { public: // When CompactPoints is set, instead of copying the points and point fields diff --git a/vtkm/filter/field_conversion/CellAverage.h b/vtkm/filter/field_conversion/CellAverage.h index f800ee388..d231a41c4 100644 --- a/vtkm/filter/field_conversion/CellAverage.h +++ b/vtkm/filter/field_conversion/CellAverage.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_field_conversion_CellAverage_h #define vtk_m_filter_field_conversion_CellAverage_h -#include +#include #include namespace vtkm @@ -27,7 +27,7 @@ namespace field_conversion /// The method of transformation is based on averaging the data /// values of all points used by particular cell. /// -class VTKM_FILTER_FIELD_CONVERSION_EXPORT CellAverage : public vtkm::filter::NewFilterField +class VTKM_FILTER_FIELD_CONVERSION_EXPORT CellAverage : public vtkm::filter::FilterField { private: VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& input) override; diff --git a/vtkm/filter/field_conversion/PointAverage.h b/vtkm/filter/field_conversion/PointAverage.h index 4925d90a8..0258a3b26 100644 --- a/vtkm/filter/field_conversion/PointAverage.h +++ b/vtkm/filter/field_conversion/PointAverage.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_field_conversion_PointAverage_h #define vtk_m_filter_field_conversion_PointAverage_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace field_conversion /// specified per cell) into point data (i.e., data specified at cell /// points). The method of transformation is based on averaging the data /// values of all cells using a particular point. -class VTKM_FILTER_FIELD_CONVERSION_EXPORT PointAverage : public vtkm::filter::NewFilterField +class VTKM_FILTER_FIELD_CONVERSION_EXPORT PointAverage : public vtkm::filter::FilterField { private: VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& input) override; diff --git a/vtkm/filter/field_transform/CylindricalCoordinateTransform.h b/vtkm/filter/field_transform/CylindricalCoordinateTransform.h index ce5149c06..ed049a09b 100644 --- a/vtkm/filter/field_transform/CylindricalCoordinateTransform.h +++ b/vtkm/filter/field_transform/CylindricalCoordinateTransform.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_field_transform_CylindricalCoordinateTransform_h #define vtk_m_filter_field_transform_CylindricalCoordinateTransform_h -#include +#include #include namespace vtkm @@ -24,7 +24,7 @@ namespace field_transform /// /// Generate a coordinate transformation on coordinates from a dataset. class VTKM_FILTER_FIELD_TRANSFORM_EXPORT CylindricalCoordinateTransform - : public vtkm::filter::NewFilterField + : public vtkm::filter::FilterField { public: VTKM_CONT CylindricalCoordinateTransform(); diff --git a/vtkm/filter/field_transform/FieldToColors.h b/vtkm/filter/field_transform/FieldToColors.h index 41963ea0e..67cd104f1 100644 --- a/vtkm/filter/field_transform/FieldToColors.h +++ b/vtkm/filter/field_transform/FieldToColors.h @@ -12,7 +12,7 @@ #define vtk_m_filter_field_transform_FieldToColors_h #include -#include +#include #include namespace vtkm @@ -23,7 +23,7 @@ namespace field_transform { /// \brief Convert an arbitrary field to an RGB or RGBA field /// -class VTKM_FILTER_FIELD_TRANSFORM_EXPORT FieldToColors : public vtkm::filter::NewFilterField +class VTKM_FILTER_FIELD_TRANSFORM_EXPORT FieldToColors : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/field_transform/GenerateIds.h b/vtkm/filter/field_transform/GenerateIds.h index 1183c46a0..def7450fa 100644 --- a/vtkm/filter/field_transform/GenerateIds.h +++ b/vtkm/filter/field_transform/GenerateIds.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_field_transform_GenerateIds_h #define vtk_m_filter_field_transform_GenerateIds_h -#include +#include #include namespace vtkm @@ -28,7 +28,7 @@ namespace field_transform /// convenient for adding indices to operations designed for fields and generally /// creating test data. /// -class VTKM_FILTER_FIELD_TRANSFORM_EXPORT GenerateIds : public vtkm::filter::NewFilter +class VTKM_FILTER_FIELD_TRANSFORM_EXPORT GenerateIds : public vtkm::filter::Filter { std::string PointFieldName = "pointids"; std::string CellFieldName = "cellids"; diff --git a/vtkm/filter/field_transform/LogValues.h b/vtkm/filter/field_transform/LogValues.h index d42dc3c0b..ec2fec7a3 100644 --- a/vtkm/filter/field_transform/LogValues.h +++ b/vtkm/filter/field_transform/LogValues.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_field_transform_LogValues_h #define vtk_m_filter_field_transform_LogValues_h -#include +#include #include namespace vtkm @@ -22,9 +22,9 @@ namespace field_transform /// \brief Adds field to a `DataSet` that gives the log values for the user specified field. /// -/// This filter use the ActiveField defined in the NewFilterField to store the log values. +/// This filter use the ActiveField defined in the FilterField to store the log values. /// -class VTKM_FILTER_FIELD_TRANSFORM_EXPORT LogValues : public vtkm::filter::NewFilterField +class VTKM_FILTER_FIELD_TRANSFORM_EXPORT LogValues : public vtkm::filter::FilterField { public: enum struct LogBase diff --git a/vtkm/filter/field_transform/PointElevation.h b/vtkm/filter/field_transform/PointElevation.h index ab65af573..91ae47af3 100644 --- a/vtkm/filter/field_transform/PointElevation.h +++ b/vtkm/filter/field_transform/PointElevation.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_field_transform_PointElevation_h #define vtk_m_filter_field_transform_PointElevation_h -#include +#include #include namespace vtkm @@ -27,7 +27,7 @@ namespace field_transform /// are generated by computing a projection of each dataset point onto /// a line. The line can be oriented arbitrarily. A typical example is /// to generate scalars based on elevation or height above a plane. -class VTKM_FILTER_FIELD_TRANSFORM_EXPORT PointElevation : public vtkm::filter::NewFilterField +class VTKM_FILTER_FIELD_TRANSFORM_EXPORT PointElevation : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/field_transform/PointTransform.h b/vtkm/filter/field_transform/PointTransform.h index 8ee02a709..e56d28021 100644 --- a/vtkm/filter/field_transform/PointTransform.h +++ b/vtkm/filter/field_transform/PointTransform.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace field_transform /// \brief /// /// Generate scalar field from a dataset. -class VTKM_FILTER_FIELD_TRANSFORM_EXPORT PointTransform : public vtkm::filter::NewFilterField +class VTKM_FILTER_FIELD_TRANSFORM_EXPORT PointTransform : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/field_transform/SphericalCoordinateTransform.h b/vtkm/filter/field_transform/SphericalCoordinateTransform.h index a5072a935..b8d089e3d 100644 --- a/vtkm/filter/field_transform/SphericalCoordinateTransform.h +++ b/vtkm/filter/field_transform/SphericalCoordinateTransform.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_field_transform_SphericalCoordinateTransform_h #define vtk_m_filter_field_transform_SphericalCoordinateTransform_h -#include +#include #include namespace vtkm @@ -22,7 +22,7 @@ namespace field_transform { class VTKM_FILTER_FIELD_TRANSFORM_EXPORT SphericalCoordinateTransform - : public vtkm::filter::NewFilterField + : public vtkm::filter::FilterField { public: VTKM_CONT SphericalCoordinateTransform(); diff --git a/vtkm/filter/field_transform/WarpScalar.h b/vtkm/filter/field_transform/WarpScalar.h index 24830191a..8512a2452 100644 --- a/vtkm/filter/field_transform/WarpScalar.h +++ b/vtkm/filter/field_transform/WarpScalar.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_field_transform_WarpScalar_h #define vtk_m_filter_field_transform_WarpScalar_h -#include +#include #include namespace vtkm @@ -28,7 +28,7 @@ namespace field_transform /// It's a VTK-m version of the vtkWarpScalar in VTK. /// Useful for creating carpet or x-y-z plots. /// It doesn't modify the point coordinates, but creates a new point coordinates that have been warped. -class VTKM_FILTER_FIELD_TRANSFORM_EXPORT WarpScalar : public vtkm::filter::NewFilterField +class VTKM_FILTER_FIELD_TRANSFORM_EXPORT WarpScalar : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/field_transform/WarpVector.h b/vtkm/filter/field_transform/WarpVector.h index 3d0659faa..6642e6156 100644 --- a/vtkm/filter/field_transform/WarpVector.h +++ b/vtkm/filter/field_transform/WarpVector.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_field_transform_WarpVector_h #define vtk_m_filter_field_transform_WarpVector_h -#include +#include #include namespace vtkm @@ -28,7 +28,7 @@ namespace field_transform /// Useful for showing flow profiles or mechanical deformation. /// This worklet does not modify the input points but generate new point /// coordinate instance that has been warped. -class VTKM_FILTER_FIELD_TRANSFORM_EXPORT WarpVector : public vtkm::filter::NewFilterField +class VTKM_FILTER_FIELD_TRANSFORM_EXPORT WarpVector : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/flow/CMakeLists.txt b/vtkm/filter/flow/CMakeLists.txt index 8dc34df4a..500039c86 100644 --- a/vtkm/filter/flow/CMakeLists.txt +++ b/vtkm/filter/flow/CMakeLists.txt @@ -9,10 +9,10 @@ ##============================================================================ set(flow_headers + FilterParticleAdvection.h + FilterParticleAdvectionSteadyState.h + FilterParticleAdvectionUnsteadyState.h FlowTypes.h - NewFilterParticleAdvection.h - NewFilterParticleAdvectionSteadyState.h - NewFilterParticleAdvectionUnsteadyState.h Lagrangian.h LagrangianStructures.h ParticleAdvection.h @@ -24,7 +24,7 @@ set(flow_headers set(flow_sources internal/Messenger.cxx - NewFilterParticleAdvection.cxx + FilterParticleAdvection.cxx ParticleAdvection.cxx Pathline.cxx PathParticle.cxx @@ -34,8 +34,8 @@ set(flow_sources set(flow_device_sources Lagrangian.cxx LagrangianStructures.cxx - NewFilterParticleAdvectionSteadyState.cxx - NewFilterParticleAdvectionUnsteadyState.cxx + FilterParticleAdvectionSteadyState.cxx + FilterParticleAdvectionUnsteadyState.cxx StreamSurface.cxx ) diff --git a/vtkm/filter/flow/NewFilterParticleAdvection.cxx b/vtkm/filter/flow/FilterParticleAdvection.cxx similarity index 88% rename from vtkm/filter/flow/NewFilterParticleAdvection.cxx rename to vtkm/filter/flow/FilterParticleAdvection.cxx index 7916876d2..ea65bfc8a 100644 --- a/vtkm/filter/flow/NewFilterParticleAdvection.cxx +++ b/vtkm/filter/flow/FilterParticleAdvection.cxx @@ -11,7 +11,7 @@ #include #include -#include +#include namespace vtkm { @@ -20,8 +20,7 @@ namespace filter namespace flow { -VTKM_CONT vtkm::cont::DataSet NewFilterParticleAdvection::DoExecute( - const vtkm::cont::DataSet& inData) +VTKM_CONT vtkm::cont::DataSet FilterParticleAdvection::DoExecute(const vtkm::cont::DataSet& inData) { auto out = this->DoExecutePartitions(inData); if (out.GetNumberOfPartitions() != 1) @@ -30,7 +29,7 @@ VTKM_CONT vtkm::cont::DataSet NewFilterParticleAdvection::DoExecute( return out.GetPartition(0); } -VTKM_CONT void NewFilterParticleAdvection::ValidateOptions() const +VTKM_CONT void FilterParticleAdvection::ValidateOptions() const { if (this->GetUseCoordinateSystemAsField()) throw vtkm::cont::ErrorFilterExecution("Coordinate system as field not supported"); diff --git a/vtkm/filter/flow/NewFilterParticleAdvection.h b/vtkm/filter/flow/FilterParticleAdvection.h similarity index 91% rename from vtkm/filter/flow/NewFilterParticleAdvection.h rename to vtkm/filter/flow/FilterParticleAdvection.h index 048159452..ec160b0a2 100644 --- a/vtkm/filter/flow/NewFilterParticleAdvection.h +++ b/vtkm/filter/flow/FilterParticleAdvection.h @@ -8,11 +8,11 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ -#ifndef vtk_m_filter_flow_NewFilterParticleAdvection_h -#define vtk_m_filter_flow_NewFilterParticleAdvection_h +#ifndef vtk_m_filter_flow_FilterParticleAdvection_h +#define vtk_m_filter_flow_FilterParticleAdvection_h #include -#include +#include #include #include @@ -28,7 +28,7 @@ namespace flow /// Takes as input a vector field and seed locations and advects the seeds /// through the flow field. -class VTKM_FILTER_FLOW_EXPORT NewFilterParticleAdvection : public vtkm::filter::NewFilterField +class VTKM_FILTER_FLOW_EXPORT FilterParticleAdvection : public vtkm::filter::FilterField { public: VTKM_CONT @@ -107,4 +107,4 @@ private: } } // namespace vtkm::filter::flow -#endif // vtk_m_filter_flow_NewFilterParticleAdvection_h +#endif // vtk_m_filter_flow_FilterParticleAdvection_h diff --git a/vtkm/filter/flow/NewFilterParticleAdvectionSteadyState.cxx b/vtkm/filter/flow/FilterParticleAdvectionSteadyState.cxx similarity index 95% rename from vtkm/filter/flow/NewFilterParticleAdvectionSteadyState.cxx rename to vtkm/filter/flow/FilterParticleAdvectionSteadyState.cxx index 46c91663a..9ba479d5f 100644 --- a/vtkm/filter/flow/NewFilterParticleAdvectionSteadyState.cxx +++ b/vtkm/filter/flow/FilterParticleAdvectionSteadyState.cxx @@ -8,7 +8,7 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ -#include +#include #include #include @@ -62,7 +62,7 @@ CreateDataSetIntegrators( } //anonymous namespace -VTKM_CONT vtkm::cont::PartitionedDataSet NewFilterParticleAdvectionSteadyState::DoExecutePartitions( +VTKM_CONT vtkm::cont::PartitionedDataSet FilterParticleAdvectionSteadyState::DoExecutePartitions( const vtkm::cont::PartitionedDataSet& input) { using DSIType = vtkm::filter::flow::internal::DataSetIntegratorSteadyState; diff --git a/vtkm/filter/flow/NewFilterParticleAdvectionSteadyState.h b/vtkm/filter/flow/FilterParticleAdvectionSteadyState.h similarity index 68% rename from vtkm/filter/flow/NewFilterParticleAdvectionSteadyState.h rename to vtkm/filter/flow/FilterParticleAdvectionSteadyState.h index ed0731301..21a9fd910 100644 --- a/vtkm/filter/flow/NewFilterParticleAdvectionSteadyState.h +++ b/vtkm/filter/flow/FilterParticleAdvectionSteadyState.h @@ -8,11 +8,11 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ -#ifndef vtk_m_filter_flow_NewFilterParticleAdvectionSteadyState_h -#define vtk_m_filter_flow_NewFilterParticleAdvectionSteadyState_h +#ifndef vtk_m_filter_flow_FilterParticleAdvectionSteadyState_h +#define vtk_m_filter_flow_FilterParticleAdvectionSteadyState_h +#include #include -#include #include namespace vtkm @@ -21,8 +21,7 @@ namespace filter { namespace flow { -class VTKM_FILTER_FLOW_EXPORT NewFilterParticleAdvectionSteadyState - : public NewFilterParticleAdvection +class VTKM_FILTER_FLOW_EXPORT FilterParticleAdvectionSteadyState : public FilterParticleAdvection { private: VTKM_CONT vtkm::cont::PartitionedDataSet DoExecutePartitions( @@ -33,4 +32,4 @@ private: } } // namespace vtkm::filter::flow -#endif // vtk_m_filter_flow_NewFilterParticleAdvectionSteadyState_h +#endif // vtk_m_filter_flow_FilterParticleAdvectionSteadyState_h diff --git a/vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.cxx b/vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.cxx similarity index 91% rename from vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.cxx rename to vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.cxx index b2df0b8e4..78fc123c6 100644 --- a/vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.cxx +++ b/vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.cxx @@ -8,7 +8,7 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ -#include +#include #include #include @@ -51,15 +51,14 @@ CreateDataSetIntegrators(const vtkm::cont::PartitionedDataSet& input, } } // anonymous namespace -VTKM_CONT void NewFilterParticleAdvectionUnsteadyState::ValidateOptions() const +VTKM_CONT void FilterParticleAdvectionUnsteadyState::ValidateOptions() const { - this->NewFilterParticleAdvection::ValidateOptions(); + this->FilterParticleAdvection::ValidateOptions(); if (this->Time1 >= this->Time2) throw vtkm::cont::ErrorFilterExecution("PreviousTime must be less than NextTime"); } -VTKM_CONT vtkm::cont::PartitionedDataSet -NewFilterParticleAdvectionUnsteadyState::DoExecutePartitions( +VTKM_CONT vtkm::cont::PartitionedDataSet FilterParticleAdvectionUnsteadyState::DoExecutePartitions( const vtkm::cont::PartitionedDataSet& input) { using DSIType = vtkm::filter::flow::internal::DataSetIntegratorUnsteadyState; diff --git a/vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.h b/vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.h similarity index 77% rename from vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.h rename to vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.h index d1d959329..c77659821 100644 --- a/vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.h +++ b/vtkm/filter/flow/FilterParticleAdvectionUnsteadyState.h @@ -8,10 +8,10 @@ // PURPOSE. See the above copyright notice for more information. //============================================================================ -#ifndef vtk_m_filter_flow_NewFilterParticleAdvectionUnsteadyState_h -#define vtk_m_filter_flow_NewFilterParticleAdvectionUnsteadyState_h +#ifndef vtk_m_filter_flow_FilterParticleAdvectionUnsteadyState_h +#define vtk_m_filter_flow_FilterParticleAdvectionUnsteadyState_h -#include +#include #include namespace vtkm @@ -21,8 +21,7 @@ namespace filter namespace flow { -class VTKM_FILTER_FLOW_EXPORT NewFilterParticleAdvectionUnsteadyState - : public NewFilterParticleAdvection +class VTKM_FILTER_FLOW_EXPORT FilterParticleAdvectionUnsteadyState : public FilterParticleAdvection { public: VTKM_CONT void SetPreviousTime(vtkm::FloatDefault t1) { this->Time1 = t1; } @@ -49,4 +48,4 @@ private: } } // namespace vtkm::filter::flow -#endif // vtk_m_filter_flow_NewFilterParticleAdvectionUnsteadyState_h +#endif // vtk_m_filter_flow_FilterParticleAdvectionUnsteadyState_h diff --git a/vtkm/filter/flow/Lagrangian.h b/vtkm/filter/flow/Lagrangian.h index 0a5dea59f..09226dacd 100644 --- a/vtkm/filter/flow/Lagrangian.h +++ b/vtkm/filter/flow/Lagrangian.h @@ -12,7 +12,7 @@ #define vtk_m_filter_flow_Lagrangian_h #include -#include +#include #include namespace vtkm @@ -22,7 +22,7 @@ namespace filter namespace flow { -class VTKM_FILTER_FLOW_EXPORT Lagrangian : public vtkm::filter::NewFilterField +class VTKM_FILTER_FLOW_EXPORT Lagrangian : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/flow/LagrangianStructures.h b/vtkm/filter/flow/LagrangianStructures.h index c70474e1a..142128b49 100644 --- a/vtkm/filter/flow/LagrangianStructures.h +++ b/vtkm/filter/flow/LagrangianStructures.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_flow_LagrangianStructures_h #define vtk_m_filter_flow_LagrangianStructures_h -#include +#include #include #include @@ -22,7 +22,7 @@ namespace filter namespace flow { -class VTKM_FILTER_FLOW_EXPORT LagrangianStructures : public vtkm::filter::NewFilterField +class VTKM_FILTER_FLOW_EXPORT LagrangianStructures : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/flow/ParticleAdvection.h b/vtkm/filter/flow/ParticleAdvection.h index 12f5aaf3d..60eed8248 100644 --- a/vtkm/filter/flow/ParticleAdvection.h +++ b/vtkm/filter/flow/ParticleAdvection.h @@ -11,8 +11,8 @@ #ifndef vtk_m_filter_flow_ParticleAdvection_h #define vtk_m_filter_flow_ParticleAdvection_h +#include #include -#include #include namespace vtkm @@ -28,7 +28,7 @@ namespace flow /// end points for each seed through the vector field. class VTKM_FILTER_FLOW_EXPORT ParticleAdvection - : public vtkm::filter::flow::NewFilterParticleAdvectionSteadyState + : public vtkm::filter::flow::FilterParticleAdvectionSteadyState { public: private: diff --git a/vtkm/filter/flow/PathParticle.h b/vtkm/filter/flow/PathParticle.h index b87612128..18e81252f 100644 --- a/vtkm/filter/flow/PathParticle.h +++ b/vtkm/filter/flow/PathParticle.h @@ -11,8 +11,8 @@ #ifndef vtk_m_filter_flow_PathParticle_h #define vtk_m_filter_flow_PathParticle_h +#include #include -#include #include namespace vtkm @@ -28,7 +28,7 @@ namespace flow /// end points for each seed through the vector field. class VTKM_FILTER_FLOW_EXPORT PathParticle - : public vtkm::filter::flow::NewFilterParticleAdvectionUnsteadyState + : public vtkm::filter::flow::FilterParticleAdvectionUnsteadyState { private: VTKM_CONT vtkm::filter::flow::FlowResultType GetResultType() const override; diff --git a/vtkm/filter/flow/Pathline.h b/vtkm/filter/flow/Pathline.h index f1b4711ca..de8ef6200 100644 --- a/vtkm/filter/flow/Pathline.h +++ b/vtkm/filter/flow/Pathline.h @@ -11,8 +11,8 @@ #ifndef vtk_m_filter_flow_Pathline_h #define vtk_m_filter_flow_Pathline_h +#include #include -#include #include namespace vtkm @@ -28,7 +28,7 @@ namespace flow /// end points for each seed through the vector field. class VTKM_FILTER_FLOW_EXPORT Pathline - : public vtkm::filter::flow::NewFilterParticleAdvectionUnsteadyState + : public vtkm::filter::flow::FilterParticleAdvectionUnsteadyState { private: VTKM_CONT vtkm::filter::flow::FlowResultType GetResultType() const override; diff --git a/vtkm/filter/flow/StreamSurface.h b/vtkm/filter/flow/StreamSurface.h index b1c56a37b..1ad27eb63 100644 --- a/vtkm/filter/flow/StreamSurface.h +++ b/vtkm/filter/flow/StreamSurface.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_flow_StreamSurface_h #define vtk_m_filter_flow_StreamSurface_h -#include +#include #include #include @@ -27,7 +27,7 @@ namespace flow /// Takes as input a vector field and seed locations and generates the /// paths taken by the seeds through the vector field. -class VTKM_FILTER_FLOW_EXPORT StreamSurface : public vtkm::filter::NewFilterField +class VTKM_FILTER_FLOW_EXPORT StreamSurface : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/flow/Streamline.h b/vtkm/filter/flow/Streamline.h index d4633f0e0..89f38eaf1 100644 --- a/vtkm/filter/flow/Streamline.h +++ b/vtkm/filter/flow/Streamline.h @@ -11,8 +11,8 @@ #ifndef vtk_m_filter_flow_Streamline_h #define vtk_m_filter_flow_Streamline_h +#include #include -#include #include namespace vtkm @@ -28,7 +28,7 @@ namespace flow /// end points for each seed through the vector field. class VTKM_FILTER_FLOW_EXPORT Streamline - : public vtkm::filter::flow::NewFilterParticleAdvectionSteadyState + : public vtkm::filter::flow::FilterParticleAdvectionSteadyState { private: VTKM_CONT vtkm::filter::flow::FlowResultType GetResultType() const override; diff --git a/vtkm/filter/geometry_refinement/SplitSharpEdges.h b/vtkm/filter/geometry_refinement/SplitSharpEdges.h index 1483904dd..a760e3c0e 100644 --- a/vtkm/filter/geometry_refinement/SplitSharpEdges.h +++ b/vtkm/filter/geometry_refinement/SplitSharpEdges.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_geometry_refinement_SplitSharpEdges_h #define vtk_m_filter_geometry_refinement_SplitSharpEdges_h -#include +#include #include namespace vtkm @@ -33,7 +33,7 @@ namespace geometry_refinement /// to (5,4,3). /// By default, all old point's fields would be copied to the new point. /// Use with caution. -class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT SplitSharpEdges : public vtkm::filter::NewFilterField +class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT SplitSharpEdges : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/geometry_refinement/Tetrahedralize.h b/vtkm/filter/geometry_refinement/Tetrahedralize.h index 339bda942..96bf07a5d 100644 --- a/vtkm/filter/geometry_refinement/Tetrahedralize.h +++ b/vtkm/filter/geometry_refinement/Tetrahedralize.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_geometry_refinement_Tetrahedralize_h #define vtk_m_filter_geometry_refinement_Tetrahedralize_h -#include +#include #include namespace vtkm @@ -20,7 +20,7 @@ namespace filter { namespace geometry_refinement { -class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT Tetrahedralize : public vtkm::filter::NewFilter +class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT Tetrahedralize : public vtkm::filter::Filter { VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& input) override; }; diff --git a/vtkm/filter/geometry_refinement/Triangulate.h b/vtkm/filter/geometry_refinement/Triangulate.h index 83030c108..081bbcd58 100644 --- a/vtkm/filter/geometry_refinement/Triangulate.h +++ b/vtkm/filter/geometry_refinement/Triangulate.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_geometry_refinement_Triangulate_h #define vtk_m_filter_geometry_refinement_Triangulate_h -#include +#include #include namespace vtkm @@ -20,7 +20,7 @@ namespace filter { namespace geometry_refinement { -class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT Triangulate : public vtkm::filter::NewFilter +class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT Triangulate : public vtkm::filter::Filter { VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& input) override; }; diff --git a/vtkm/filter/geometry_refinement/Tube.h b/vtkm/filter/geometry_refinement/Tube.h index 5e37e679c..a9d510f04 100644 --- a/vtkm/filter/geometry_refinement/Tube.h +++ b/vtkm/filter/geometry_refinement/Tube.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_geometry_refinement_Tube_h #define vtk_m_filter_geometry_refinement_Tube_h -#include +#include #include namespace vtkm @@ -25,7 +25,7 @@ namespace geometry_refinement /// Takes as input a set of polylines, radius, num sides and capping flag. /// Produces tubes along each polyline -class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT Tube : public vtkm::filter::NewFilterField +class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT Tube : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/geometry_refinement/VertexClustering.h b/vtkm/filter/geometry_refinement/VertexClustering.h index 4b69d43dd..dd681e366 100644 --- a/vtkm/filter/geometry_refinement/VertexClustering.h +++ b/vtkm/filter/geometry_refinement/VertexClustering.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_geometry_refinement_VertexClustering_h #define vtk_m_filter_geometry_refinement_VertexClustering_h -#include +#include #include namespace vtkm @@ -48,7 +48,7 @@ namespace geometry_refinement /// @warning /// This filter currently doesn't propagate cell or point fields -class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT VertexClustering : public vtkm::filter::NewFilter +class VTKM_FILTER_GEOMETRY_REFINEMENT_EXPORT VertexClustering : public vtkm::filter::Filter { public: VTKM_CONT diff --git a/vtkm/filter/image_processing/ComputeMoments.h b/vtkm/filter/image_processing/ComputeMoments.h index 466191785..f0e1ae6d3 100644 --- a/vtkm/filter/image_processing/ComputeMoments.h +++ b/vtkm/filter/image_processing/ComputeMoments.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_image_processing_ComputeMoments_h #define vtk_m_filter_image_processing_ComputeMoments_h -#include +#include #include namespace vtkm @@ -19,7 +19,7 @@ namespace filter { namespace image_processing { -class VTKM_FILTER_IMAGE_PROCESSING_EXPORT ComputeMoments : public vtkm::filter::NewFilterField +class VTKM_FILTER_IMAGE_PROCESSING_EXPORT ComputeMoments : public vtkm::filter::FilterField { public: VTKM_CONT ComputeMoments(); diff --git a/vtkm/filter/image_processing/ImageDifference.h b/vtkm/filter/image_processing/ImageDifference.h index d70a63458..bd473b670 100644 --- a/vtkm/filter/image_processing/ImageDifference.h +++ b/vtkm/filter/image_processing/ImageDifference.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_image_processing_ImageDifference_h #define vtk_m_filter_image_processing_ImageDifference_h -#include +#include #include namespace vtkm @@ -29,7 +29,7 @@ namespace image_processing /// The threshold-output is calculated for each pixel using the `vtkm::Magnitude` vector function /// on the individual pixel difference. /// -class VTKM_FILTER_IMAGE_PROCESSING_EXPORT ImageDifference : public vtkm::filter::NewFilterField +class VTKM_FILTER_IMAGE_PROCESSING_EXPORT ImageDifference : public vtkm::filter::FilterField { public: VTKM_CONT ImageDifference(); diff --git a/vtkm/filter/image_processing/ImageMedian.h b/vtkm/filter/image_processing/ImageMedian.h index 4cda91e7e..46f8cde84 100644 --- a/vtkm/filter/image_processing/ImageMedian.h +++ b/vtkm/filter/image_processing/ImageMedian.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_image_processing_ImageMedian_h #define vtk_m_filter_image_processing_ImageMedian_h -#include +#include #include /// \brief Median algorithm for general image blur @@ -30,7 +30,7 @@ namespace filter { namespace image_processing { -class VTKM_FILTER_IMAGE_PROCESSING_EXPORT ImageMedian : public vtkm::filter::NewFilterField +class VTKM_FILTER_IMAGE_PROCESSING_EXPORT ImageMedian : public vtkm::filter::FilterField { public: VTKM_CONT ImageMedian() { this->SetOutputFieldName("median"); } diff --git a/vtkm/filter/mesh_info/CellMeasures.h b/vtkm/filter/mesh_info/CellMeasures.h index c6e458efb..92afb78a2 100644 --- a/vtkm/filter/mesh_info/CellMeasures.h +++ b/vtkm/filter/mesh_info/CellMeasures.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_mesh_info_CellMeasures_h #define vtk_m_filter_mesh_info_CellMeasures_h -#include +#include #include namespace vtkm @@ -47,7 +47,7 @@ VTKM_EXEC_CONT inline IntegrationType operator|(IntegrationType left, Integratio /// or 0 (if measure is not well defined or the cell type is unsupported). /// /// By default, the new cell-data array is named "measure". -class VTKM_FILTER_MESH_INFO_EXPORT CellMeasures : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT CellMeasures : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/mesh_info/GhostCellClassify.h b/vtkm/filter/mesh_info/GhostCellClassify.h index 1437e04ed..ca3027642 100644 --- a/vtkm/filter/mesh_info/GhostCellClassify.h +++ b/vtkm/filter/mesh_info/GhostCellClassify.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_mesh_info_GhostCellClassify_h #define vtk_m_filter_mesh_info_GhostCellClassify_h -#include +#include #include namespace vtkm @@ -19,14 +19,14 @@ namespace filter { namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT GhostCellClassify : public vtkm::filter::NewFilter +class VTKM_FILTER_MESH_INFO_EXPORT GhostCellClassify : public vtkm::filter::Filter { VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& inData) override; std::string GhostCellName; public: VTKM_CONT GhostCellClassify() - : NewFilter() + : Filter() , GhostCellName(vtkm::cont::GetGlobalGhostCellFieldName()) { } diff --git a/vtkm/filter/mesh_info/MeshQuality.cxx b/vtkm/filter/mesh_info/MeshQuality.cxx index 0ca42f534..ed1a5d407 100644 --- a/vtkm/filter/mesh_info/MeshQuality.cxx +++ b/vtkm/filter/mesh_info/MeshQuality.cxx @@ -89,7 +89,7 @@ VTKM_CONT MeshQuality::MeshQuality(CellMetric metric) VTKM_CONT vtkm::cont::DataSet MeshQuality::DoExecute(const vtkm::cont::DataSet& input) { - std::unique_ptr implementation; + std::unique_ptr implementation; switch (this->MyMetric) { case vtkm::filter::mesh_info::CellMetric::Area: diff --git a/vtkm/filter/mesh_info/MeshQuality.h b/vtkm/filter/mesh_info/MeshQuality.h index b5c208b6a..50699509d 100644 --- a/vtkm/filter/mesh_info/MeshQuality.h +++ b/vtkm/filter/mesh_info/MeshQuality.h @@ -21,7 +21,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQuality_h #define vtk_m_filter_mesh_info_MeshQuality_h -#include +#include #include namespace vtkm @@ -66,7 +66,7 @@ enum struct CellMetric * Each field contains the metric summary statistics for the cell type. * Summary statists with all 0 values imply that the specified metric does not support the cell type. */ -class VTKM_FILTER_MESH_INFO_EXPORT MeshQuality : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQuality : public vtkm::filter::FilterField { public: VTKM_CONT explicit MeshQuality(CellMetric); diff --git a/vtkm/filter/mesh_info/MeshQualityArea.h b/vtkm/filter/mesh_info/MeshQualityArea.h index 876b0240d..85b7dbcf9 100644 --- a/vtkm/filter/mesh_info/MeshQualityArea.h +++ b/vtkm/filter/mesh_info/MeshQualityArea.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityArea_h #define vtk_m_filter_mesh_info_MeshQualityArea_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityArea : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityArea : public vtkm::filter::FilterField { public: MeshQualityArea(); diff --git a/vtkm/filter/mesh_info/MeshQualityAspectGamma.h b/vtkm/filter/mesh_info/MeshQualityAspectGamma.h index 267c362b4..b60b69e51 100644 --- a/vtkm/filter/mesh_info/MeshQualityAspectGamma.h +++ b/vtkm/filter/mesh_info/MeshQualityAspectGamma.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityAspectGamma_h #define vtk_m_filter_mesh_info_MeshQualityAspectGamma_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityAspectGamma : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityAspectGamma : public vtkm::filter::FilterField { public: MeshQualityAspectGamma(); diff --git a/vtkm/filter/mesh_info/MeshQualityAspectRatio.h b/vtkm/filter/mesh_info/MeshQualityAspectRatio.h index 38f6cc6d1..5e3f4e4da 100644 --- a/vtkm/filter/mesh_info/MeshQualityAspectRatio.h +++ b/vtkm/filter/mesh_info/MeshQualityAspectRatio.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityAspectRatio_h #define vtk_m_filter_mesh_info_MeshQualityAspectRatio_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityAspectRatio : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityAspectRatio : public vtkm::filter::FilterField { public: MeshQualityAspectRatio(); diff --git a/vtkm/filter/mesh_info/MeshQualityCondition.h b/vtkm/filter/mesh_info/MeshQualityCondition.h index fc753b49c..811c3f7af 100644 --- a/vtkm/filter/mesh_info/MeshQualityCondition.h +++ b/vtkm/filter/mesh_info/MeshQualityCondition.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityCondition_h #define vtk_m_filter_mesh_info_MeshQualityCondition_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityCondition : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityCondition : public vtkm::filter::FilterField { public: MeshQualityCondition(); diff --git a/vtkm/filter/mesh_info/MeshQualityDiagonalRatio.h b/vtkm/filter/mesh_info/MeshQualityDiagonalRatio.h index d53bb068f..48bd01419 100644 --- a/vtkm/filter/mesh_info/MeshQualityDiagonalRatio.h +++ b/vtkm/filter/mesh_info/MeshQualityDiagonalRatio.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityDiagonalRatio_h #define vtk_m_filter_mesh_info_MeshQualityDiagonalRatio_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityDiagonalRatio : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityDiagonalRatio : public vtkm::filter::FilterField { public: MeshQualityDiagonalRatio(); diff --git a/vtkm/filter/mesh_info/MeshQualityDimension.h b/vtkm/filter/mesh_info/MeshQualityDimension.h index 2ae5cc845..d55fe2375 100644 --- a/vtkm/filter/mesh_info/MeshQualityDimension.h +++ b/vtkm/filter/mesh_info/MeshQualityDimension.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityDimension_h #define vtk_m_filter_mesh_info_MeshQualityDimension_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityDimension : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityDimension : public vtkm::filter::FilterField { public: MeshQualityDimension(); diff --git a/vtkm/filter/mesh_info/MeshQualityJacobian.h b/vtkm/filter/mesh_info/MeshQualityJacobian.h index 3045443bd..c5776a0a6 100644 --- a/vtkm/filter/mesh_info/MeshQualityJacobian.h +++ b/vtkm/filter/mesh_info/MeshQualityJacobian.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityJacobian_h #define vtk_m_filter_mesh_info_MeshQualityJacobian_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityJacobian : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityJacobian : public vtkm::filter::FilterField { public: MeshQualityJacobian(); diff --git a/vtkm/filter/mesh_info/MeshQualityMaxAngle.h b/vtkm/filter/mesh_info/MeshQualityMaxAngle.h index 6c91b9f9a..84ff3bed7 100644 --- a/vtkm/filter/mesh_info/MeshQualityMaxAngle.h +++ b/vtkm/filter/mesh_info/MeshQualityMaxAngle.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityMaxAngle_h #define vtk_m_filter_mesh_info_MeshQualityMaxAngle_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityMaxAngle : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityMaxAngle : public vtkm::filter::FilterField { public: MeshQualityMaxAngle(); diff --git a/vtkm/filter/mesh_info/MeshQualityMaxDiagonal.h b/vtkm/filter/mesh_info/MeshQualityMaxDiagonal.h index d33e88fac..4be5a3f08 100644 --- a/vtkm/filter/mesh_info/MeshQualityMaxDiagonal.h +++ b/vtkm/filter/mesh_info/MeshQualityMaxDiagonal.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityMaxDiagonal_h #define vtk_m_filter_mesh_info_MeshQualityMaxDiagonal_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityMaxDiagonal : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityMaxDiagonal : public vtkm::filter::FilterField { public: MeshQualityMaxDiagonal(); diff --git a/vtkm/filter/mesh_info/MeshQualityMinAngle.h b/vtkm/filter/mesh_info/MeshQualityMinAngle.h index 4d498db34..84bcdb603 100644 --- a/vtkm/filter/mesh_info/MeshQualityMinAngle.h +++ b/vtkm/filter/mesh_info/MeshQualityMinAngle.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityMinAngle_h #define vtk_m_filter_mesh_info_MeshQualityMinAngle_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityMinAngle : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityMinAngle : public vtkm::filter::FilterField { public: MeshQualityMinAngle(); diff --git a/vtkm/filter/mesh_info/MeshQualityMinDiagonal.h b/vtkm/filter/mesh_info/MeshQualityMinDiagonal.h index 91d16c674..d9cb986a9 100644 --- a/vtkm/filter/mesh_info/MeshQualityMinDiagonal.h +++ b/vtkm/filter/mesh_info/MeshQualityMinDiagonal.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityMinDiagonal_h #define vtk_m_filter_mesh_info_MeshQualityMinDiagonal_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityMinDiagonal : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityMinDiagonal : public vtkm::filter::FilterField { public: MeshQualityMinDiagonal(); diff --git a/vtkm/filter/mesh_info/MeshQualityOddy.h b/vtkm/filter/mesh_info/MeshQualityOddy.h index b81e9a57e..880007652 100644 --- a/vtkm/filter/mesh_info/MeshQualityOddy.h +++ b/vtkm/filter/mesh_info/MeshQualityOddy.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityOddy_h #define vtk_m_filter_mesh_info_MeshQualityOddy_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityOddy : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityOddy : public vtkm::filter::FilterField { public: MeshQualityOddy(); diff --git a/vtkm/filter/mesh_info/MeshQualityRelativeSizeSquared.h b/vtkm/filter/mesh_info/MeshQualityRelativeSizeSquared.h index 9c850cd8f..7870573c5 100644 --- a/vtkm/filter/mesh_info/MeshQualityRelativeSizeSquared.h +++ b/vtkm/filter/mesh_info/MeshQualityRelativeSizeSquared.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityRelativeSizeSquared_h #define vtk_m_filter_mesh_info_MeshQualityRelativeSizeSquared_h -#include +#include #include namespace vtkm @@ -30,8 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityRelativeSizeSquared - : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityRelativeSizeSquared : public vtkm::filter::FilterField { public: MeshQualityRelativeSizeSquared(); diff --git a/vtkm/filter/mesh_info/MeshQualityScaledJacobian.h b/vtkm/filter/mesh_info/MeshQualityScaledJacobian.h index d54a85257..7ca0cbefc 100644 --- a/vtkm/filter/mesh_info/MeshQualityScaledJacobian.h +++ b/vtkm/filter/mesh_info/MeshQualityScaledJacobian.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityScaledJacobian_h #define vtk_m_filter_mesh_info_MeshQualityScaledJacobian_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityScaledJacobian : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityScaledJacobian : public vtkm::filter::FilterField { public: MeshQualityScaledJacobian(); diff --git a/vtkm/filter/mesh_info/MeshQualityShape.h b/vtkm/filter/mesh_info/MeshQualityShape.h index 7d961b07c..33e6ee3dc 100644 --- a/vtkm/filter/mesh_info/MeshQualityShape.h +++ b/vtkm/filter/mesh_info/MeshQualityShape.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityShape_h #define vtk_m_filter_mesh_info_MeshQualityShape_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityShape : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityShape : public vtkm::filter::FilterField { public: MeshQualityShape(); diff --git a/vtkm/filter/mesh_info/MeshQualityShapeAndSize.h b/vtkm/filter/mesh_info/MeshQualityShapeAndSize.h index 2a48c8cf0..75b70d290 100644 --- a/vtkm/filter/mesh_info/MeshQualityShapeAndSize.h +++ b/vtkm/filter/mesh_info/MeshQualityShapeAndSize.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityShapeAndSize_h #define vtk_m_filter_mesh_info_MeshQualityShapeAndSize_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityShapeAndSize : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityShapeAndSize : public vtkm::filter::FilterField { public: MeshQualityShapeAndSize(); diff --git a/vtkm/filter/mesh_info/MeshQualityShear.h b/vtkm/filter/mesh_info/MeshQualityShear.h index 4bb7b417a..f8b0e5dbb 100644 --- a/vtkm/filter/mesh_info/MeshQualityShear.h +++ b/vtkm/filter/mesh_info/MeshQualityShear.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityShear_h #define vtk_m_filter_mesh_info_MeshQualityShear_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityShear : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityShear : public vtkm::filter::FilterField { public: MeshQualityShear(); diff --git a/vtkm/filter/mesh_info/MeshQualitySkew.h b/vtkm/filter/mesh_info/MeshQualitySkew.h index 40a669fc8..d8201fcc9 100644 --- a/vtkm/filter/mesh_info/MeshQualitySkew.h +++ b/vtkm/filter/mesh_info/MeshQualitySkew.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualitySkew_h #define vtk_m_filter_mesh_info_MeshQualitySkew_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualitySkew : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualitySkew : public vtkm::filter::FilterField { public: MeshQualitySkew(); diff --git a/vtkm/filter/mesh_info/MeshQualityStretch.h b/vtkm/filter/mesh_info/MeshQualityStretch.h index acc661d63..e42550c0b 100644 --- a/vtkm/filter/mesh_info/MeshQualityStretch.h +++ b/vtkm/filter/mesh_info/MeshQualityStretch.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityStretch_h #define vtk_m_filter_mesh_info_MeshQualityStretch_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityStretch : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityStretch : public vtkm::filter::FilterField { public: MeshQualityStretch(); diff --git a/vtkm/filter/mesh_info/MeshQualityTaper.h b/vtkm/filter/mesh_info/MeshQualityTaper.h index 127a7f2e2..eaeea6f34 100644 --- a/vtkm/filter/mesh_info/MeshQualityTaper.h +++ b/vtkm/filter/mesh_info/MeshQualityTaper.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityTaper_h #define vtk_m_filter_mesh_info_MeshQualityTaper_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityTaper : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityTaper : public vtkm::filter::FilterField { public: MeshQualityTaper(); diff --git a/vtkm/filter/mesh_info/MeshQualityVolume.h b/vtkm/filter/mesh_info/MeshQualityVolume.h index f98786b7b..107eaacc2 100644 --- a/vtkm/filter/mesh_info/MeshQualityVolume.h +++ b/vtkm/filter/mesh_info/MeshQualityVolume.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityVolume_h #define vtk_m_filter_mesh_info_MeshQualityVolume_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityVolume : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityVolume : public vtkm::filter::FilterField { public: MeshQualityVolume(); diff --git a/vtkm/filter/mesh_info/MeshQualityWarpage.h b/vtkm/filter/mesh_info/MeshQualityWarpage.h index bf783487a..d98884dd9 100644 --- a/vtkm/filter/mesh_info/MeshQualityWarpage.h +++ b/vtkm/filter/mesh_info/MeshQualityWarpage.h @@ -20,7 +20,7 @@ #ifndef vtk_m_filter_mesh_info_MeshQualityWarpage_h #define vtk_m_filter_mesh_info_MeshQualityWarpage_h -#include +#include #include namespace vtkm @@ -30,7 +30,7 @@ namespace filter namespace mesh_info { -class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityWarpage : public vtkm::filter::NewFilterField +class VTKM_FILTER_MESH_INFO_EXPORT MeshQualityWarpage : public vtkm::filter::FilterField { public: MeshQualityWarpage(); diff --git a/vtkm/filter/multi_block/AmrArrays.h b/vtkm/filter/multi_block/AmrArrays.h index d5d5b7c57..ab98b8e5c 100644 --- a/vtkm/filter/multi_block/AmrArrays.h +++ b/vtkm/filter/multi_block/AmrArrays.h @@ -12,7 +12,7 @@ #include -#include +#include #include namespace vtkm @@ -21,7 +21,7 @@ namespace filter { namespace multi_block { -class VTKM_FILTER_MULTI_BLOCK_EXPORT AmrArrays : public vtkm::filter::NewFilter +class VTKM_FILTER_MULTI_BLOCK_EXPORT AmrArrays : public vtkm::filter::Filter { private: vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet&) override diff --git a/vtkm/filter/resampling/Probe.h b/vtkm/filter/resampling/Probe.h index f311fd7f1..56a4fbf3d 100644 --- a/vtkm/filter/resampling/Probe.h +++ b/vtkm/filter/resampling/Probe.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_resampling_Probe_h #define vtk_m_filter_resampling_Probe_h -#include +#include #include namespace vtkm @@ -19,7 +19,7 @@ namespace filter { namespace resampling { -class VTKM_FILTER_RESAMPLING_EXPORT Probe : public vtkm::filter::NewFilterField +class VTKM_FILTER_RESAMPLING_EXPORT Probe : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/scalar_topology/ContourTreeUniform.h b/vtkm/filter/scalar_topology/ContourTreeUniform.h index b233aaa51..fdf0c4dc0 100644 --- a/vtkm/filter/scalar_topology/ContourTreeUniform.h +++ b/vtkm/filter/scalar_topology/ContourTreeUniform.h @@ -57,7 +57,7 @@ #ifndef vtk_m_filter_scalar_topology_ContourTreeUniform_h #define vtk_m_filter_scalar_topology_ContourTreeUniform_h -#include +#include #include namespace vtkm @@ -72,7 +72,7 @@ namespace scalar_topology /// peak of contour /// Based on the algorithm presented in the paper: // “Parallel Peak Pruning for Scalable SMP Contour Tree Computation.” -class VTKM_FILTER_SCALAR_TOPOLOGY_EXPORT ContourTreeMesh2D : public vtkm::filter::NewFilterField +class VTKM_FILTER_SCALAR_TOPOLOGY_EXPORT ContourTreeMesh2D : public vtkm::filter::FilterField { public: VTKM_CONT @@ -89,7 +89,7 @@ private: /// peak of contour /// Based on the algorithm presented in the paper: // “Parallel Peak Pruning for Scalable SMP Contour Tree Computation.” -class VTKM_FILTER_SCALAR_TOPOLOGY_EXPORT ContourTreeMesh3D : public vtkm::filter::NewFilterField +class VTKM_FILTER_SCALAR_TOPOLOGY_EXPORT ContourTreeMesh3D : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx b/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx index ac145b9af..aa425799b 100644 --- a/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx +++ b/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx @@ -222,7 +222,7 @@ VTKM_CONT vtkm::cont::PartitionedDataSet ContourTreeAugmented::DoExecutePartitio const vtkm::cont::PartitionedDataSet& input) { this->PreExecute(input); - auto result = this->NewFilter::DoExecutePartitions(input); + auto result = this->Filter::DoExecutePartitions(input); this->PostExecute(input, result); return result; } diff --git a/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.h b/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.h index 08cd51787..c47121de9 100644 --- a/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.h +++ b/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.h @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include @@ -85,7 +85,7 @@ namespace scalar_topology /// tree are merged progressively using a binary-reduction scheme to compute the /// final contour tree. I.e., in the multi-block context, the final tree is /// constructed on rank 0. -class VTKM_FILTER_SCALAR_TOPOLOGY_EXPORT ContourTreeAugmented : public vtkm::filter::NewFilterField +class VTKM_FILTER_SCALAR_TOPOLOGY_EXPORT ContourTreeAugmented : public vtkm::filter::FilterField { public: VTKM_CONT bool CanThread() const override diff --git a/vtkm/filter/scalar_topology/ContourTreeUniformDistributed.h b/vtkm/filter/scalar_topology/ContourTreeUniformDistributed.h index 952ba8a0d..0f7fa1e06 100644 --- a/vtkm/filter/scalar_topology/ContourTreeUniformDistributed.h +++ b/vtkm/filter/scalar_topology/ContourTreeUniformDistributed.h @@ -63,7 +63,7 @@ #include #include -#include +#include #include namespace vtkm @@ -88,7 +88,7 @@ namespace scalar_topology /// final contour tree. I.e., in the multi-block context, the final tree is /// constructed on rank 0. class VTKM_FILTER_SCALAR_TOPOLOGY_EXPORT ContourTreeUniformDistributed - : public vtkm::filter::NewFilterField + : public vtkm::filter::FilterField { public: VTKM_CONT bool CanThread() const override diff --git a/vtkm/filter/scalar_topology/DistributedBranchDecompositionFilter.h b/vtkm/filter/scalar_topology/DistributedBranchDecompositionFilter.h index 244bbfa71..774c8ae35 100644 --- a/vtkm/filter/scalar_topology/DistributedBranchDecompositionFilter.h +++ b/vtkm/filter/scalar_topology/DistributedBranchDecompositionFilter.h @@ -42,7 +42,7 @@ #ifndef vtk_m_filter_scalar_topology_DistributedBranchDecompositionFilter_h #define vtk_m_filter_scalar_topology_DistributedBranchDecompositionFilter_h -#include +#include #include namespace vtkm @@ -54,7 +54,7 @@ namespace scalar_topology /// \brief Compute branch decompostion from distributed contour tree class VTKM_FILTER_SCALAR_TOPOLOGY_EXPORT DistributedBranchDecompositionFilter - : public vtkm::filter::NewFilter + : public vtkm::filter::Filter { public: VTKM_CONT DistributedBranchDecompositionFilter() = default; diff --git a/vtkm/filter/vector_analysis/CrossProduct.h b/vtkm/filter/vector_analysis/CrossProduct.h index 2ee861320..06dcbbb14 100644 --- a/vtkm/filter/vector_analysis/CrossProduct.h +++ b/vtkm/filter/vector_analysis/CrossProduct.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_vector_analysis_CrossProduct_h #define vtk_m_filter_vector_analysis_CrossProduct_h -#include +#include #include @@ -22,7 +22,7 @@ namespace filter namespace vector_analysis { -class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT CrossProduct : public vtkm::filter::NewFilterField +class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT CrossProduct : public vtkm::filter::FilterField { public: VTKM_CONT diff --git a/vtkm/filter/vector_analysis/DotProduct.h b/vtkm/filter/vector_analysis/DotProduct.h index c15573e37..c859cb3c6 100644 --- a/vtkm/filter/vector_analysis/DotProduct.h +++ b/vtkm/filter/vector_analysis/DotProduct.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_vector_analysis_DotProduct_h #define vtk_m_filter_vector_analysis_DotProduct_h -#include +#include #include namespace vtkm @@ -20,7 +20,7 @@ namespace filter { namespace vector_analysis { -class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT DotProduct : public vtkm::filter::NewFilterField +class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT DotProduct : public vtkm::filter::FilterField { public: VTKM_CONT DotProduct(); diff --git a/vtkm/filter/vector_analysis/Gradient.h b/vtkm/filter/vector_analysis/Gradient.h index 527fe8a8e..e2231b375 100644 --- a/vtkm/filter/vector_analysis/Gradient.h +++ b/vtkm/filter/vector_analysis/Gradient.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_vector_analysis_Gradient_h #define vtk_m_filter_vector_analysis_Gradient_h -#include +#include #include namespace vtkm @@ -29,7 +29,7 @@ namespace vector_analysis /// /// Note: If no explicit name for the output field is provided the filter will /// default to "Gradients" -class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT Gradient : public vtkm::filter::NewFilterField +class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT Gradient : public vtkm::filter::FilterField { public: /// When this flag is on (default is off), the gradient filter will provide a diff --git a/vtkm/filter/vector_analysis/SurfaceNormals.h b/vtkm/filter/vector_analysis/SurfaceNormals.h index d0a34bf1d..6042552bb 100644 --- a/vtkm/filter/vector_analysis/SurfaceNormals.h +++ b/vtkm/filter/vector_analysis/SurfaceNormals.h @@ -10,7 +10,7 @@ #ifndef vtk_m_filter_vector_analysis_SurfaceNormal_h #define vtk_m_filter_vector_analysis_SurfaceNormal_h -#include +#include #include namespace vtkm @@ -25,7 +25,7 @@ namespace vector_analysis /// The cell normals are faceted and are computed based on the plane where a /// face lies. The point normals are smooth normals, computed by averaging /// the face normals of incident cells. -class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT SurfaceNormals : public vtkm::filter::NewFilterField +class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT SurfaceNormals : public vtkm::filter::FilterField { public: /// Create SurfaceNormals filter. This calls diff --git a/vtkm/filter/vector_analysis/VectorMagnitude.h b/vtkm/filter/vector_analysis/VectorMagnitude.h index 9d4c0b7c2..eb19c5974 100644 --- a/vtkm/filter/vector_analysis/VectorMagnitude.h +++ b/vtkm/filter/vector_analysis/VectorMagnitude.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_vector_analysis_VectorMagnitude_h #define vtk_m_filter_vector_analysis_VectorMagnitude_h -#include +#include #include namespace vtkm @@ -20,7 +20,7 @@ namespace filter { namespace vector_analysis { -class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT VectorMagnitude : public vtkm::filter::NewFilterField +class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT VectorMagnitude : public vtkm::filter::FilterField { public: VectorMagnitude(); diff --git a/vtkm/filter/zfp/ZFPCompressor1D.h b/vtkm/filter/zfp/ZFPCompressor1D.h index a02e37cdf..39c5ed0b2 100644 --- a/vtkm/filter/zfp/ZFPCompressor1D.h +++ b/vtkm/filter/zfp/ZFPCompressor1D.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_zfp_ZFPCompressor1D_h #define vtk_m_filter_zfp_ZFPCompressor1D_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace zfp /// output of compressed data. /// @warning /// This filter is currently only supports 1D volumes. -class VTKM_FILTER_ZFP_EXPORT ZFPCompressor1D : public vtkm::filter::NewFilterField +class VTKM_FILTER_ZFP_EXPORT ZFPCompressor1D : public vtkm::filter::FilterField { public: void SetRate(vtkm::Float64 _rate) { rate = _rate; } diff --git a/vtkm/filter/zfp/ZFPCompressor2D.h b/vtkm/filter/zfp/ZFPCompressor2D.h index 468db08e0..e48fcb404 100644 --- a/vtkm/filter/zfp/ZFPCompressor2D.h +++ b/vtkm/filter/zfp/ZFPCompressor2D.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_zfp_ZFPCompressor2D_h #define vtk_m_filter_zfp_ZFPCompressor2D_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace zfp /// output of compressed data. /// @warning /// This filter is currently only supports 1D volumes. -class VTKM_FILTER_ZFP_EXPORT ZFPCompressor2D : public vtkm::filter::NewFilterField +class VTKM_FILTER_ZFP_EXPORT ZFPCompressor2D : public vtkm::filter::FilterField { public: void SetRate(vtkm::Float64 _rate) { rate = _rate; } diff --git a/vtkm/filter/zfp/ZFPCompressor3D.h b/vtkm/filter/zfp/ZFPCompressor3D.h index 592849ecd..844054f11 100644 --- a/vtkm/filter/zfp/ZFPCompressor3D.h +++ b/vtkm/filter/zfp/ZFPCompressor3D.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_zfp_ZFPCompressor3D_h #define vtk_m_filter_zfp_ZFPCompressor3D_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace zfp /// output of compressed data. /// @warning /// This filter is currently only supports 1D volumes. -class VTKM_FILTER_ZFP_EXPORT ZFPCompressor3D : public vtkm::filter::NewFilterField +class VTKM_FILTER_ZFP_EXPORT ZFPCompressor3D : public vtkm::filter::FilterField { public: void SetRate(vtkm::Float64 _rate) { rate = _rate; } diff --git a/vtkm/filter/zfp/ZFPDecompressor1D.h b/vtkm/filter/zfp/ZFPDecompressor1D.h index 4283e4cb9..bf82bc001 100644 --- a/vtkm/filter/zfp/ZFPDecompressor1D.h +++ b/vtkm/filter/zfp/ZFPDecompressor1D.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_zfp_ZFPDecompressor1D_h #define vtk_m_filter_zfp_ZFPDecompressor1D_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace zfp /// output of compressed data. /// @warning /// This filter is currently only supports 1D volumes. -class VTKM_FILTER_ZFP_EXPORT ZFPDecompressor1D : public vtkm::filter::NewFilterField +class VTKM_FILTER_ZFP_EXPORT ZFPDecompressor1D : public vtkm::filter::FilterField { public: void SetRate(vtkm::Float64 _rate) { rate = _rate; } diff --git a/vtkm/filter/zfp/ZFPDecompressor2D.h b/vtkm/filter/zfp/ZFPDecompressor2D.h index bda18ed84..7c0d609de 100644 --- a/vtkm/filter/zfp/ZFPDecompressor2D.h +++ b/vtkm/filter/zfp/ZFPDecompressor2D.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_zfp_ZFPDecompressor2D_h #define vtk_m_filter_zfp_ZFPDecompressor2D_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace zfp /// output of compressed data. /// @warning /// This filter is currently only supports 1D volumes. -class VTKM_FILTER_ZFP_EXPORT ZFPDecompressor2D : public vtkm::filter::NewFilterField +class VTKM_FILTER_ZFP_EXPORT ZFPDecompressor2D : public vtkm::filter::FilterField { public: void SetRate(vtkm::Float64 _rate) { rate = _rate; } diff --git a/vtkm/filter/zfp/ZFPDecompressor3D.h b/vtkm/filter/zfp/ZFPDecompressor3D.h index 8245e6f34..744c8cd32 100644 --- a/vtkm/filter/zfp/ZFPDecompressor3D.h +++ b/vtkm/filter/zfp/ZFPDecompressor3D.h @@ -11,7 +11,7 @@ #ifndef vtk_m_filter_zfp_ZFPDecompressor3D_h #define vtk_m_filter_zfp_ZFPDecompressor3D_h -#include +#include #include namespace vtkm @@ -26,7 +26,7 @@ namespace zfp /// output of compressed data. /// @warning /// This filter is currently only supports 1D volumes. -class VTKM_FILTER_ZFP_EXPORT ZFPDecompressor3D : public vtkm::filter::NewFilterField +class VTKM_FILTER_ZFP_EXPORT ZFPDecompressor3D : public vtkm::filter::FilterField { public: void SetRate(vtkm::Float64 _rate) { rate = _rate; } diff --git a/vtkm/source/PerlinNoise.cxx b/vtkm/source/PerlinNoise.cxx index 6391dc136..123f292f8 100644 --- a/vtkm/source/PerlinNoise.cxx +++ b/vtkm/source/PerlinNoise.cxx @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include @@ -125,7 +125,7 @@ struct PerlinNoiseWorklet : public vtkm::worklet::WorkletVisitPointsWithCells vtkm::Id Repeat; }; -class PerlinNoiseField : public vtkm::filter::NewFilterField +class PerlinNoiseField : public vtkm::filter::FilterField { public: VTKM_CONT PerlinNoiseField(vtkm::IdComponent tableSize, vtkm::Id seed)