Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'typos'

Browse Source 
efdf8543 Misc. Typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1113
This commit is contained in:
Matt Larsen 2018-04-06 22:04:28 +00:00 committed by Kitware Robot
commit 715141737f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/cont/ArrayHandle.h
View File

@ -197,7 +197,7 @@ struct GetTypeInParentheses<void(T)>
/// This macro also defines a Superclass typedef as well as ValueType and
/// StorageTag.
///
/// Note that this macor only works on ArrayHandle subclasses that are
/// Note that this macro only works on ArrayHandle subclasses that are
/// templated. For ArrayHandle sublcasses that are not templates, use
/// VTKM_ARRAY_HANDLE_SUBCLASS_NT.
///
@ -220,8 +220,8 @@ struct GetTypeInParentheses<void(T)>
/// This macro also defines a Superclass typedef as well as ValueType and
/// StorageTag.
///
/// Note that this macor only works on ArrayHandle subclasses that are not
/// templated. For ArrayHandle sublcasses that are are templates, use
/// Note that this macro only works on ArrayHandle subclasses that are not
/// templated. For ArrayHandle sublcasses that are templates, use
/// VTKM_ARRAY_HANDLE_SUBCLASS.
///
#define VTKM_ARRAY_HANDLE_SUBCLASS_NT(classname, superclass) \

4
vtkm/cont/cuda/ChooseCudaDevice.h
View File

@ -66,13 +66,13 @@ struct compute_info
//if we both the same SM level check performance
if ((this->Major >= 3 && other.Major >= 3) || (this->Major == other.Major))
{
return betterPerfomance(other);
return betterPerformance(other);
}
//prefer the greater SM otherwise
return this->Major > other.Major;
}
bool betterPerfomance(const compute_info other) const
bool betterPerformance(const compute_info other) const
{
if (this->Performance == other.Performance)
{

2
vtkm/exec/CellInside.h
View File

@ -95,7 +95,7 @@ static inline VTKM_EXEC bool CellInside(const vtkm::Vec<T, 3>& pcoords, vtkm::Ce
pcoords[2] >= T(0) && pcoords[2] <= T(1);
}
/// Checks if the paramteric coordinates `pcoords` are on the inside for the
/// Checks if the parametric coordinates `pcoords` are on the inside for the
/// specified cell type.
///
template <typename T>