Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamve vector_calculus -> vector_analysis

Browse Source
This commit is contained in:
Li-Ta Lo 2022-01-31 08:58:38 -07:00
parent 63d4b02ad2
commit cdc4c29c5f
54 changed files with 152 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
benchmarking/BenchmarkFilters.cxx
View File

@ -41,8 +41,8 @@
#include <vtkm/filter/entity_extraction/ExternalFaces.h>
#include <vtkm/filter/entity_extraction/Threshold.h>
#include <vtkm/filter/entity_extraction/ThresholdPoints.h>
#include <vtkm/filter/vector_calculus/Gradient.h>
#include <vtkm/filter/vector_calculus/VectorMagnitude.h>
#include <vtkm/filter/vector_analysis/Gradient.h>
#include <vtkm/filter/vector_analysis/VectorMagnitude.h>
#include <vtkm/io/VTKDataSetReader.h>
@ -118,7 +118,7 @@ void BenchGradient(::benchmark::State& state, int options)
{
const vtkm::cont::DeviceAdapterId device = Config.Device;
vtkm::filter::vector_calculus::Gradient filter;
vtkm::filter::vector_analysis::Gradient filter;
if (options & ScalarInput)
{
@ -707,7 +707,7 @@ void CreateMissingFields()
{
// Compute the magnitude of the vectors:
VTKM_ASSERT(!PointVectorsName.empty());
vtkm::filter::vector_calculus::VectorMagnitude mag;
vtkm::filter::vector_analysis::VectorMagnitude mag;
mag.SetActiveField(PointVectorsName, vtkm::cont::Field::Association::POINTS);
mag.SetOutputFieldName("GeneratedPointScalars");
auto outds = mag.Execute(InputDataSet);

4
benchmarking/BenchmarkInSitu.cxx
View File

@ -30,7 +30,7 @@
#include <vtkm/filter/Tube.h>
#include <vtkm/filter/contour/Contour.h>
#include <vtkm/filter/contour/Slice.h>
#include <vtkm/filter/vector_calculus/Gradient.h>
#include <vtkm/filter/vector_analysis/Gradient.h>
#include <vtkm/rendering/Actor.h>
#include <vtkm/rendering/CanvasRayTracer.h>
@ -119,7 +119,7 @@ void BuildInputDataSet(uint32_t cycle, bool isStructured, bool isMultiBlock, vtk
}
// Generate Perln Noise Gradient point vector field
vtkm::filter::vector_calculus::Gradient gradientFilter;
vtkm::filter::vector_analysis::Gradient gradientFilter;
gradientFilter.SetActiveField(PointScalarsName, vtkm::cont::Field::Association::POINTS);
gradientFilter.SetComputePointGradient(true);
gradientFilter.SetOutputFieldName(PointVectorsName);

8
examples/multi_backend/MultiDeviceGradient.hxx
View File

@ -15,7 +15,7 @@
#include <vtkm/cont/openmp/DeviceAdapterOpenMP.h>
#include <vtkm/cont/tbb/DeviceAdapterTBB.h>
#include <vtkm/filter/vector_calculus/Gradient.h>
#include <vtkm/filter/vector_analysis/Gradient.h>
namespace
@ -206,7 +206,7 @@ inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForE
//Step 3. Construct the filter we want to run on each partition
vtkm::filter::vector_calculus::Gradient gradient;
vtkm::filter::vector_analysis::Gradient gradient;
gradient.SetComputePointGradient(this->GetComputePointGradient());
gradient.SetActiveField(this->GetActiveFieldName());
@ -218,7 +218,7 @@ inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForE
vtkm::cont::DataSet input = *partition;
this->Queue.push( //build a lambda that is the work to do
[=]() {
vtkm::filter::vector_calculus::Gradient perThreadGrad = gradient;
vtkm::filter::vector_analysis::Gradient perThreadGrad = gradient;
vtkm::cont::DataSet result = perThreadGrad.Execute(input);
outPtr->ReplacePartition(0, result);
@ -237,7 +237,7 @@ inline VTKM_CONT vtkm::cont::PartitionedDataSet MultiDeviceGradient::PrepareForE
//blocking manner
this->Queue.push( //build a lambda that is the work to do
[=]() {
vtkm::filter::vector_calculus::Gradient perThreadGrad = gradient;
vtkm::filter::vector_analysis::Gradient perThreadGrad = gradient;
vtkm::cont::DataSet result = perThreadGrad.Execute(input);
outPtr->ReplacePartition(index, result);

2
vtkm/filter/CMakeLists.txt
View File

@ -234,7 +234,7 @@ add_subdirectory(entity_extraction)
add_subdirectory(internal)
add_subdirectory(particleadvection)
add_subdirectory(field_transform)
add_subdirectory(vector_calculus)
add_subdirectory(vector_analysis)
#-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -
if (VTKm_ENABLE_TESTING)

10
vtkm/filter/CrossProduct.h
View File

@ -12,7 +12,7 @@
#define vtk_m_filter_CrossProduct_h
#include <vtkm/Deprecated.h>
#include <vtkm/filter/vector_calculus/CrossProduct.h>
#include <vtkm/filter/vector_analysis/CrossProduct.h>
namespace vtkm
{
@ -21,7 +21,7 @@ namespace filter
VTKM_DEPRECATED(
1.8,
"Use vtkm/filter/vector_calculus/CrossProduct.h instead of vtkm/filter/CrossProduct.h.")
"Use vtkm/filter/vector_analysis/CrossProduct.h instead of vtkm/filter/CrossProduct.h.")
inline void CrossProduct_deprecated() {}
inline void CrossProduct_deprecated_warning()
@ -29,10 +29,10 @@ inline void CrossProduct_deprecated_warning()
CrossProduct_deprecated();
}
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_calculus::CrossProduct.") CrossProduct
: public vtkm::filter::vector_calculus::CrossProduct
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_analysis::CrossProduct.") CrossProduct
: public vtkm::filter::vector_analysis::CrossProduct
{
using vector_calculus::CrossProduct::CrossProduct;
using vector_analysis::CrossProduct::CrossProduct;
};
}

10
vtkm/filter/DotProduct.h
View File

@ -11,7 +11,7 @@
#define vtk_m_filter_DotProduct_h
#include <vtkm/Deprecated.h>
#include <vtkm/filter/vector_calculus/DotProduct.h>
#include <vtkm/filter/vector_analysis/DotProduct.h>
namespace vtkm
{
@ -19,7 +19,7 @@ namespace filter
{
VTKM_DEPRECATED(1.8,
"Use vtkm/filter/vector_calculus/DotProduct.h instead of vtkm/filter/DotProduct.h.")
"Use vtkm/filter/vector_analysis/DotProduct.h instead of vtkm/filter/DotProduct.h.")
inline void DotProduct_deprecated() {}
inline void DotProduct_deprecated_warning()
@ -27,10 +27,10 @@ inline void DotProduct_deprecated_warning()
DotProduct_deprecated();
}
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_calculus::DotProduct.") DotProduct
: public vtkm::filter::vector_calculus::DotProduct
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_analysis::DotProduct.") DotProduct
: public vtkm::filter::vector_analysis::DotProduct
{
using vector_calculus::DotProduct::DotProduct;
using vector_analysis::DotProduct::DotProduct;
};
}

10
vtkm/filter/Gradient.h
View File

@ -11,7 +11,7 @@
#define vtk_m_filter_Gradient_h
#include <vtkm/Deprecated.h>
#include <vtkm/filter/vector_calculus/Gradient.h>
#include <vtkm/filter/vector_analysis/Gradient.h>
namespace vtkm
{
@ -19,7 +19,7 @@ namespace filter
{
VTKM_DEPRECATED(1.8,
"Use vtkm/filter/vector_calculus/Gradient.h instead of vtkm/filter/Gradient.h.")
"Use vtkm/filter/vector_analysis/Gradient.h instead of vtkm/filter/Gradient.h.")
inline void Gradient_deprecated() {}
inline void Gradient_deprecated_warning()
@ -27,10 +27,10 @@ inline void Gradient_deprecated_warning()
Gradient_deprecated();
}
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_calculus::Gradient.") Gradient
: public vtkm::filter::vector_calculus::Gradient
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_analysis::Gradient.") Gradient
: public vtkm::filter::vector_analysis::Gradient
{
using vector_calculus::Gradient::Gradient;
using vector_analysis::Gradient::Gradient;
};
}

10
vtkm/filter/SurfaceNormal.h
View File

@ -11,7 +11,7 @@
#define vtk_m_filter_SurfaceNormal_h
#include <vtkm/Deprecated.h>
#include <vtkm/filter/vector_calculus/SurfaceNormal.h>
#include <vtkm/filter/vector_analysis/SurfaceNormal.h>
namespace vtkm
{
@ -20,7 +20,7 @@ namespace filter
VTKM_DEPRECATED(
1.8,
"Use vtkm/filter/vector_calculus/SurfaceNormal.h instead of vtkm/filter/SurfaceNormal.h.")
"Use vtkm/filter/vector_analysis/SurfaceNormal.h instead of vtkm/filter/SurfaceNormal.h.")
inline void SurfaceNormal_deprecated() {}
inline void SurfaceNormal_deprecated_warning()
@ -28,10 +28,10 @@ inline void SurfaceNormal_deprecated_warning()
SurfaceNormal_deprecated();
}
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_calculus::SurfaceNormal.") SurfaceNormal
: public vtkm::filter::vector_calculus::SurfaceNormal
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_analysis::SurfaceNormal.") SurfaceNormal
: public vtkm::filter::vector_analysis::SurfaceNormal
{
using vector_calculus::SurfaceNormal::SurfaceNormal;
using vector_analysis::SurfaceNormal::SurfaceNormal;
};
}

10
vtkm/filter/VectorMagnitude.h
View File

@ -11,7 +11,7 @@
#define vtk_m_filter_VectorMagnitude_h
#include <vtkm/Deprecated.h>
#include <vtkm/filter/vector_calculus/VectorMagnitude.h>
#include <vtkm/filter/vector_analysis/VectorMagnitude.h>
namespace vtkm
{
@ -20,7 +20,7 @@ namespace filter
VTKM_DEPRECATED(
1.8,
"Use vtkm/filter/vector_calculus/VectorMagnitude.h instead of vtkm/filter/VectorMagnitude.h.")
"Use vtkm/filter/vector_analysis/VectorMagnitude.h instead of vtkm/filter/VectorMagnitude.h.")
inline void VectorMagnitude_deprecated() {}
inline void VectorMagnitude_deprecated_warning()
@ -28,10 +28,10 @@ inline void VectorMagnitude_deprecated_warning()
VectorMagnitude_deprecated();
}
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_calculus::VectorMagnitude.") VectorMagnitude
: public vtkm::filter::vector_calculus::VectorMagnitude
class VTKM_DEPRECATED(1.8, "Use vtkm::filter::vector_analysis::VectorMagnitude.") VectorMagnitude
: public vtkm::filter::vector_analysis::VectorMagnitude
{
using vector_calculus::VectorMagnitude::VectorMagnitude;
using vector_analysis::VectorMagnitude::VectorMagnitude;
};
}

2
vtkm/filter/contour/Contour.cxx
View File

@ -17,7 +17,7 @@
#include <vtkm/filter/contour/Contour.h>
#include <vtkm/filter/contour/worklet/Contour.h>
#include <vtkm/filter/vector_calculus/worklet/SurfaceNormals.h>
#include <vtkm/filter/vector_analysis/worklet/SurfaceNormals.h>
namespace vtkm
{

2
vtkm/filter/contour/worklet/FlyingEdgesPass4Y.h
View File

@ -18,7 +18,7 @@
#include <vtkm/filter/contour/worklet/FlyingEdgesTables.h>
#include <vtkm/VectorAnalysis.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/StructuredPointGradient.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/StructuredPointGradient.h>
namespace vtkm
{

4
vtkm/filter/contour/worklet/MarchingCells.h
View File

@ -30,8 +30,8 @@
#include <vtkm/filter/contour/worklet/CommonState.h>
#include <vtkm/filter/contour/worklet/MarchingCellTables.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/PointGradient.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/StructuredPointGradient.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/PointGradient.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/StructuredPointGradient.h>
#include <vtkm/worklet/WorkletReduceByKey.h>
namespace vtkm

4
vtkm/filter/testing/RenderTestPointTransform.cxx
View File

@ -14,7 +14,7 @@
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/filter/PointTransform.h>
#include <vtkm/filter/vector_calculus/VectorMagnitude.h>
#include <vtkm/filter/vector_analysis/VectorMagnitude.h>
#include <vtkm/rendering/testing/RenderTest.h>
#include <vtkm/rendering/testing/Testing.h>
@ -38,7 +38,7 @@ void TestPointTransform()
// Need to take the magnitude of the "translation" field.
// ColorMap only works with scalar fields (1 component)
vtkm::filter::vector_calculus::VectorMagnitude vectorMagnitude;
vtkm::filter::vector_analysis::VectorMagnitude vectorMagnitude;
vectorMagnitude.SetActiveField("translation");
vectorMagnitude.SetOutputFieldName("pointvar");
result = vectorMagnitude.Execute(result);

2
vtkm/filter/testing/RenderTestSplitSharpEdges.cxx
View File

@ -14,7 +14,7 @@
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/filter/SplitSharpEdges.h>
#include <vtkm/filter/vector_calculus/SurfaceNormals.h>
#include <vtkm/filter/vector_analysis/SurfaceNormals.h>
#include <vtkm/rendering/testing/RenderTest.h>
#include <vtkm/rendering/testing/Testing.h>

4
vtkm/filter/testing/UnitTestMultiBlockFilter.cxx
View File

@ -16,7 +16,7 @@
#include <vtkm/filter/clean_grid/CleanGrid.h>
#include <vtkm/filter/contour/ClipWithField.h>
#include <vtkm/filter/contour/Contour.h>
#include <vtkm/filter/vector_calculus/Gradient.h>
#include <vtkm/filter/vector_analysis/Gradient.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/source/Tangle.h>
@ -147,7 +147,7 @@ void TestMultiBlockFilter()
results.clear();
for (const auto doThreading : flags)
{
vtkm::filter::vector_calculus::Gradient grad;
vtkm::filter::vector_analysis::Gradient grad;
grad.SetRunMultiThreadedFilter(doThreading);
grad.SetComputePointGradient(true);
grad.SetActiveField("tangle");

4
vtkm/filter/testing/UnitTestSplitSharpEdgesFilter.cxx
View File

@ -10,7 +10,7 @@
#include <vtkm/filter/CellAverage.h>
#include <vtkm/filter/SplitSharpEdges.h>
#include <vtkm/filter/contour/Contour.h>
#include <vtkm/filter/vector_calculus/SurfaceNormals.h>
#include <vtkm/filter/vector_analysis/SurfaceNormals.h>
#include <vtkm/cont/DataSetBuilderExplicit.h>
#include <vtkm/cont/testing/Testing.h>
@ -205,7 +205,7 @@ void TestWithExplicitData()
vtkm::cont::DataSet simpleCube = Make3DExplicitSimpleCube();
// Generate surface normal field
vtkm::filter::vector_calculus::SurfaceNormals surfaceNormalsFilter;
vtkm::filter::vector_analysis::SurfaceNormals surfaceNormalsFilter;
surfaceNormalsFilter.SetGenerateCellNormals(true);
vtkm::cont::DataSet simpleCubeWithSN = surfaceNormalsFilter.Execute(simpleCube);
VTKM_TEST_ASSERT(simpleCubeWithSN.HasCellField("Normals"), "Cell normals missing.");

14
vtkm/filter/vector_calculus/CMakeLists.txt → vtkm/filter/vector_analysis/CMakeLists.txt
View File

@ -7,14 +7,14 @@
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information.
##============================================================================
set(vector_calculus_headers
set(vector_analysis_headers
CrossProduct.h
DotProduct.h
Gradient.h
SurfaceNormals.h
VectorMagnitude.h
)
set(vector_calculus_sources_device
set(vector_analysis_sources_device
CrossProduct.cxx
DotProduct.cxx
Gradient.cxx
@ -23,14 +23,14 @@ set(vector_calculus_sources_device
)
vtkm_library(
NAME vtkm_filter_vector_calculus
HEADERS ${vector_calculus_headers}
DEVICE_SOURCES ${vector_calculus_sources_device}
NAME vtkm_filter_vector_analysis
HEADERS ${vector_analysis_headers}
DEVICE_SOURCES ${vector_analysis_sources_device}
USE_VTKM_JOB_POOL
)
target_link_libraries(vtkm_filter_vector_calculus PUBLIC vtkm_worklet vtkm_filter_core)
target_link_libraries(vtkm_filter PUBLIC INTERFACE vtkm_filter_vector_calculus)
target_link_libraries(vtkm_filter_vector_analysis PUBLIC vtkm_worklet vtkm_filter_core)
target_link_libraries(vtkm_filter PUBLIC INTERFACE vtkm_filter_vector_analysis)
add_subdirectory(worklet)
#-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -

6
vtkm/filter/vector_calculus/CrossProduct.cxx → vtkm/filter/vector_analysis/CrossProduct.cxx
View File

@ -8,7 +8,7 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/filter/vector_calculus/CrossProduct.h>
#include <vtkm/filter/vector_analysis/CrossProduct.h>
#include <vtkm/worklet/WorkletMapField.h>
@ -39,7 +39,7 @@ namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
//-----------------------------------------------------------------------------
@ -83,4 +83,4 @@ VTKM_CONT vtkm::cont::DataSet CrossProduct::DoExecute(const vtkm::cont::DataSet&
}
}
} // namespace vtkm::filter::vector_calculus
} // namespace vtkm::filter::vector_analysis

14
vtkm/filter/vector_calculus/CrossProduct.h → vtkm/filter/vector_analysis/CrossProduct.h
View File

@ -8,21 +8,21 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#ifndef vtk_m_filter_vector_calculus_CrossProduct_h
#define vtk_m_filter_vector_calculus_CrossProduct_h
#ifndef vtk_m_filter_vector_analysis_CrossProduct_h
#define vtk_m_filter_vector_analysis_CrossProduct_h
#include <vtkm/filter/NewFilterField.h>
#include <vtkm/filter/vector_calculus/vtkm_filter_vector_calculus_export.h>
#include <vtkm/filter/vector_analysis/vtkm_filter_vector_analysis_export.h>
namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
class VTKM_FILTER_VECTOR_CALCULUS_EXPORT CrossProduct : public vtkm::filter::NewFilterField
class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT CrossProduct : public vtkm::filter::NewFilterField
{
public:
VTKM_CONT
@ -124,6 +124,6 @@ private:
}
}
} // namespace vtkm::filter::vector_calculus
} // namespace vtkm::filter::vector_analysis
#endif // vtk_m_filter_vector_calculus_CrossProduct_h
#endif // vtk_m_filter_vector_analysis_CrossProduct_h

6
vtkm/filter/vector_calculus/DotProduct.cxx → vtkm/filter/vector_analysis/DotProduct.cxx
View File

@ -9,7 +9,7 @@
//============================================================================
#include <vtkm/cont/ErrorFilterExecution.h>
#include <vtkm/filter/vector_calculus/DotProduct.h>
#include <vtkm/filter/vector_analysis/DotProduct.h>
#include <vtkm/worklet/WorkletMapField.h>
namespace // anonymous namespace making worklet::DotProduct internal to this .cxx
@ -67,7 +67,7 @@ namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
VTKM_CONT DotProduct::DotProduct()
@ -114,6 +114,6 @@ VTKM_CONT vtkm::cont::DataSet DotProduct::DoExecute(const vtkm::cont::DataSet& i
outArray);
}
} // namespace vector_calculus
} // namespace vector_analysis
} // namespace filter
} // namespace vtkm

14
vtkm/filter/vector_calculus/DotProduct.h → vtkm/filter/vector_analysis/DotProduct.h
View File

@ -8,19 +8,19 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#ifndef vtk_m_filter_vector_calculus_DotProduct_h
#define vtk_m_filter_vector_calculus_DotProduct_h
#ifndef vtk_m_filter_vector_analysis_DotProduct_h
#define vtk_m_filter_vector_analysis_DotProduct_h
#include <vtkm/filter/NewFilterField.h>
#include <vtkm/filter/vector_calculus/vtkm_filter_vector_calculus_export.h>
#include <vtkm/filter/vector_analysis/vtkm_filter_vector_analysis_export.h>
namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
class VTKM_FILTER_VECTOR_CALCULUS_EXPORT DotProduct : public vtkm::filter::NewFilterField
class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT DotProduct : public vtkm::filter::NewFilterField
{
public:
VTKM_CONT DotProduct();
@ -121,8 +121,8 @@ public:
private:
vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& input) override;
};
} // namespace vector_calculus
} // namespace vector_analysis
} // namespace filter
} // namespace vtkm
#endif // vtk_m_filter_vector_calculus_DotProduct_h
#endif // vtk_m_filter_vector_analysis_DotProduct_h

11
vtkm/filter/vector_calculus/Gradient.cxx → vtkm/filter/vector_analysis/Gradient.cxx
View File

@ -9,8 +9,8 @@
//============================================================================
#include <vtkm/cont/ErrorFilterExecution.h>
#include <vtkm/cont/UnknownCellSet.h>
#include <vtkm/filter/vector_calculus/Gradient.h>
#include <vtkm/filter/vector_calculus/worklet/Gradient.h>
#include <vtkm/filter/vector_analysis/Gradient.h>
#include <vtkm/filter/vector_analysis/worklet/Gradient.h>
namespace
{
@ -34,7 +34,7 @@ namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
//-----------------------------------------------------------------------------
vtkm::cont::DataSet Gradient::DoExecute(const vtkm::cont::DataSet& inputDataSet)
@ -97,8 +97,7 @@ vtkm::cont::DataSet Gradient::DoExecute(const vtkm::cont::DataSet& inputDataSet)
qcriterionArray = gradientfields.QCriterion;
};
// TODO: do we need to deal with vtkm::cont::StorageTagXGCCoordinates? or it is already part of
// VTKM_DEFAULT_STORAGE_LIST when enabled.
using SupportedTypes = vtkm::List<vtkm::Float32, vtkm::Float64, vtkm::Vec3f_32, vtkm::Vec3f_64>;
field.GetData().CastAndCallForTypesWithFloatFallback<SupportedTypes, VTKM_DEFAULT_STORAGE_LIST>(
resolveType);
@ -134,6 +133,6 @@ vtkm::cont::DataSet Gradient::DoExecute(const vtkm::cont::DataSet& inputDataSet)
}
return outputDataSet;
}
} // namespace vector_calculus
} // namespace vector_analysis
} // namespace filter
} // namespace vtkm

16
vtkm/filter/vector_calculus/Gradient.h → vtkm/filter/vector_analysis/Gradient.h
View File

@ -8,17 +8,17 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#ifndef vtk_m_filter_vector_calculus_Gradient_h
#define vtk_m_filter_vector_calculus_Gradient_h
#ifndef vtk_m_filter_vector_analysis_Gradient_h
#define vtk_m_filter_vector_analysis_Gradient_h
#include <vtkm/filter/NewFilterField.h>
#include <vtkm/filter/vector_calculus/vtkm_filter_vector_calculus_export.h>
#include <vtkm/filter/vector_analysis/vtkm_filter_vector_analysis_export.h>
namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
/// \brief A general filter for gradient estimation.
/// Estimates the gradient of a point field in a data set. The created gradient array
@ -29,7 +29,7 @@ namespace vector_calculus
///
/// Note: If no explicit name for the output field is provided the filter will
/// default to "Gradients"
class VTKM_FILTER_VECTOR_CALCULUS_EXPORT Gradient : public vtkm::filter::NewFilterField
class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT Gradient : public vtkm::filter::NewFilterField
{
public:
/// When this flag is on (default is off), the gradient filter will provide a
@ -88,8 +88,6 @@ public:
const std::string& GetQCriterionName() const { return this->QCriterionName; }
private:
using SupportedTypes = vtkm::List<vtkm::Float32, vtkm::Float64, vtkm::Vec3f_32, vtkm::Vec3f_64>;
vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& inputDataSet) override;
bool ComputePointGradient = false;
@ -105,8 +103,8 @@ private:
std::string VorticityName = "Vorticity";
};
} // namespace vector_calculus
} // namespace vector_analysis
} // namespace filter
} // namespace vtkm::filter
#endif // vtk_m_filter_vector_calculus_Gradient_h
#endif // vtk_m_filter_vector_analysis_Gradient_h

10
vtkm/filter/vector_calculus/SurfaceNormals.cxx → vtkm/filter/vector_analysis/SurfaceNormals.cxx
View File

@ -9,9 +9,9 @@
//============================================================================
#include <vtkm/cont/ErrorFilterExecution.h>
#include <vtkm/filter/vector_calculus/SurfaceNormals.h>
#include <vtkm/filter/vector_calculus/worklet/OrientNormals.h>
#include <vtkm/filter/vector_calculus/worklet/SurfaceNormals.h>
#include <vtkm/filter/vector_analysis/SurfaceNormals.h>
#include <vtkm/filter/vector_analysis/worklet/OrientNormals.h>
#include <vtkm/filter/vector_analysis/worklet/SurfaceNormals.h>
#include <vtkm/worklet/TriangleWinding.h>
namespace vtkm
@ -19,7 +19,7 @@ namespace vtkm
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
namespace
{
@ -145,6 +145,6 @@ vtkm::cont::DataSet SurfaceNormals::DoExecute(const vtkm::cont::DataSet& inputDa
return outputDataSet;
}
} // namespace vector_calculus
} // namespace vector_analysis
} // namespace filter
} // namespace vtkm

12
vtkm/filter/vector_calculus/SurfaceNormals.h → vtkm/filter/vector_analysis/SurfaceNormals.h
View File

@ -7,17 +7,17 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#ifndef vtk_m_filter_vector_calculus_SurfaceNormal_h
#define vtk_m_filter_vector_calculus_SurfaceNormal_h
#ifndef vtk_m_filter_vector_analysis_SurfaceNormal_h
#define vtk_m_filter_vector_analysis_SurfaceNormal_h
#include <vtkm/filter/NewFilterField.h>
#include <vtkm/filter/vector_calculus/vtkm_filter_vector_calculus_export.h>
#include <vtkm/filter/vector_analysis/vtkm_filter_vector_analysis_export.h>
namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
/// \brief compute normals for polygonal mesh
///
@ -25,7 +25,7 @@ namespace vector_calculus
/// 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_CALCULUS_EXPORT SurfaceNormals : public vtkm::filter::NewFilterField
class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT SurfaceNormals : public vtkm::filter::NewFilterField
{
public:
/// Create SurfaceNormals filter. This calls
@ -113,4 +113,4 @@ private:
}
} // vtkm::filter
#endif // vtk_m_filter_vector_calculus_SurfaceNormal_h
#endif // vtk_m_filter_vector_analysis_SurfaceNormal_h

14
vtkm/filter/vector_calculus/VectorMagnitude.cxx → vtkm/filter/vector_analysis/VectorMagnitude.cxx
View File

@ -8,17 +8,16 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/filter/vector_calculus/VectorMagnitude.h>
#include <vtkm/filter/vector_calculus/worklet/Magnitude.h>
#include <vtkm/filter/vector_analysis/VectorMagnitude.h>
#include <vtkm/filter/vector_analysis/worklet/Magnitude.h>
namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
VectorMagnitude::VectorMagnitude()
{
this->SetOutputFieldName("magnitude");
}
@ -37,12 +36,13 @@ VTKM_CONT vtkm::cont::DataSet VectorMagnitude::DoExecute(const vtkm::cont::DataS
this->Invoke(vtkm::worklet::Magnitude{}, concrete, result);
outArray = result;
};
field.GetData().CastAndCallForTypesWithFloatFallback<SupportedTypes, VTKM_DEFAULT_STORAGE_LIST>(
resolveType);
field.GetData()
.CastAndCallForTypesWithFloatFallback<vtkm::TypeListVecCommon, VTKM_DEFAULT_STORAGE_LIST>(
resolveType);
return this->CreateResultField(
inDataSet, this->GetOutputFieldName(), field.GetAssociation(), outArray);
}
} // namespace vector_calculus
} // namespace vector_analysis
} // namespace filter
} // namespace vtkm

17
vtkm/filter/vector_calculus/VectorMagnitude.h → vtkm/filter/vector_analysis/VectorMagnitude.h
View File

@ -8,31 +8,28 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#ifndef vtk_m_filter_vector_calculus_VectorMagnitude_h
#define vtk_m_filter_vector_calculus_VectorMagnitude_h
#ifndef vtk_m_filter_vector_analysis_VectorMagnitude_h
#define vtk_m_filter_vector_analysis_VectorMagnitude_h
#include <vtkm/filter/NewFilterField.h>
#include <vtkm/filter/vector_calculus/vtkm_filter_vector_calculus_export.h>
#include <vtkm/filter/vector_analysis/vtkm_filter_vector_analysis_export.h>
namespace vtkm
{
namespace filter
{
namespace vector_calculus
namespace vector_analysis
{
class VTKM_FILTER_VECTOR_CALCULUS_EXPORT VectorMagnitude : public vtkm::filter::NewFilterField
class VTKM_FILTER_VECTOR_ANALYSIS_EXPORT VectorMagnitude : public vtkm::filter::NewFilterField
{
public:
VectorMagnitude();
private:
//currently, the VectorMagnitude filter only works on vector data.
using SupportedTypes = vtkm::TypeListVecCommon;
VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& input) override;
};
} // namespace vector_calculus
} // namespace vector_analysis
} // namespace filter
} // namespace vtkm::filter
#endif // vtk_m_filter_vector_calculus_VectorMagnitude_h
#endif // vtk_m_filter_vector_analysis_VectorMagnitude_h

2
vtkm/filter/vector_calculus/testing/CMakeLists.txt → vtkm/filter/vector_analysis/testing/CMakeLists.txt
View File

@ -18,7 +18,7 @@ set(unit_tests
)
set(libraries
vtkm_filter_vector_calculus
vtkm_filter_vector_analysis
)
if (VTKm_ENABLE_RENDERING)

4
vtkm/filter/vector_calculus/testing/RenderTestSurfaceNormals.cxx → vtkm/filter/vector_analysis/testing/RenderTestSurfaceNormals.cxx
View File

@ -13,7 +13,7 @@
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/io/VTKDataSetReader.h>
#include <vtkm/filter/vector_calculus/SurfaceNormals.h>
#include <vtkm/filter/vector_analysis/SurfaceNormals.h>
#include <vtkm/rendering/testing/RenderTest.h>
#include <vtkm/rendering/testing/Testing.h>
@ -32,7 +32,7 @@ void TestSurfaceNormals()
vtkm::io::VTKDataSetReader reader(pathname);
auto dataSet = reader.ReadDataSet();
vtkm::filter::vector_calculus::SurfaceNormals surfaceNormals;
vtkm::filter::vector_analysis::SurfaceNormals surfaceNormals;
surfaceNormals.SetGeneratePointNormals(true);
surfaceNormals.SetAutoOrientNormals(true);

8
vtkm/filter/vector_calculus/testing/UnitTestCrossProductFilter.cxx → vtkm/filter/vector_analysis/testing/UnitTestCrossProductFilter.cxx
View File

@ -10,7 +10,7 @@
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/vector_calculus/CrossProduct.h>
#include <vtkm/filter/vector_analysis/CrossProduct.h>
#include <vtkm/VectorAnalysis.h>
@ -141,7 +141,7 @@ void TestCrossProduct()
{
std::cout << " Both vectors as normal fields" << std::endl;
vtkm::filter::vector_calculus::CrossProduct filter;
vtkm::filter::vector_analysis::CrossProduct filter;
filter.SetPrimaryField("vec1");
filter.SetSecondaryField("vec2", vtkm::cont::Field::Association::POINTS);
@ -165,7 +165,7 @@ void TestCrossProduct()
{
std::cout << " First field as coordinates" << std::endl;
vtkm::filter::vector_calculus::CrossProduct filter;
vtkm::filter::vector_analysis::CrossProduct filter;
filter.SetUseCoordinateSystemAsPrimaryField(true);
filter.SetPrimaryCoordinateSystem(1);
filter.SetSecondaryField("vec2");
@ -186,7 +186,7 @@ void TestCrossProduct()
{
std::cout << " Second field as coordinates" << std::endl;
vtkm::filter::vector_calculus::CrossProduct filter;
vtkm::filter::vector_analysis::CrossProduct filter;
filter.SetPrimaryField("vec1");
filter.SetUseCoordinateSystemAsSecondaryField(true);
filter.SetSecondaryCoordinateSystem(2);

8
vtkm/filter/vector_calculus/testing/UnitTestDotProductFilter.cxx → vtkm/filter/vector_analysis/testing/UnitTestDotProductFilter.cxx
View File

@ -10,7 +10,7 @@
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/vector_calculus/DotProduct.h>
#include <vtkm/filter/vector_analysis/DotProduct.h>
#include <random>
#include <vector>
@ -128,7 +128,7 @@ void TestDotProduct()
{
std::cout << " Both vectors as normal fields" << std::endl;
vtkm::filter::vector_calculus::DotProduct filter;
vtkm::filter::vector_analysis::DotProduct filter;
filter.SetPrimaryField("vec1");
filter.SetSecondaryField("vec2");
vtkm::cont::DataSet result = filter.Execute(dataSet);
@ -137,7 +137,7 @@ void TestDotProduct()
{
std::cout << " First field as coordinates" << std::endl;
vtkm::filter::vector_calculus::DotProduct filter;
vtkm::filter::vector_analysis::DotProduct filter;
filter.SetUseCoordinateSystemAsPrimaryField(true);
filter.SetPrimaryCoordinateSystem(1);
filter.SetSecondaryField("vec2");
@ -147,7 +147,7 @@ void TestDotProduct()
{
std::cout << " Second field as coordinates" << std::endl;
vtkm::filter::vector_calculus::DotProduct filter;
vtkm::filter::vector_analysis::DotProduct filter;
filter.SetPrimaryField("vec1");
filter.SetUseCoordinateSystemAsSecondaryField(true);
filter.SetSecondaryCoordinateSystem(2);

6
vtkm/filter/vector_calculus/testing/UnitTestGradientExplicit.cxx → vtkm/filter/vector_analysis/testing/UnitTestGradientExplicit.cxx
View File

@ -8,7 +8,7 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/filter/vector_calculus/Gradient.h>
#include <vtkm/filter/vector_analysis/Gradient.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
@ -23,7 +23,7 @@ void TestCellGradientExplicit()
vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet0();
vtkm::filter::vector_calculus::Gradient gradient;
vtkm::filter::vector_analysis::Gradient gradient;
gradient.SetOutputFieldName("gradient");
gradient.SetActiveField("pointvar");
@ -48,7 +48,7 @@ void TestPointGradientExplicit()
vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet0();
vtkm::filter::vector_calculus::Gradient gradient;
vtkm::filter::vector_analysis::Gradient gradient;
gradient.SetComputePointGradient(true);
gradient.SetOutputFieldName("gradient");
gradient.SetActiveField("pointvar");

8
vtkm/filter/vector_calculus/testing/UnitTestGradientUniform.cxx → vtkm/filter/vector_analysis/testing/UnitTestGradientUniform.cxx
View File

@ -8,7 +8,7 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/filter/vector_calculus/Gradient.h>
#include <vtkm/filter/vector_analysis/Gradient.h>
#include <vtkm/cont/ErrorFilterExecution.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
@ -24,7 +24,7 @@ void TestCellGradientUniform3D()
vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
vtkm::filter::vector_calculus::Gradient gradient;
vtkm::filter::vector_analysis::Gradient gradient;
gradient.SetOutputFieldName("Gradient");
gradient.SetComputeVorticity(true); //this won't work as we have a scalar field
@ -66,7 +66,7 @@ void TestCellGradientUniform3DWithVectorField()
dataSet.AddPointField("vec_pointvar", input);
//we need to add Vec3 array to the dataset
vtkm::filter::vector_calculus::Gradient gradient;
vtkm::filter::vector_analysis::Gradient gradient;
gradient.SetOutputFieldName("vec_gradient");
gradient.SetComputeVorticity(true);
gradient.SetComputeQCriterion(true);
@ -125,7 +125,7 @@ void TestPointGradientUniform3DWithVectorField()
dataSet.AddPointField("vec_pointvar", input);
//we need to add Vec3 array to the dataset
vtkm::filter::vector_calculus::Gradient gradient;
vtkm::filter::vector_analysis::Gradient gradient;
gradient.SetComputePointGradient(true);
gradient.SetOutputFieldName("vec_gradient");
gradient.SetActiveField("vec_pointvar");

4
vtkm/filter/vector_calculus/testing/UnitTestSurfaceNormalsFilter.cxx → vtkm/filter/vector_analysis/testing/UnitTestSurfaceNormalsFilter.cxx
View File

@ -7,7 +7,7 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/filter/vector_calculus/SurfaceNormals.h>
#include <vtkm/filter/vector_analysis/SurfaceNormals.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
@ -57,7 +57,7 @@ void TestSurfaceNormals()
{
vtkm::cont::DataSet ds = vtkm::cont::testing::MakeTestDataSet().Make3DExplicitDataSetPolygonal();
vtkm::filter::vector_calculus::SurfaceNormals filter;
vtkm::filter::vector_analysis::SurfaceNormals filter;
vtkm::cont::DataSet result;
std::cout << "testing default output (generate only point normals):\n";

4
vtkm/filter/vector_calculus/testing/UnitTestVectorMagnitudeFilter.cxx → vtkm/filter/vector_analysis/testing/UnitTestVectorMagnitudeFilter.cxx
View File

@ -10,7 +10,7 @@
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/filter/vector_calculus/VectorMagnitude.h>
#include <vtkm/filter/vector_analysis/VectorMagnitude.h>
#include <vector>
@ -38,7 +38,7 @@ void TestVectorMagnitude()
dataSet.AddPointField("double_vec_pointvar", finput);
vtkm::filter::vector_calculus::VectorMagnitude vm;
vtkm::filter::vector_analysis::VectorMagnitude vm;
vm.SetActiveField("double_vec_pointvar");
auto result = vm.Execute(dataSet);

0
vtkm/filter/vector_calculus/worklet/CMakeLists.txt → vtkm/filter/vector_analysis/worklet/CMakeLists.txt
View File

16
vtkm/filter/vector_calculus/worklet/Gradient.h → vtkm/filter/vector_analysis/worklet/Gradient.h
View File

@ -14,14 +14,14 @@
#include <vtkm/worklet/DispatcherMapTopology.h>
#include <vtkm/worklet/DispatcherPointNeighborhood.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/CellGradient.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/Divergence.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/GradientOutput.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/PointGradient.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/QCriterion.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/StructuredPointGradient.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/Transpose.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/Vorticity.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/CellGradient.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/Divergence.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/GradientOutput.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/PointGradient.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/QCriterion.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/StructuredPointGradient.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/Transpose.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/Vorticity.h>
namespace vtkm
{

0
vtkm/filter/vector_calculus/worklet/Magnitude.h → vtkm/filter/vector_analysis/worklet/Magnitude.h
View File

0
vtkm/filter/vector_calculus/worklet/OrientCellNormals.h → vtkm/filter/vector_analysis/worklet/OrientCellNormals.h
View File

6
vtkm/filter/vector_calculus/worklet/OrientNormals.h → vtkm/filter/vector_analysis/worklet/OrientNormals.h
View File

@ -26,9 +26,9 @@
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleTransform.h>
#include <vtkm/filter/vector_calculus/worklet/OrientCellNormals.h>
#include <vtkm/filter/vector_calculus/worklet/OrientPointAndCellNormals.h>
#include <vtkm/filter/vector_calculus/worklet/OrientPointNormals.h>
#include <vtkm/filter/vector_analysis/worklet/OrientCellNormals.h>
#include <vtkm/filter/vector_analysis/worklet/OrientPointAndCellNormals.h>
#include <vtkm/filter/vector_analysis/worklet/OrientPointNormals.h>
namespace vtkm
{

0
vtkm/filter/vector_calculus/worklet/OrientPointAndCellNormals.h → vtkm/filter/vector_analysis/worklet/OrientPointAndCellNormals.h
View File

0
vtkm/filter/vector_calculus/worklet/OrientPointNormals.h → vtkm/filter/vector_analysis/worklet/OrientPointNormals.h
View File

0
vtkm/filter/vector_calculus/worklet/SurfaceNormals.h → vtkm/filter/vector_analysis/worklet/SurfaceNormals.h
View File

0
vtkm/filter/vector_calculus/worklet/gradient/CMakeLists.txt → vtkm/filter/vector_analysis/worklet/gradient/CMakeLists.txt
View File

2
vtkm/filter/vector_calculus/worklet/gradient/CellGradient.h → vtkm/filter/vector_analysis/worklet/gradient/CellGradient.h
View File

@ -15,7 +15,7 @@
#include <vtkm/exec/ParametricCoordinates.h>
#include <vtkm/worklet/WorkletMapTopology.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/GradientOutput.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/GradientOutput.h>
namespace vtkm
{

0
vtkm/filter/vector_calculus/worklet/gradient/Divergence.h → vtkm/filter/vector_analysis/worklet/gradient/Divergence.h
View File

6
vtkm/filter/vector_calculus/worklet/gradient/GradientOutput.h → vtkm/filter/vector_analysis/worklet/gradient/GradientOutput.h
View File

@ -19,9 +19,9 @@
#include <vtkm/cont/ExecutionObjectBase.h>
#include <vtkm/exec/arg/FetchTagArrayDirectOut.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/Divergence.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/QCriterion.h>
#include <vtkm/filter/vector_calculus/worklet/gradient/Vorticity.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/Divergence.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/QCriterion.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/Vorticity.h>
namespace vtkm
{

2
vtkm/filter/vector_calculus/worklet/gradient/PointGradient.h → vtkm/filter/vector_analysis/worklet/gradient/PointGradient.h
View File

@ -16,7 +16,7 @@
#include <vtkm/worklet/WorkletMapTopology.h>
#include <utility>
#include <vtkm/filter/vector_calculus/worklet/gradient/GradientOutput.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/GradientOutput.h>
namespace vtkm

0
vtkm/filter/vector_calculus/worklet/gradient/QCriterion.h → vtkm/filter/vector_analysis/worklet/gradient/QCriterion.h
View File

2
vtkm/filter/vector_calculus/worklet/gradient/StructuredPointGradient.h → vtkm/filter/vector_analysis/worklet/gradient/StructuredPointGradient.h
View File

@ -11,7 +11,7 @@
#ifndef vtk_m_worklet_gradient_StructuredPointGradient_h
#define vtk_m_worklet_gradient_StructuredPointGradient_h
#include <vtkm/filter/vector_calculus/worklet/gradient/GradientOutput.h>
#include <vtkm/filter/vector_analysis/worklet/gradient/GradientOutput.h>
#include <vtkm/worklet/WorkletPointNeighborhood.h>

0
vtkm/filter/vector_calculus/worklet/gradient/Transpose.h → vtkm/filter/vector_analysis/worklet/gradient/Transpose.h
View File

0
vtkm/filter/vector_calculus/worklet/gradient/Vorticity.h → vtkm/filter/vector_analysis/worklet/gradient/Vorticity.h
View File

2
vtkm/interop/testing/TestingOpenGLInterop.h
View File

@ -12,7 +12,7 @@
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleConstant.h>
#include <vtkm/filter/vector_calculus/worklet/Magnitude.h>
#include <vtkm/filter/vector_analysis/worklet/Magnitude.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/interop/TransferToOpenGL.h>

2
vtkm/worklet/testing/UnitTestSplitSharpEdges.cxx
View File

@ -7,7 +7,7 @@
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/filter/vector_calculus/worklet/SurfaceNormals.h>
#include <vtkm/filter/vector_analysis/worklet/SurfaceNormals.h>
#include <vtkm/worklet/SplitSharpEdges.h>
#include <vtkm/cont/DataSetBuilderExplicit.h>