Commit 424d4b72 authored by Kunda's avatar Kunda Committed by Cory Quammen
Browse files

doxy and misc. typos pt2

doxy and misc. typos pt2
parent dac1771e
......@@ -176,7 +176,7 @@ vtkm::cont::Field Convert(vtkDataArray* input, int association)
// We need to properly deduce the ValueType of the array. This means
// that we need to switch on Float/Double/Int, and then figure out the
// number of components. The upside is that the Convert Method can internally
// figure out the number of components, and not have to generate alot
// figure out the number of components, and not have to generate a lot
// of template to do so
// Investigate using vtkArrayDispatch, AOS for all types, and than SOA for
......
......@@ -45,7 +45,7 @@ MACRO(CHECK_CXX_SOURCE_RUNS SOURCE VAR COMMENT)
SET(${VAR} 1 CACHE INTERNAL "Test ${COMMENT}")
MESSAGE(STATUS "Performing Test ${COMMENT} - Success")
FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
"Performing C++ SOURCE FILE Test ${COMMENT} succeded with the following output:\n"
"Performing C++ SOURCE FILE Test ${COMMENT} succeeded with the following output:\n"
"${OUTPUT}\n"
"Source file was:\n${SOURCE}\n")
ELSE()
......
......@@ -85,7 +85,7 @@ include(FindPackageHandleStandardArgs)
#
# The compilers are detected in this order:
#
# 1. Try to find the most generic availble MPI compiler, as this is usually set up by
# 1. Try to find the most generic available MPI compiler, as this is usually set up by
# cluster admins. e.g., if plain old mpicc is available, we'll use it and assume it's
# the right compiler.
#
......
......@@ -160,7 +160,7 @@ endif ()
# will never adequately match the user's setup, so there is no feasible way
# to detect the "best" version to use. The user will have to manually
# select the right files. (Chances are the distributions are shipping their
# custom version of tbb, anyway, so the problem is probably nonexistant.)
# custom version of tbb, anyway, so the problem is probably nonexistent.)
if (WIN32 AND MSVC)
set(COMPILER_PREFIX "vc7.1")
if (MSVC_VERSION EQUAL 1400)
......
......@@ -405,7 +405,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
#if we detect that occurrence clear the suffix
if(_suffix AND NOT TARGET ${HDF5_${_lang}_TARGET}${_suffix})
if(NOT TARGET ${HDF5_${_lang}_TARGET})
#cant find this component with our without the suffix
#can't find this component with our without the suffix
#so bail out, and let the following locate HDF5
set(HDF5_FOUND FALSE)
break()
......
......@@ -72,7 +72,7 @@
# Generates a file called other_name_export.h containing the macros
# OTHER_NAME_EXPORT, OTHER_NAME_NO_EXPORT and OTHER_NAME_DEPRECATED etc.
#
# The BASE_NAME may be overridden by specifiying other options in the function.
# The BASE_NAME may be overridden by specifying other options in the function.
# For example:
#
# add_library(somelib someclass.cpp)
......
......@@ -2,7 +2,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
include(CheckCXXCompilerFlag)
# Addtional warnings for GCC
# Additional warnings for GCC
set(CMAKE_CXX_FLAGS_WARN "-Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wchar-subscripts -Wall -Wextra -Wpointer-arith -Wformat-security -Woverloaded-virtual -Wshadow -Wunused-parameter -fno-check-new -fno-common")
# This flag is useful as not returning from a non-void function is an error
......
......@@ -93,11 +93,11 @@ ENDIF()
IF(CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
# --diag_suppress=236 is for constant value asserts used for error handling
# This can be restricted to the implementation and doesn't need to propogate
# This can be restricted to the implementation and doesn't need to propagate
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --diag_suppress=236")
# --diag_suppress=381 is for redundant semi-colons used in macros
# This needs to propogate to anything that includes VTK headers
# This needs to propagate to anything that includes VTK headers
SET(VTK_REQUIRED_CXX_FLAGS "${VTK_REQUIRED_CXX_FLAGS} --diag_suppress=381")
ENDIF()
......
# This file ensures the appropriate variables are set up for a project extending
# VTK before including vtkModuleMacros. This is the preferred way for a project
# building aginst VTK to use the CMake infrastructure provided for module
# building against VTK to use the CMake infrastructure provided for module
# developers.
if(NOT VTK_FOUND)
......
......@@ -880,7 +880,7 @@ macro(vtk_module_third_party _pkg)
endif()
#a workaround for bad FindHDF5 behavior in which deb or opt can
#end up empty. cmake >= 2.8.12.2 makes this uneccessary
#end up empty. cmake >= 2.8.12.2 makes this unnecessary
string(REGEX MATCH "debug;.*optimized;.*"
_remove_deb_opt "${vtk${_lower}_LIBRARIES}")
if (_remove_deb_opt)
......
......@@ -138,7 +138,7 @@ vtkRecti vtkContextArea::ComputeExpandedDrawAreaGeometry(vtkContext2D *painter)
// Shorter names for compact readability:
vtkRecti &geo = this->Geometry;
// Set the axes positions. We iterate upto 3 times to converge on the margins.
// Set the axes positions. We iterate up to 3 times to converge on the margins.
vtkRecti draw(this->DrawAreaGeometry); // Start with last attempt
vtkRecti lastDraw;
for (int pass = 0; pass < 3; ++pass)
......
......@@ -42,7 +42,7 @@ int TestTimePointUtility(int, char *[])
continue;
}
// The dates October 5, 1582 thru October 14, 1582 do not exist
// The dates October 5, 1582 through October 14, 1582 do not exist
if (y == 1582)
{
if (m == 10)
......
......@@ -57,7 +57,7 @@ public:
* After Initialize() has been called, the iterator is valid
* so long as the Array has not been modified
* (except using the iterator itself).
* If the array is modified, the iterator must be re-intialized.
* If the array is modified, the iterator must be re-initialized.
*/
virtual void Initialize(vtkAbstractArray* array) = 0;
......
......@@ -46,7 +46,7 @@ public:
* After Initialize() has been called, the iterator is valid
* so long as the Array has not been modified
* (except using the iterator itself).
* If the array is modified, the iterator must be re-intialized.
* If the array is modified, the iterator must be re-initialized.
*/
void Initialize(vtkAbstractArray* array) VTK_OVERRIDE;
......
......@@ -38,7 +38,7 @@ public:
* After Initialize() has been called, the iterator is valid
* so long as the Array has not been modified
* (except using the iterator itself).
* If the array is modified, the iterator must be re-intialized.
* If the array is modified, the iterator must be re-initialized.
*/
void Initialize(vtkAbstractArray* array) VTK_OVERRIDE;
......
......@@ -398,7 +398,7 @@ void vtkObjectFactory::PrintSelf(ostream& os, vtkIndent indent)
for(int i =0; i < num; i++)
{
os << indent << "Class : " << this->GetClassOverrideName(i) << endl;
os << indent << "Overriden with: " << this->GetClassOverrideWithName(i)
os << indent << "Overridden with: " << this->GetClassOverrideWithName(i)
<< endl;
os << indent << "Enable flag: " << this->GetEnableFlag(i) << endl;
os << endl;
......@@ -587,7 +587,7 @@ void vtkObjectFactory::Disable(const char* className)
}
}
// 1,0 is the class overriden by className
// 1,0 is the class overridden by className
int vtkObjectFactory::HasOverride(const char* className)
{
for(int i =0; i < this->OverrideArrayLength; i++)
......@@ -600,7 +600,7 @@ int vtkObjectFactory::HasOverride(const char* className)
return 0;
}
// 1,0 is the class overriden by className/subclassName pair
// 1,0 is the class overridden by className/subclassName pair
int vtkObjectFactory::HasOverride(const char* className,
const char* subclassName)
{
......@@ -629,7 +629,7 @@ vtkObjectFactoryCollection* vtkObjectFactory::GetRegisteredFactories()
}
// 1,0 is the className overriden by any registered factories
// 1,0 is the className overridden by any registered factories
int vtkObjectFactory::HasOverrideAny(const char* className)
{
vtkObjectFactory* factory;
......
......@@ -17,7 +17,7 @@
* @brief Factory object override information
*
* vtkOverrideInformation is used to represent the information about
* a class which is overriden in a vtkObjectFactory.
* a class which is overridden in a vtkObjectFactory.
*
*/
......@@ -40,9 +40,9 @@ public:
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
/**
* Returns the name of the class being overriden. For example,
* Returns the name of the class being overridden. For example,
* if you had a factory that provided an override for
* vtkVertex, then this funciton would return "vtkVertex"
* vtkVertex, then this function would return "vtkVertex"
*/
const char* GetClassOverrideName()
{
......
......@@ -225,7 +225,7 @@ vtkIdType* vtkSortDataArray::InitializeSortIndices(vtkIdType num)
//---------------------------------------------------------------------------
// Efficent function for generating sort ordering specialized to single
// Efficient function for generating sort ordering specialized to single
// component arrays.
void vtkSortDataArray::
GenerateSort1Indices(int dataType, void *dataIn, vtkIdType numKeys,
......
......@@ -115,7 +115,7 @@ int TestAMRBoxCoarsenRefineOperators()
hi[0] = hi[1] = hi[2] = 33;
Construct3DAMRBox( Ar, lo, hi );
// Save the intial AMR box to A0
// Save the initial AMR box to A0
A0 = A;
// Refine the AMR box to Ar
......
......@@ -277,7 +277,7 @@ public:
double Bounds[6]; //the bounds of the entire domain
//-------------------------------------------------------------------------
// Auxillary information that be computed
// Auxiliary information that be computed
//-------------------------------------------------------------------------
vtkSmartPointer<vtkIntArray> Refinement; //refinement ratio between two adjacent levels
vtkSmartPointer<vtkUnsignedIntArray> BlockLevel; //only necessary if need to call ComputeIndexPair
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment