Commit 2714cbe5 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'misc-typos'

940c8918

 Misc. typos
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !1202
parents 827d361f 940c8918
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
# #
# #
# guard agaisnt building vectorization_flags more than once # guard against building vectorization_flags more than once
if(TARGET vtkm_vectorization_flags) if(TARGET vtkm_vectorization_flags)
return() return()
endif() endif()
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
if(VTKm_ENABLE_TBB AND NOT TARGET vtkm::tbb) if(VTKm_ENABLE_TBB AND NOT TARGET vtkm::tbb)
find_package(TBB REQUIRED) find_package(TBB REQUIRED)
# Workaround a bug in older versions of cmake prevents linking with UNKOWN IMPORTED libraries # Workaround a bug in older versions of cmake prevents linking with UNKNOWN IMPORTED libraries
# refer to CMake issue #17245 # refer to CMake issue #17245
if (CMAKE_VERSION VERSION_LESS 3.10) if (CMAKE_VERSION VERSION_LESS 3.10)
add_library(vtkm::tbb SHARED IMPORTED GLOBAL) add_library(vtkm::tbb SHARED IMPORTED GLOBAL)
...@@ -71,7 +71,7 @@ if(VTKm_ENABLE_CUDA AND NOT TARGET vtkm::cuda) ...@@ -71,7 +71,7 @@ if(VTKm_ENABLE_CUDA AND NOT TARGET vtkm::cuda)
list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES "${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}") list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES "${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
endif() endif()
# Workaround a bug in older versions of cmake prevents linking with UNKOWN IMPORTED libraries # Workaround a bug in older versions of cmake prevents linking with UNKNOWN IMPORTED libraries
# refer to CMake issue #17245 # refer to CMake issue #17245
if (CMAKE_VERSION VERSION_LESS 3.10) if (CMAKE_VERSION VERSION_LESS 3.10)
add_library(vtkm::cuda STATIC IMPORTED GLOBAL) add_library(vtkm::cuda STATIC IMPORTED GLOBAL)
...@@ -153,7 +153,7 @@ if(VTKm_ENABLE_CUDA AND NOT TARGET vtkm::cuda) ...@@ -153,7 +153,7 @@ if(VTKm_ENABLE_CUDA AND NOT TARGET vtkm::cuda)
set(VTKm_CUDA_Architecture "native" CACHE STRING "Which GPU Architecture(s) to compile for") set(VTKm_CUDA_Architecture "native" CACHE STRING "Which GPU Architecture(s) to compile for")
set_property(CACHE VTKm_CUDA_Architecture PROPERTY STRINGS native fermi kepler maxwell pascal volta all none) set_property(CACHE VTKm_CUDA_Architecture PROPERTY STRINGS native fermi kepler maxwell pascal volta all none)
#detect what the propery is set too #detect what the property is set too
if(VTKm_CUDA_Architecture STREQUAL "native") if(VTKm_CUDA_Architecture STREQUAL "native")
if(VTKM_CUDA_NATIVE_EXE_PROCESS_RAN_OUTPUT) if(VTKM_CUDA_NATIVE_EXE_PROCESS_RAN_OUTPUT)
......
...@@ -61,7 +61,7 @@ endfunction(vtkm_pyexpander_generated_file) ...@@ -61,7 +61,7 @@ endfunction(vtkm_pyexpander_generated_file)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
function(vtkm_compile_as_cuda output) function(vtkm_compile_as_cuda output)
# We cant use set_source_files_properties(<> PROPERTIES LANGUAGE "CUDA") # We can't use set_source_files_properties(<> PROPERTIES LANGUAGE "CUDA")
# for the following reasons: # for the following reasons:
# #
# 1. As of CMake 3.10 MSBuild cuda language support has a bug where files # 1. As of CMake 3.10 MSBuild cuda language support has a bug where files
......
...@@ -121,7 +121,7 @@ set(VTKm_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) ...@@ -121,7 +121,7 @@ set(VTKm_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
# This flag can be used to prevent VTK-m from exporting its warning flags in its # This flag can be used to prevent VTK-m from exporting its warning flags in its
# build interface. This is useful when building VTK-m as a thirdparty library # build interface. This is useful when building VTK-m as a thirdparty library
# and the warnings are too strict for the parent project. # and the warnings are too strict for the parent project.
vtkm_option(VTKm_ENABLE_DEVELOPER_FLAGS "Enable compiler flags that are usefull while developing VTK-m" ON) vtkm_option(VTKm_ENABLE_DEVELOPER_FLAGS "Enable compiler flags that are useful while developing VTK-m" ON)
mark_as_advanced( mark_as_advanced(
VTKm_NO_ASSERT VTKm_NO_ASSERT
......
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
Now PI related functions are evalulated at compile time as constexpr functions. Now PI related functions are evalulated at compile time as constexpr functions.
It also removes the old static_cast<T>vtkm::Pi() usages with It also removes the old static_cast<T>vtkm::Pi() usages with
template ones and fix serveral conversion warnings. template ones and fix several conversion warnings.
...@@ -45,7 +45,7 @@ by definition and thus always return values above or equal to 0.0. ...@@ -45,7 +45,7 @@ by definition and thus always return values above or equal to 0.0.
Negative values indicate either the order in which vertices appear in its connectivity Negative values indicate either the order in which vertices appear in its connectivity
array is improper or the relative locations of the vertices in world coordinates array is improper or the relative locations of the vertices in world coordinates
result in a cell with a negative Jacobian somewhere in its interior. result in a cell with a negative Jacobian somewhere in its interior.
Finaly, note that cell measures may return invalid (NaN) or infinite (Inf, -Inf) Finally, note that cell measures may return invalid (NaN) or infinite (Inf, -Inf)
values if the cell is poorly defined, e.g., has coincident vertices values if the cell is poorly defined, e.g., has coincident vertices
or a parametric dimension larger than the space spanned by its world-coordinate or a parametric dimension larger than the space spanned by its world-coordinate
vertices. vertices.
......
# VTK-m Vec< Vec<T> > can't be constructed from Vec<U> # VTK-m Vec< Vec<T> > can't be constructed from Vec<U>
When you have a Vec<Vec<float,3>> it was possible to incorrectly initalize When you have a Vec<Vec<float,3>> it was possible to incorrectly initialize
it with the contents of a Vec<double,3>. An example of this is: it with the contents of a Vec<double,3>. An example of this is:
```cpp ```cpp
using Vec3d = vtkm::Vec<double, 3>; using Vec3d = vtkm::Vec<double, 3>;
......
...@@ -115,7 +115,7 @@ VTKM_CONT MultiDeviceGradient::MultiDeviceGradient() ...@@ -115,7 +115,7 @@ VTKM_CONT MultiDeviceGradient::MultiDeviceGradient()
const bool runOnCuda = tracker.CanRunOn(vtkm::cont::DeviceAdapterTagCuda{}); const bool runOnCuda = tracker.CanRunOn(vtkm::cont::DeviceAdapterTagCuda{});
//Note currently the virtual implementation has some issues //Note currently the virtual implementation has some issues
//In a multi-threaded enviornment only cuda can be used or //In a multi-threaded environment only cuda can be used or
//all SMP backends ( Serial, TBB, OpenMP ). //all SMP backends ( Serial, TBB, OpenMP ).
//Once this issue is resolved we can enable CUDA + TBB in //Once this issue is resolved we can enable CUDA + TBB in
//this example //this example
......
...@@ -625,7 +625,7 @@ private: ...@@ -625,7 +625,7 @@ private:
#ifdef VTKM_CUDA #ifdef VTKM_CUDA
// Cuda seems to have a bug where it expects the template class VirtualObjectTransfer // Cuda seems to have a bug where it expects the template class VirtualObjectTransfer
// to be instantiated in a consitent order among all the translation units of an // to be instantiated in a consistent order among all the translation units of an
// executable. Failing to do so results in random crashes and incorrect results. // executable. Failing to do so results in random crashes and incorrect results.
// We workaroud this issue by explicitly instantiating VirtualObjectTransfer for // We workaroud this issue by explicitly instantiating VirtualObjectTransfer for
// all the implicit functions here. // all the implicit functions here.
......
...@@ -271,7 +271,7 @@ struct UpperBoundsFunctor ...@@ -271,7 +271,7 @@ struct UpperBoundsFunctor
return true; return true;
} }
}; };
} // annonymous namespace } // anonymous namespace
struct Algorithm struct Algorithm
{ {
......
...@@ -518,7 +518,7 @@ void CastAndCall(const typename vtkm::cont::ArrayHandleVirtualCoordinates::Super ...@@ -518,7 +518,7 @@ void CastAndCall(const typename vtkm::cont::ArrayHandleVirtualCoordinates::Super
#ifdef VTKM_CUDA #ifdef VTKM_CUDA
// Cuda seems to have a bug where it expects the template class VirtualObjectTransfer // Cuda seems to have a bug where it expects the template class VirtualObjectTransfer
// to be instantiated in a consitent order among all the translation units of an // to be instantiated in a consistent order among all the translation units of an
// executable. Failing to do so results in random crashes and incorrect results. // executable. Failing to do so results in random crashes and incorrect results.
// We workaroud this issue by explicitly instantiating VirtualObjectTransfer for // We workaroud this issue by explicitly instantiating VirtualObjectTransfer for
// all the portal types here. // all the portal types here.
......
...@@ -197,7 +197,7 @@ void ColorTable::SetColorSpace(ColorSpace space) ...@@ -197,7 +197,7 @@ void ColorTable::SetColorSpace(ColorSpace space)
break; break;
} }
default: default:
throw vtkm::cont::ErrorBadType("unkown vtkm::cont::ColorType requested"); throw vtkm::cont::ErrorBadType("unknown vtkm::cont::ColorType requested");
} }
} }
} }
......
...@@ -605,7 +605,7 @@ public: ...@@ -605,7 +605,7 @@ public:
/// Will use the current range of the color table to generate evenly spaced /// Will use the current range of the color table to generate evenly spaced
/// values using either vtkm::Float32 or vtkm::Float64 space. /// values using either vtkm::Float32 or vtkm::Float64 space.
/// Will use vtkm::Float32 space when the difference between the float and double /// Will use vtkm::Float32 space when the difference between the float and double
/// values when the range is withing float space and the following are within a tolerance: /// values when the range is within float space and the following are within a tolerance:
/// ///
/// - (max-min) / numSamples /// - (max-min) / numSamples
/// - ((max-min) / numSamples) * numSamples /// - ((max-min) / numSamples) * numSamples
...@@ -620,7 +620,7 @@ public: ...@@ -620,7 +620,7 @@ public:
/// Will use the current range of the color table to generate evenly spaced /// Will use the current range of the color table to generate evenly spaced
/// values using either vtkm::Float32 or vtkm::Float64 space. /// values using either vtkm::Float32 or vtkm::Float64 space.
/// Will use vtkm::Float32 space when the difference between the float and double /// Will use vtkm::Float32 space when the difference between the float and double
/// values when the range is withing float space and the following are within a tolerance: /// values when the range is within float space and the following are within a tolerance:
/// ///
/// - (max-min) / numSamples /// - (max-min) / numSamples
/// - ((max-min) / numSamples) * numSamples /// - ((max-min) / numSamples) * numSamples
...@@ -635,7 +635,7 @@ public: ...@@ -635,7 +635,7 @@ public:
/// Will use the current range of the color table to generate evenly spaced /// Will use the current range of the color table to generate evenly spaced
/// values using either vtkm::Float32 or vtkm::Float64 space. /// values using either vtkm::Float32 or vtkm::Float64 space.
/// Will use vtkm::Float32 space when the difference between the float and double /// Will use vtkm::Float32 space when the difference between the float and double
/// values when the range is withing float space and the following are within a tolerance: /// values when the range is within float space and the following are within a tolerance:
/// ///
/// - (max-min) / numSamples /// - (max-min) / numSamples
/// - ((max-min) / numSamples) * numSamples /// - ((max-min) / numSamples) * numSamples
...@@ -650,7 +650,7 @@ public: ...@@ -650,7 +650,7 @@ public:
/// Will use the current range of the color table to generate evenly spaced /// Will use the current range of the color table to generate evenly spaced
/// values using either vtkm::Float32 or vtkm::Float64 space. /// values using either vtkm::Float32 or vtkm::Float64 space.
/// Will use vtkm::Float32 space when the difference between the float and double /// Will use vtkm::Float32 space when the difference between the float and double
/// values when the range is withing float space and the following are within a tolerance: /// values when the range is within float space and the following are within a tolerance:
/// ///
/// - (max-min) / numSamples /// - (max-min) / numSamples
/// - ((max-min) / numSamples) * numSamples /// - ((max-min) / numSamples) * numSamples
......
...@@ -220,7 +220,7 @@ private: ...@@ -220,7 +220,7 @@ private:
vtkm::cont::CoordinateSystem cs(coordNm, coords); vtkm::cont::CoordinateSystem cs(coordNm, coords);
dataSet.AddCoordinateSystem(cs); dataSet.AddCoordinateSystem(cs);
// compute the dimensions of the cellset by counting the number of axises // compute the dimensions of the cellset by counting the number of axes
// with >1 dimension // with >1 dimension
int ndims = 0; int ndims = 0;
vtkm::Id dims[3]; vtkm::Id dims[3];
......
...@@ -32,7 +32,7 @@ namespace internal ...@@ -32,7 +32,7 @@ namespace internal
/// \brief Class that manages data in the execution environment. /// \brief Class that manages data in the execution environment.
/// ///
/// This templated class must be partially specialized for each /// This templated class must be partially specialized for each
/// DeviceAdapterTag crated, which will define the implementation for that tag. /// DeviceAdapterTag created, which will define the implementation for that tag.
/// ///
/// This is a class that is responsible for allocating data in the execution /// This is a class that is responsible for allocating data in the execution
/// environment and copying data back and forth between control and /// environment and copying data back and forth between control and
......
...@@ -82,7 +82,7 @@ void TestArrayHandleImplicit() ...@@ -82,7 +82,7 @@ void TestArrayHandleImplicit()
vtkm::testing::Testing::TryTypes(ImplicitTests(), vtkm::TypeListTagCommon()); vtkm::testing::Testing::TryTypes(ImplicitTests(), vtkm::TypeListTagCommon());
} }
} // annonymous namespace } // anonymous namespace
int UnitTestArrayHandleImplicit(int, char* []) int UnitTestArrayHandleImplicit(int, char* [])
{ {
......
...@@ -258,7 +258,7 @@ void TestArrayHandlePermutation() ...@@ -258,7 +258,7 @@ void TestArrayHandlePermutation()
vtkm::testing::Testing::TryTypes(TryInputType(), vtkm::TypeListTagCommon()); vtkm::testing::Testing::TryTypes(TryInputType(), vtkm::TypeListTagCommon());
} }
} // annonymous namespace } // anonymous namespace
int UnitTestArrayHandlePermutation(int, char* []) int UnitTestArrayHandlePermutation(int, char* [])
{ {
......
...@@ -186,7 +186,7 @@ void TestArrayHandleTransform() ...@@ -186,7 +186,7 @@ void TestArrayHandleTransform()
vtkm::testing::Testing::TryTypes(TryInputType()); vtkm::testing::Testing::TryTypes(TryInputType());
} }
} // annonymous namespace } // anonymous namespace
int UnitTestArrayHandleTransform(int, char* []) int UnitTestArrayHandleTransform(int, char* [])
{ {
......
...@@ -653,7 +653,7 @@ vtkm::Vec<float, 3> ColorTableDiverging::MapThroughColorSpace(const vtkm::Vec<fl ...@@ -653,7 +653,7 @@ vtkm::Vec<float, 3> ColorTableDiverging::MapThroughColorSpace(const vtkm::Vec<fl
} }
// Cuda seems to have a bug where it expects the template class VirtualObjectTransfer // Cuda seems to have a bug where it expects the template class VirtualObjectTransfer
// to be instantiated in a consitent order among all the translation units of an // to be instantiated in a consistent order among all the translation units of an
// executable. Failing to do so results in random crashes and incorrect results. // executable. Failing to do so results in random crashes and incorrect results.
// We workaroud this issue by explicitly instantiating VirtualObjectTransfer for // We workaroud this issue by explicitly instantiating VirtualObjectTransfer for
// all the portal types here. // all the portal types here.
......
...@@ -38,7 +38,7 @@ namespace ...@@ -38,7 +38,7 @@ namespace
std::mt19937 g_RandomGenerator; std::mt19937 g_RandomGenerator;
// Establish simple mapping between world and parametric coordinates. // Establish simple mapping between world and parametric coordinates.
// Actuall world/parametric coordinates are in a different test. // Actual world/parametric coordinates are in a different test.
template <typename T> template <typename T>
vtkm::Vec<T, 3> ParametricToWorld(const vtkm::Vec<T, 3>& pcoord) vtkm::Vec<T, 3> ParametricToWorld(const vtkm::Vec<T, 3>& pcoord)
{ {
......
...@@ -85,7 +85,7 @@ inline VTKM_CONT vtkm::cont::DataSet CleanGrid::DoExecute(const vtkm::cont::Data ...@@ -85,7 +85,7 @@ inline VTKM_CONT vtkm::cont::DataSet CleanGrid::DoExecute(const vtkm::cont::Data
// TODO: This is very awkward. First of all, there is no support for dealing // TODO: This is very awkward. First of all, there is no support for dealing
// with coordinate systems at all. That is fine if you are computing a new // with coordinate systems at all. That is fine if you are computing a new
// coordinate system, but a pain if you are deriving the coordinate system // coordinate system, but a pain if you are deriving the coordinate system
// array. Second, why is it that coordinate systems are automtically mapped // array. Second, why is it that coordinate systems are automatically mapped
// but other fields are not? Why shouldn't the Execute of a filter also set // but other fields are not? Why shouldn't the Execute of a filter also set
// up all the fields of the output data set? // up all the fields of the output data set?
for (vtkm::IdComponent coordSystemIndex = 0; for (vtkm::IdComponent coordSystemIndex = 0;
......
...@@ -102,7 +102,7 @@ namespace filter ...@@ -102,7 +102,7 @@ namespace filter
/// ///
/// As the name suggests, these are called and the beginning and before the end /// As the name suggests, these are called and the beginning and before the end
/// of an `Filter::Execute` call. Most filters that don't need to handle /// of an `Filter::Execute` call. Most filters that don't need to handle
/// mutliblock datasets specially, e.g. clip, cut, iso-contour, need not worry /// multiblock datasets specially, e.g. clip, cut, iso-contour, need not worry
/// about these methods or provide any implementation. If, however, your filter /// about these methods or provide any implementation. If, however, your filter
/// needs do to some initialization e.g. allocation buffers to accumulate /// needs do to some initialization e.g. allocation buffers to accumulate
/// results, or finalization e.g. reduce results across all blocks, then these /// results, or finalization e.g. reduce results across all blocks, then these
......
...@@ -57,11 +57,11 @@ public: ...@@ -57,11 +57,11 @@ public:
void SetGeneratePointNormals(bool value) { this->GeneratePointNormals = value; } void SetGeneratePointNormals(bool value) { this->GeneratePointNormals = value; }
bool GetGeneratePointNormals() const { return this->GeneratePointNormals; } bool GetGeneratePointNormals() const { return this->GeneratePointNormals; }
/// Set/Get the name of the cell normals field. Defaul is "Normals". /// Set/Get the name of the cell normals field. Default is "Normals".
void SetCellNormalsName(const std::string& name) { this->CellNormalsName = name; } void SetCellNormalsName(const std::string& name) { this->CellNormalsName = name; }
const std::string& GetCellNormalsName() const { return this->CellNormalsName; } const std::string& GetCellNormalsName() const { return this->CellNormalsName; }
/// Set/Get the name of the point normals field. Defaul is "Normals". /// Set/Get the name of the point normals field. Default is "Normals".
void SetPointNormalsName(const std::string& name) { this->PointNormalsName = name; } void SetPointNormalsName(const std::string& name) { this->PointNormalsName = name; }
const std::string& GetPointNormalsName() const { return this->PointNormalsName; } const std::string& GetPointNormalsName() const { return this->PointNormalsName; }
......
...@@ -81,7 +81,7 @@ void TestCellAverageRegular3D() ...@@ -81,7 +81,7 @@ void TestCellAverageRegular3D()
void TestCellAverageRegular2D() void TestCellAverageRegular2D()
{ {
std::cout << "Testing CellAverage Filter on 2D strucutred data" << std::endl; std::cout << "Testing CellAverage Filter on 2D structured data" << std::endl;
vtkm::cont::testing::MakeTestDataSet testDataSet; vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make2DUniformDataSet0(); vtkm::cont::DataSet dataSet = testDataSet.Make2DUniformDataSet0();
......
...@@ -28,7 +28,7 @@ namespace ...@@ -28,7 +28,7 @@ namespace
void TestCellGradientUniform3D() void TestCellGradientUniform3D()
{ {
std::cout << "Testing Gradient Filter with cell output on 3D strucutred data" << std::endl; std::cout << "Testing Gradient Filter with cell output on 3D structured data" << std::endl;
vtkm::cont::testing::MakeTestDataSet testDataSet; vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0(); vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
...@@ -69,7 +69,7 @@ void TestCellGradientUniform3D() ...@@ -69,7 +69,7 @@ void TestCellGradientUniform3D()
void TestCellGradientUniform3DWithVectorField() void TestCellGradientUniform3DWithVectorField()
{ {
std::cout << "Testing Gradient Filter with vector cell output on 3D strucutred data" << std::endl; std::cout << "Testing Gradient Filter with vector cell output on 3D structured data" << std::endl;
vtkm::cont::testing::MakeTestDataSet testDataSet; vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0(); vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
...@@ -156,7 +156,7 @@ void TestCellGradientExplicit() ...@@ -156,7 +156,7 @@ void TestCellGradientExplicit()
void TestPointGradientUniform3DWithVectorField() void TestPointGradientUniform3DWithVectorField()
{ {
std::cout << "Testing Gradient Filter with vector point output on 3D strucutred data" std::cout << "Testing Gradient Filter with vector point output on 3D structured data"
<< std::endl; << std::endl;
vtkm::cont::testing::MakeTestDataSet testDataSet; vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0(); vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
......
...@@ -55,7 +55,7 @@ void TestPointAverageUniform3D() ...@@ -55,7 +55,7 @@ void TestPointAverageUniform3D()
void TestPointAverageRegular3D() void TestPointAverageRegular3D()
{ {
std::cout << "Testing PointAverage Filter on 2D strucutred data" << std::endl; std::cout << "Testing PointAverage Filter on 2D structured data" << std::endl;
vtkm::cont::testing::MakeTestDataSet testDataSet; vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DRectilinearDataSet0(); vtkm::cont::DataSet dataSet = testDataSet.Make3DRectilinearDataSet0();
......
...@@ -72,7 +72,7 @@ public: ...@@ -72,7 +72,7 @@ public:
// here using byte(254), /255 gives us .99608, which // here using byte(254), /255 gives us .99608, which
// *256 gives us 254.996, which is then rounded // *256 gives us 254.996, which is then rounded
// back down to 254 below. So it actually reverses // back down to 254 below. So it actually reverses
// correctly, even though the mutliplier and // correctly, even though the multiplier and
// divider don't match between these two methods. // divider don't match between these two methods.
// //
// Of course, converting in GetComponentAsByte from // Of course, converting in GetComponentAsByte from
......
...@@ -105,7 +105,7 @@ public: ...@@ -105,7 +105,7 @@ public:
// where only the x coord matters. It creates a y based on // where only the x coord matters. It creates a y based on
// the scalar values and connects all the points with lines. // the scalar values and connects all the points with lines.
// So, we need to convert it back to something that can // So, we need to convert it back to something that can
// actuall be rendered. // actually be rendered.
// //
outCoord[0] = inCoord[0]; outCoord[0] = inCoord[0];
outCoord[1] = static_cast<vtkm::Float32>(scalar); outCoord[1] = static_cast<vtkm::Float32>(scalar);
......
...@@ -453,7 +453,7 @@ private: ...@@ -453,7 +453,7 @@ private:
IdPortalType ParentPortal; IdPortalType ParentPortal;
vtkm::Id LeafCount; vtkm::Id LeafCount;
vtkm::Id InnerCount; vtkm::Id InnerCount;
//TODO: get instrinsic support //TODO: get intrinsic support
VTKM_EXEC VTKM_EXEC
inline vtkm::Int32 CountLeadingZeros(vtkm::UInt32& x) const inline vtkm::Int32 CountLeadingZeros(vtkm::UInt32& x) const
{ {
...@@ -555,7 +555,7 @@ public: ...@@ -555,7 +555,7 @@ public:
vtkm::Int32 deltaNode = delta(idx, j); vtkm::Int32 deltaNode = delta(idx, j);
vtkm::Int32 s = 0; vtkm::Int32 s = 0;
vtkm::Float32 divFactor = 2.f; vtkm::Float32 divFactor = 2.f;
//find the split postition using a binary search //find the split position using a binary search
for (vtkm::Int32 t = (vtkm::Int32)ceil(vtkm::Float32(l) / divFactor);; for (vtkm::Int32 t = (vtkm::Int32)ceil(vtkm::Float32(l) / divFactor);;
divFactor *= 2, t = (vtkm::Int32)ceil(vtkm::Float32(l) / divFactor)) divFactor *= 2, t = (vtkm::Int32)ceil(vtkm::Float32(l) / divFactor))
{ {
......
...@@ -238,7 +238,7 @@ public: ...@@ -238,7 +238,7 @@ public:
} }
//this means that this cell is responsible for both itself and the other cell //this means that this cell is responsible for both itself and the other cell
//set the connecttion for the other cell //set the connection for the other cell
if (isInternal) if (isInternal)
{ {
BOUNDS_CHECK(faceIdPairs, index); BOUNDS_CHECK(faceIdPairs, index);
...@@ -425,8 +425,8 @@ public: ...@@ -425,8 +425,8 @@ public:
dir2 = SegmentDirections[segment][1]; dir2 = SegmentDirections[segment][1];
// For each face, we will have a relative offset to // For each face, we will have a relative offset to
// the "bottom corner of the face. Three are at the // the "bottom corner" of the face. Three are at the
// origin. and we have to ajust for the other faces. // origin and we have to adjust for the other faces.
vtkm::Id3 cellIndex(0, 0, 0); vtkm::Id3 cellIndex(0, 0, 0);
if (cellFace == 1) if (cellFace == 1)
cellIndex[0] = CellDims[0] - 1; cellIndex[0] = CellDims[0] - 1;
......
...@@ -92,7 +92,7 @@ public: ...@@ -92,7 +92,7 @@ public:
Steps.Set(idx, ++nSteps); Steps.Set(idx, ++nSteps);
// Check if the particle has completed the maximum steps required. // Check if the particle has completed the maximum steps required.
// If yes, set it to teminated. // If yes, set it to terminated.
if (nSteps == MaxSteps) if (nSteps == MaxSteps)
SetTerminated(idx); SetTerminated(idx);
} }
...@@ -300,7 +300,7 @@ public: ...@@ -300,7 +300,7 @@ public:
Steps.Set(idx, ++nSteps); Steps.Set(idx, ++nSteps);
// Check if the particle has completed the maximum steps required. // Check if the particle has completed the maximum steps required.
// If yes, set it to teminated. // If yes, set it to terminated.
if (nSteps == MaxSteps) if (nSteps == MaxSteps)
SetTerminated(idx); SetTerminated(idx);
} }
......
...@@ -29,7 +29,7 @@ namespace ...@@ -29,7 +29,7 @@ namespace
void TestCellAverageUniform3D() void TestCellAverageUniform3D()
{