Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Rename kernels directory to splatkernels to avoid confusion

Browse Source
This commit is contained in:
John Biddiscombe 2015-09-15 16:35:35 +02:00
parent 7a2225cfd1
commit 5e72d3a87a
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/worklet/KernelSplatter.h
View File

@ -38,9 +38,9 @@
#include <vtkm/worklet/DispatcherMapField.h> #include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/WorkletMapField.h> #include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/kernels/KernelBase.h> #include <vtkm/worklet/splatkernels/KernelBase.h>
#include <vtkm/worklet/kernels/Gaussian.h> #include <vtkm/worklet/splatkernels/Gaussian.h>
#include <vtkm/worklet/kernels/Spline3rdOrder.h> #include <vtkm/worklet/splatkernels/Spline3rdOrder.h>
#define __VTKM_GAUSSIAN_SPLATTER_BENCHMARK #define __VTKM_GAUSSIAN_SPLATTER_BENCHMARK

2
vtkm/worklet/kernels/Gaussian.h → vtkm/worklet/splatkernels/Gaussian.h
View File

@ -29,7 +29,7 @@
// //
namespace vtkm { namespace worklet { namespace vtkm { namespace worklet {
namespace kernels { namespace splatkernels {
template <int Dimensions> template <int Dimensions>
struct Gaussian : public KernelBase< Gaussian<Dimensions> > struct Gaussian : public KernelBase< Gaussian<Dimensions> >

2
vtkm/worklet/kernels/KernelBase.h → vtkm/worklet/splatkernels/KernelBase.h
View File

@ -24,7 +24,7 @@
#include <vtkm/Types.h> #include <vtkm/Types.h>
namespace vtkm { namespace worklet { namespace vtkm { namespace worklet {
namespace kernels { namespace splatkernels {
// Vector class used in the kernels // Vector class used in the kernels
typedef vtkm::Vec<vtkm::Float64, 3> vector_type; typedef vtkm::Vec<vtkm::Float64, 3> vector_type;

2
vtkm/worklet/kernels/Spline3rdOrder.h → vtkm/worklet/splatkernels/Spline3rdOrder.h
View File

@ -27,7 +27,7 @@
// //
namespace vtkm { namespace worklet { namespace vtkm { namespace worklet {
namespace kernels { namespace splatkernels {
template <int Dimensions> template <int Dimensions>
struct Spline3rdOrder : public KernelBase< Spline3rdOrder<Dimensions> > struct Spline3rdOrder : public KernelBase< Spline3rdOrder<Dimensions> >

14
vtkm/worklet/testing/UnitTestSplatKernels.cxx
View File

@ -21,8 +21,8 @@
#include <vector> #include <vector>
#include <vtkm/cont/testing/Testing.h> #include <vtkm/cont/testing/Testing.h>
#include <vtkm/worklet/kernels/Gaussian.h> #include <vtkm/worklet/splatkernels/Gaussian.h>
#include <vtkm/worklet/kernels/Spline3rdOrder.h> #include <vtkm/worklet/splatkernels/Spline3rdOrder.h>
/* /*
#include "KernelBox.h" #include "KernelBox.h"
#include "KernelCusp.h" #include "KernelCusp.h"
@ -85,28 +85,28 @@ int TestSplatKernels() {
std::cout << "Testing Gaussian 3D fixed h kernel integration \n"; std::cout << "Testing Gaussian 3D fixed h kernel integration \n";
for (int i=0; i<100; ++i) { for (int i=0; i<100; ++i) {
smoothinglength = 0.01 + i*(10.0/100.0); smoothinglength = 0.01 + i*(10.0/100.0);
s = IntegralOfKernel(vtkm::worklet::kernels::Gaussian<3>(smoothinglength)); s = IntegralOfKernel(vtkm::worklet::splatkernels::Gaussian<3>(smoothinglength));
VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 3D integration failure"); VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 3D integration failure");
} }
std::cout << "Testing Gaussian 3D variable h kernel integration \n"; std::cout << "Testing Gaussian 3D variable h kernel integration \n";
for (int i=0; i<100; ++i) { for (int i=0; i<100; ++i) {
smoothinglength = 0.01 + i*(10.0/100.0); smoothinglength = 0.01 + i*(10.0/100.0);
s = IntegralOfKernel(vtkm::worklet::kernels::Gaussian<3>(smoothinglength),smoothinglength); s = IntegralOfKernel(vtkm::worklet::splatkernels::Gaussian<3>(smoothinglength),smoothinglength);
VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 3D integration failure"); VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 3D integration failure");
} }
// s = IntegralOfKernel(vtkm::worklet::kernels::Gaussian<2>(smoothinglength)); // s = IntegralOfKernel(vtkm::worklet::splatkernels::Gaussian<2>(smoothinglength));
// VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 2D integration failure"); // VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 2D integration failure");
std::cout << "Testing Spline3rdOrder 3D kernel integration \n"; std::cout << "Testing Spline3rdOrder 3D kernel integration \n";
for (int i=0; i<100; ++i) { for (int i=0; i<100; ++i) {
smoothinglength = 0.01 + i*(10.0/100.0); smoothinglength = 0.01 + i*(10.0/100.0);
s = IntegralOfKernel(vtkm::worklet::kernels::Spline3rdOrder<3>(smoothinglength)); s = IntegralOfKernel(vtkm::worklet::splatkernels::Spline3rdOrder<3>(smoothinglength));
VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Spline3rdOrder 3D integration failure"); VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Spline3rdOrder 3D integration failure");
} }
// s = IntegralOfKernel(vtkm::worklet::kernels::Spline3rdOrder<2>(smoothinglength)); // s = IntegralOfKernel(vtkm::worklet::splatkernels::Spline3rdOrder<2>(smoothinglength));
// VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Spline3rdOrder 2D integration failure"); // VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Spline3rdOrder 2D integration failure");
/* /*