diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h index b9267e1ccc25aae497707593bc72472e992df53d..e2287c66cd915745c491e9ba13cdfd0b295e0a2c 100644 --- a/vtkm/cont/ArrayHandle.h +++ b/vtkm/cont/ArrayHandle.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -338,8 +338,8 @@ public: /// /// The allocation may be done on an already existing array, but can wipe out /// any data already in the array. This method can throw - /// ErrorControlBadAllocation if the array cannot be allocated or - /// ErrorControlBadValue if the allocation is not feasible (for example, the + /// ErrorBadAllocation if the array cannot be allocated or + /// ErrorBadValue if the allocation is not feasible (for example, the /// array storage is read-only). /// VTKM_CONT diff --git a/vtkm/cont/ArrayHandle.hxx b/vtkm/cont/ArrayHandle.hxx index 6b63470272e76d527bd24eabf6814bbbb4707d7f..66a73af2f2916db750ac1240ae927a549204b70f 100644 --- a/vtkm/cont/ArrayHandle.hxx +++ b/vtkm/cont/ArrayHandle.hxx @@ -32,7 +32,7 @@ ArrayHandle::GetStorage() } else { - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "ArrayHandle::SyncControlArray did not make control array valid."); } } @@ -48,7 +48,7 @@ ArrayHandle::GetStorage() const } else { - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "ArrayHandle::SyncControlArray did not make control array valid."); } } @@ -68,7 +68,7 @@ ArrayHandle::GetPortalControl() } else { - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "ArrayHandle::SyncControlArray did not make control array valid."); } } @@ -84,7 +84,7 @@ ArrayHandle::GetPortalConstControl() const } else { - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "ArrayHandle::SyncControlArray did not make control array valid."); } } @@ -121,7 +121,7 @@ void ArrayHandle::CopyInto(IteratorType dest, DeviceAdapterTag) const if (!this->Internals->ControlArrayValid && !this->Internals->ExecutionArrayValid) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "ArrayHandle has no data to copy into Iterator."); } @@ -170,7 +170,7 @@ void ArrayHandle::Shrink(vtkm::Id numberOfValues) } else // numberOfValues > originalNumberOfValues { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "ArrayHandle::Shrink cannot be used to grow array."); } @@ -187,7 +187,7 @@ ArrayHandle::PrepareForInput(DeviceAdapterTag) const if (!this->Internals->ControlArrayValid && !this->Internals->ExecutionArrayValid) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "ArrayHandle has no data when PrepareForInput called."); } @@ -242,7 +242,7 @@ ArrayHandle::PrepareForInPlace(DeviceAdapterTag) if (!this->Internals->ControlArrayValid && !this->Internals->ExecutionArrayValid) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "ArrayHandle has no data when PrepareForInPlace called."); } diff --git a/vtkm/cont/ArrayHandleCartesianProduct.h b/vtkm/cont/ArrayHandleCartesianProduct.h index c9a51583909ef1595614941eab63b4b5f233372d..01cac9fd142137b0720eec118740f0c7ea2c49d9 100644 --- a/vtkm/cont/ArrayHandleCartesianProduct.h +++ b/vtkm/cont/ArrayHandleCartesianProduct.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace vtkm { namespace exec { @@ -229,13 +229,13 @@ public: VTKM_CONT void Allocate(vtkm::Id /*numberOfValues*/) { - throw vtkm::cont::ErrorControlBadAllocation("Does not make sense."); + throw vtkm::cont::ErrorBadAllocation("Does not make sense."); } VTKM_CONT void Shrink(vtkm::Id /*numberOfValues*/) { - throw vtkm::cont::ErrorControlBadAllocation("Does not make sense."); + throw vtkm::cont::ErrorBadAllocation("Does not make sense."); } VTKM_CONT @@ -327,7 +327,7 @@ public: VTKM_CONT PortalExecution PrepareForInPlace(bool vtkmNotUsed(updateData)) { - throw vtkm::cont::ErrorControlBadAllocation( + throw vtkm::cont::ErrorBadAllocation( "Cannot write to an ArrayHandleCartesianProduct. It does not make " "sense because there is overlap in the data."); } @@ -335,7 +335,7 @@ public: VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadAllocation( + throw vtkm::cont::ErrorBadAllocation( "Cannot write to an ArrayHandleCartesianProduct. It does not make " "sense because there is overlap in the data."); } @@ -351,7 +351,7 @@ public: VTKM_CONT void Shrink(vtkm::Id /*numberOfValues*/) { - throw vtkm::cont::ErrorControlBadAllocation("Does not make sense."); + throw vtkm::cont::ErrorBadAllocation("Does not make sense."); } VTKM_CONT diff --git a/vtkm/cont/ArrayHandleCompositeVector.h b/vtkm/cont/ArrayHandleCompositeVector.h index 5132076659fbed60744366bfe62910825ead0676..1ad9095146b568d49ca52afbc83f327ca8f82353 100644 --- a/vtkm/cont/ArrayHandleCompositeVector.h +++ b/vtkm/cont/ArrayHandleCompositeVector.h @@ -21,8 +21,8 @@ #define vtk_m_ArrayHandleCompositeVector_h #include -#include -#include +#include +#include #include #include @@ -158,7 +158,7 @@ struct CheckArraySizeFunctor { message << "All input arrays to ArrayHandleCompositeVector must be the same size.\n" << "Array " << Index-1 << " has " << a.GetNumberOfValues() << ". Expected " << this->ExpectedSize << "."; - throw vtkm::cont::ErrorControlBadValue(message.str().c_str()); + throw vtkm::cont::ErrorBadValue(message.str().c_str()); } } }; @@ -282,7 +282,7 @@ public: VTKM_CONT PortalType GetPortal() { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Composite vector arrays are read only."); } @@ -290,7 +290,7 @@ public: PortalConstType GetPortalConst() const { if (!this->Valid) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Tried to use an ArrayHandleCompositeHandle without dependent arrays."); } return PortalConstType(this->Arrays.StaticTransformCont( @@ -302,7 +302,7 @@ public: vtkm::Id GetNumberOfValues() const { if (!this->Valid) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Tried to use an ArrayHandleCompositeHandle without dependent arrays."); } return this->Arrays.template GetParameter<1>().GetNumberOfValues(); @@ -310,7 +310,7 @@ public: VTKM_CONT void Allocate(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "The allocate method for the composite vector storage should never " "have been called. The allocate is generally only called by the " @@ -321,7 +321,7 @@ public: VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Composite vector arrays are read-only."); } @@ -403,7 +403,7 @@ public: { // It may be the case a composite vector could be used for in place // operations, but this is not implemented currently. - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Composite vector arrays cannot be used for output or in place."); } @@ -413,21 +413,21 @@ public: // It may be the case a composite vector could be used for output if you // want the delegate arrays to be resized, but this is not implemented // currently. - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Composite vector arrays cannot be used for output."); } VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Composite vector arrays cannot be used for output."); } VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Composite vector arrays cannot be resized."); } diff --git a/vtkm/cont/ArrayHandleConcatenate.h b/vtkm/cont/ArrayHandleConcatenate.h index 608b027ddcf985f5fbe6f61eb5eb62ff8d0dd444..1f257fd2640eb23746b4c21a5375842a8a53cf4e 100644 --- a/vtkm/cont/ArrayHandleConcatenate.h +++ b/vtkm/cont/ArrayHandleConcatenate.h @@ -143,7 +143,7 @@ public: VTKM_CONT void Allocate( vtkm::Id vtkmNotUsed(numberOfValues) ) { - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "ArrayHandleConcatenate should not be allocated explicitly. " ); } @@ -241,7 +241,7 @@ public: VTKM_CONT PortalExecution PrepareForOutput( vtkm::Id vtkmNotUsed(numberOfValues) ) { - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "ArrayHandleConcatenate is derived and read-only. " ); } diff --git a/vtkm/cont/ArrayHandleGroupVec.h b/vtkm/cont/ArrayHandleGroupVec.h index 415579a28ba1b279f31846d66bb1cdd8592c8291..06ea753b9df228f0c6ff217b9a7f0994ccb2599e 100644 --- a/vtkm/cont/ArrayHandleGroupVec.h +++ b/vtkm/cont/ArrayHandleGroupVec.h @@ -22,7 +22,7 @@ #include #include -#include +#include namespace vtkm { namespace exec { @@ -164,7 +164,7 @@ public: vtkm::Id sourceSize = this->SourceArray.GetNumberOfValues(); if(sourceSize%NUM_COMPONENTS != 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "ArrayHandleGroupVec's source array does not divide evenly into Vecs."); } return sourceSize/NUM_COMPONENTS; @@ -247,7 +247,7 @@ public: vtkm::Id sourceSize = this->SourceArray.GetNumberOfValues(); if (sourceSize%NUM_COMPONENTS != 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "ArrayHandleGroupVec's source array does not divide evenly into Vecs."); } return sourceSize/NUM_COMPONENTS; @@ -258,7 +258,7 @@ public: { if (this->SourceArray.GetNumberOfValues()%NUM_COMPONENTS != 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "ArrayHandleGroupVec's source array does not divide evenly into Vecs."); } return PortalConstExecution(this->SourceArray.PrepareForInput(Device())); @@ -269,7 +269,7 @@ public: { if (this->SourceArray.GetNumberOfValues()%NUM_COMPONENTS != 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "ArrayHandleGroupVec's source array does not divide evenly into Vecs."); } return PortalExecution(this->SourceArray.PrepareForInPlace(Device())); diff --git a/vtkm/cont/ArrayHandleGroupVecVariable.h b/vtkm/cont/ArrayHandleGroupVecVariable.h index 3ce9bad14d561d09fd08b0e642f3f304b3ee03a7..2dc7c84c11197d956b58ee0c5b9be4ccf02e8d95 100644 --- a/vtkm/cont/ArrayHandleGroupVecVariable.h +++ b/vtkm/cont/ArrayHandleGroupVecVariable.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -487,7 +487,7 @@ void DoConvertNumComponentsToOffsets( if (!success) { // Internal error? Maybe need to make a failed to execute error. - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "Failed to run ExclusiveScan on any device."); } diff --git a/vtkm/cont/ArrayHandlePermutation.h b/vtkm/cont/ArrayHandlePermutation.h index 8f69bec98a9fd9d1ad3edfee9c94784eee11fa2a..2cef825aed116c2ba2a0bc929c9880978c383eab 100644 --- a/vtkm/cont/ArrayHandlePermutation.h +++ b/vtkm/cont/ArrayHandlePermutation.h @@ -23,8 +23,8 @@ #define vtk_m_ArrayHandlePermutation_h #include -#include -#include +#include +#include namespace vtkm { namespace exec { @@ -153,13 +153,13 @@ public: VTKM_CONT void Allocate(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandlePermutation cannot be allocated."); } VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandlePermutation cannot shrink."); } @@ -234,7 +234,7 @@ public: PortalExecution PrepareForOutput(vtkm::Id numberOfValues) { if (numberOfValues != this->GetNumberOfValues()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "An ArrayHandlePermutation can be used as an output array, " "but it cannot be resized. Make sure the index array is sized " "to the appropriate length before trying to prepare for output."); @@ -246,7 +246,7 @@ public: // we have to assume the allocation is correct. if ((numberOfValues > 0) && (this->ValueArray.GetNumberOfValues() < 1)) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "The value array must be pre-allocated before it is used for the " "output of ArrayHandlePermutation."); } @@ -265,7 +265,7 @@ public: VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandlePermutation cannot shrink."); } diff --git a/vtkm/cont/ArrayHandleTransform.h b/vtkm/cont/ArrayHandleTransform.h index 3ebd8f7597a767cc183de563c6c65d22a3f03e81..bbf6e50206232d08060b6d1e146c2246e97e036f 100644 --- a/vtkm/cont/ArrayHandleTransform.h +++ b/vtkm/cont/ArrayHandleTransform.h @@ -23,8 +23,8 @@ #define vtk_m_cont_ArrayHandleTransform_h #include -#include -#include +#include +#include namespace vtkm { namespace cont { @@ -215,13 +215,13 @@ public: VTKM_CONT void Allocate(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandleTransform is read only. It cannot be allocated."); } VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandleTransform is read only. It cannot shrink."); } @@ -374,20 +374,20 @@ public: VTKM_CONT PortalExecution PrepareForInPlace(bool &vtkmNotUsed(updateData)) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandleTransform read only. " "Cannot be used for in-place operations."); } VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandleTransform read only. Cannot be used as output."); } VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(storage)) const { - throw vtkm::cont::ErrorControlInternal( + throw vtkm::cont::ErrorInternal( "ArrayHandleTransform read only. " "There should be no occurance of the ArrayHandle trying to pull " "data from the execution environment."); @@ -395,7 +395,7 @@ public: VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandleTransform read only. Cannot shrink."); } diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt index b99dff19bc0f234b49c1ed8f4cb548c5977dacc2..0e62e9a3bbef74ab7cc1ea4e1820fee30fe9760d 100644 --- a/vtkm/cont/CMakeLists.txt +++ b/vtkm/cont/CMakeLists.txt @@ -56,12 +56,11 @@ set(headers DynamicArrayHandle.h DynamicCellSet.h Error.h - ErrorControl.h - ErrorControlBadAllocation.h - ErrorControlBadType.h - ErrorControlBadValue.h - ErrorControlInternal.h + ErrorBadAllocation.h + ErrorBadType.h + ErrorBadValue.h ErrorExecution.h + ErrorInternal.h Field.h RuntimeDeviceInformation.h Storage.h diff --git a/vtkm/cont/CellSetExplicit.h b/vtkm/cont/CellSetExplicit.h index c142f7ff36e5e021ea282409a019ecfc23ee620c..e690d77d6389ec1038d85c993e3abb2426b85823 100644 --- a/vtkm/cont/CellSetExplicit.h +++ b/vtkm/cont/CellSetExplicit.h @@ -214,19 +214,19 @@ public: if (Traits::GetNumberOfComponents(ids) < numVertices) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Not enough indices given to CellSetSingleType::AddCell."); } if (this->NumberOfCellsAdded >= this->PointToCell.Shapes.GetNumberOfValues()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Added more cells then expected."); } if (this->ConnectivityAdded+numVertices > this->PointToCell.Connectivity.GetNumberOfValues()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Connectivity increased passed estimated maximum connectivity."); } @@ -253,7 +253,7 @@ public: if (this->NumberOfCellsAdded != this->GetNumberOfCells()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Did not add as many cells as expected."); } @@ -289,7 +289,7 @@ public: this->PointToCell.IndexOffsetsValid = false; if (offsets.GetNumberOfValues() != 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Explicit cell offsets array unexpected size. " "Use an empty array to automatically generate."); } diff --git a/vtkm/cont/CellSetSingleType.h b/vtkm/cont/CellSetSingleType.h index cd1d0fa677cb1689a5223a704f273ba7c0801d83..79eed952f6a93662f45fefeb4976f2415de31017 100644 --- a/vtkm/cont/CellSetSingleType.h +++ b/vtkm/cont/CellSetSingleType.h @@ -110,14 +110,14 @@ public: if (Traits::GetNumberOfComponents(ids) < numVertices) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Not enough indices given to CellSetSingleType::AddCell."); } if (this->ConnectivityAdded+numVertices > this->PointToCell.Connectivity.GetNumberOfValues()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Connectivity increased passed estimated maximum connectivity."); } @@ -125,7 +125,7 @@ public: { if (shapeId == vtkm::CELL_SHAPE_EMPTY) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Cannot create cells of type empty."); } this->CellShapeAsId = shapeId; @@ -136,12 +136,12 @@ public: { if (shapeId != this->GetCellShape(0)) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Cannot have differing shapes in CellSetSingleType."); } if (numVertices != this->NumberOfPointsPerCell) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Inconsistent number of points in cells for CellSetSingleType."); } } @@ -179,7 +179,7 @@ public: if (this->ExpectedNumberOfCellsAdded != this->GetNumberOfCells()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Did not add the expected number of cells."); } @@ -246,7 +246,7 @@ private: { if (numVertices != vtkm::CellTraits::NUM_POINTS) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Passed invalid number of points for cell shape."); } } @@ -271,7 +271,7 @@ private: vtkm::CellTraits::IsSizeFixed(), numVertices) ); default: - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "CellSetSingleType unable to determine the cell type"); } } diff --git a/vtkm/cont/DataSet.h b/vtkm/cont/DataSet.h index 5e180ea9bacbd3e54cda803ec38ab2f1fe1e1651..c2a4f10452354fedbd453f295ad65b7c9f68b935 100644 --- a/vtkm/cont/DataSet.h +++ b/vtkm/cont/DataSet.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include namespace vtkm { @@ -86,7 +86,7 @@ public: } else { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "No field with requested name: " + name); } } @@ -145,7 +145,7 @@ public: } else { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "No coordinate system with requested name"); } } @@ -198,7 +198,7 @@ public: } else { - throw vtkm::cont::ErrorControlBadValue("No cell set with requested name"); + throw vtkm::cont::ErrorBadValue("No cell set with requested name"); } } diff --git a/vtkm/cont/DataSetBuilderRectilinear.h b/vtkm/cont/DataSetBuilderRectilinear.h index f9b217f8d376c9db2de676e4c4ac9b8504843829..ad941cbd3a0f1e76238ee9309ced041bdf7f60ef 100644 --- a/vtkm/cont/DataSetBuilderRectilinear.h +++ b/vtkm/cont/DataSetBuilderRectilinear.h @@ -280,7 +280,7 @@ private: dataSet.AddCellSet(cellSet); } else - throw vtkm::cont::ErrorControlBadValue("Invalid cell set dimension"); + throw vtkm::cont::ErrorBadValue("Invalid cell set dimension"); return dataSet; } diff --git a/vtkm/cont/DataSetBuilderUniform.h b/vtkm/cont/DataSetBuilderUniform.h index e7531273207719ce47cf059075adc422fd868b20..183aea98bc5590c7ba83a7ba3c8e58c75ef5c4fe 100644 --- a/vtkm/cont/DataSetBuilderUniform.h +++ b/vtkm/cont/DataSetBuilderUniform.h @@ -161,7 +161,7 @@ private: dataSet.AddCellSet(cellSet); } else - throw vtkm::cont::ErrorControlBadValue("Invalid cell set dimension"); + throw vtkm::cont::ErrorBadValue("Invalid cell set dimension"); return dataSet; } diff --git a/vtkm/cont/DynamicArrayHandle.h b/vtkm/cont/DynamicArrayHandle.h index b7ae008f955559d3ced9a5a979dd140c2d28fad4..067cab930f872e65fe5922af9e5ce6d1d46dd38a 100644 --- a/vtkm/cont/DynamicArrayHandle.h +++ b/vtkm/cont/DynamicArrayHandle.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -260,7 +260,7 @@ public: } /// Returns this array cast to an ArrayHandle object of the given type and - /// storage. Throws \c ErrorControlBadType if the cast does not work. Use + /// storage. Throws \c ErrorBadType if the cast does not work. Use /// \c IsTypeAndStorage to check if the cast can happen. /// /// @@ -272,7 +272,7 @@ public: detail::DynamicArrayHandleTryCast(this->ArrayContainer); if (downcastArray == nullptr) { - throw vtkm::cont::ErrorControlBadType("Bad cast of dynamic array."); + throw vtkm::cont::ErrorBadType("Bad cast of dynamic array."); } // Technically, this method returns a copy of the \c ArrayHandle. But // because \c ArrayHandle acts like a shared pointer, it is valid to @@ -281,7 +281,7 @@ public: } /// Returns this array cast to the given \c ArrayHandle type. Throws \c - /// ErrorControlBadType if the cast does not work. Use \c IsType + /// ErrorBadType if the cast does not work. Use \c IsType /// to check if the cast can happen. /// template @@ -298,7 +298,7 @@ public: /// Given a refernce to an ArrayHandle object, casts this array to the /// ArrayHandle's type and sets the given ArrayHandle to this array. Throws - /// \c ErrorControlBadType if the cast does not work. Use \c + /// \c ErrorBadType if the cast does not work. Use \c /// ArrayHandleType to check if the cast can happen. /// /// Note that this is a shallow copy. The data are not copied and a change @@ -514,7 +514,7 @@ void DynamicArrayHandleBase:: vtkm::ListForEach(tryType, TypeList()); if (!tryType.FoundCast) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Could not find appropriate cast for array in CastAndCall1."); } } @@ -538,7 +538,7 @@ void DynamicArrayHandleBase #include -#include +#include #include #include @@ -183,7 +183,7 @@ public: } /// Returns this cell set cast to the given \c CellSet type. Throws \c - /// ErrorControlBadType if the cast does not work. Use \c IsType to check if + /// ErrorBadType if the cast does not work. Use \c IsType to check if /// the cast can happen. /// template @@ -193,14 +193,14 @@ public: detail::DynamicCellSetTryCast(this->CellSetContainer); if (cellSetPointer == nullptr) { - throw vtkm::cont::ErrorControlBadType("Bad cast of dynamic cell set."); + throw vtkm::cont::ErrorBadType("Bad cast of dynamic cell set."); } return *cellSetPointer; } /// Given a reference to a concrete \c CellSet object, attempt to downcast /// the contain cell set to the provided type and copy into the given \c - /// CellSet object. Throws \c ErrorControlBadType if the cast does not work. + /// CellSet object. Throws \c ErrorBadType if the cast does not work. /// Use \c IsType to check if the cast can happen. /// /// Note that this is a shallow copy. Any data in associated arrays are not @@ -344,7 +344,7 @@ void DynamicCellSetBase::CastAndCall(const Functor &f) const vtkm::ListForEach(tryCellSet, CellSetList()); if (!tryCellSet.FoundCast) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Could not find appropriate cast for cell set."); } } diff --git a/vtkm/cont/ErrorControlBadAllocation.h b/vtkm/cont/ErrorBadAllocation.h similarity index 75% rename from vtkm/cont/ErrorControlBadAllocation.h rename to vtkm/cont/ErrorBadAllocation.h index a37663679b48cb8653b2118f592ec80667088cd0..c0fbee7eb555ed6597589cf02e1d6a2ef7733592 100644 --- a/vtkm/cont/ErrorControlBadAllocation.h +++ b/vtkm/cont/ErrorBadAllocation.h @@ -17,10 +17,10 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtk_m_cont_ErrorControlBadAllocation_h -#define vtk_m_cont_ErrorControlBadAllocation_h +#ifndef vtk_m_cont_ErrorBadAllocation_h +#define vtk_m_cont_ErrorBadAllocation_h -#include +#include namespace vtkm { namespace cont { @@ -28,14 +28,14 @@ namespace cont { /// This class is thrown when VTK-m attempts to manipulate memory that it should /// not. /// -class VTKM_ALWAYS_EXPORT ErrorControlBadAllocation : public ErrorControl +class VTKM_ALWAYS_EXPORT ErrorBadAllocation : public Error { public: - ErrorControlBadAllocation(const std::string &message) - : ErrorControl(message) { } + ErrorBadAllocation(const std::string &message) + : Error(message) { } }; } } // namespace vtkm::cont -#endif //vtk_m_cont_ErrorControlBadAllocation_h +#endif //vtk_m_cont_ErrorBadAllocation_h diff --git a/vtkm/cont/ErrorControlBadType.h b/vtkm/cont/ErrorBadType.h similarity index 77% rename from vtkm/cont/ErrorControlBadType.h rename to vtkm/cont/ErrorBadType.h index 7dfa6a56fe58307233e1b1140b30ce871debffd3..03e3cb5107f3b8e4cce524cba8753d992e7b968a 100644 --- a/vtkm/cont/ErrorControlBadType.h +++ b/vtkm/cont/ErrorBadType.h @@ -17,10 +17,10 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtk_m_cont_ErrorControlBadType_h -#define vtk_m_cont_ErrorControlBadType_h +#ifndef vtk_m_cont_ErrorBadType_h +#define vtk_m_cont_ErrorBadType_h -#include +#include namespace vtkm { namespace cont { @@ -28,14 +28,14 @@ namespace cont { /// This class is thrown when VTK-m encounters data of a type that is /// incompatible with the current operation. /// -class VTKM_ALWAYS_EXPORT ErrorControlBadType : public ErrorControl +class VTKM_ALWAYS_EXPORT ErrorBadType : public Error { public: - ErrorControlBadType(const std::string &message) - : ErrorControl(message) { } + ErrorBadType(const std::string &message) + : Error(message) { } }; } } // namespace vtkm::cont -#endif //vtk_m_cont_ErrorControlBadType_h +#endif //vtk_m_cont_ErrorBadType_h diff --git a/vtkm/cont/ErrorControlBadValue.h b/vtkm/cont/ErrorBadValue.h similarity index 77% rename from vtkm/cont/ErrorControlBadValue.h rename to vtkm/cont/ErrorBadValue.h index 903ce8a278718ad100dad5d8a3460afdec5832cb..d9d7b90bdadd478143283ef5bf52142643bc4d26 100644 --- a/vtkm/cont/ErrorControlBadValue.h +++ b/vtkm/cont/ErrorBadValue.h @@ -17,10 +17,10 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtk_m_cont_ErrorControlBadValue_h -#define vtk_m_cont_ErrorControlBadValue_h +#ifndef vtk_m_cont_ErrorBadValue_h +#define vtk_m_cont_ErrorBadValue_h -#include +#include namespace vtkm { namespace cont { @@ -28,14 +28,14 @@ namespace cont { /// This class is thrown when a VTKm function or method encounters an invalid /// value that inhibits progress. /// -class VTKM_ALWAYS_EXPORT ErrorControlBadValue : public ErrorControl +class VTKM_ALWAYS_EXPORT ErrorBadValue : public Error { public: - ErrorControlBadValue(const std::string &message) - : ErrorControl(message) { } + ErrorBadValue(const std::string &message) + : Error(message) { } }; } } // namespace vtkm::cont -#endif //vtk_m_cont_ErrorControlBadValue_h +#endif //vtk_m_cont_ErrorBadValue_h diff --git a/vtkm/cont/ErrorControl.h b/vtkm/cont/ErrorControl.h deleted file mode 100644 index 6302de29daaae891b1f64b7cc5997c1bdacb753b..0000000000000000000000000000000000000000 --- a/vtkm/cont/ErrorControl.h +++ /dev/null @@ -1,41 +0,0 @@ -//============================================================================ -// Copyright (c) Kitware, Inc. -// All rights reserved. -// See LICENSE.txt for details. -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notice for more information. -// -// Copyright 2014 Sandia Corporation. -// Copyright 2014 UT-Battelle, LLC. -// Copyright 2014 Los Alamos National Security. -// -// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation, -// the U.S. Government retains certain rights in this software. -// -// Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National -// Laboratory (LANL), the U.S. Government retains certain rights in -// this software. -//============================================================================ -#ifndef vtk_m_cont_ErrorControl_h -#define vtk_m_cont_ErrorControl_h - -#include - -namespace vtkm { -namespace cont { - -/// The superclass of all exceptions thrown from within the VTKm control -/// environment. -/// -class VTKM_ALWAYS_EXPORT ErrorControl : public vtkm::cont::Error -{ -protected: - ErrorControl() { } - ErrorControl(const std::string message) : Error(message) { } -}; - -} -} // namespace vtkm::cont - -#endif //vtk_m_cont_ErrorControl_h diff --git a/vtkm/cont/ErrorControlInternal.h b/vtkm/cont/ErrorInternal.h similarity index 79% rename from vtkm/cont/ErrorControlInternal.h rename to vtkm/cont/ErrorInternal.h index a0618b17517603c321d61b2855d5b4366efa84ec..85518a77ee538711ced45d3227c6086ad856ed0f 100644 --- a/vtkm/cont/ErrorControlInternal.h +++ b/vtkm/cont/ErrorInternal.h @@ -17,10 +17,10 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtk_m_cont_ErrorControlInternal_h -#define vtk_m_cont_ErrorControlInternal_h +#ifndef vtk_m_cont_ErrorInternal_h +#define vtk_m_cont_ErrorInternal_h -#include +#include namespace vtkm { namespace cont { @@ -29,14 +29,14 @@ namespace cont { /// be reached. This error usually indicates a bug in vtkm or, at best, VTKm /// failed to detect an invalid input it should have. /// -class VTKM_ALWAYS_EXPORT ErrorControlInternal : public ErrorControl +class VTKM_ALWAYS_EXPORT ErrorInternal : public Error { public: - ErrorControlInternal(const std::string &message) - : ErrorControl(message) { } + ErrorInternal(const std::string &message) + : Error(message) { } }; } } // namespace vtkm::cont -#endif //vtk_m_cont_ErrorControlInternal_h +#endif //vtk_m_cont_ErrorInternal_h diff --git a/vtkm/cont/Storage.h b/vtkm/cont/Storage.h index 538c140e710fefc2d7c5ea2e98ea0971e18536fb..4f2fe949820ae0c47c83cd11ce411dff5c06f3c6 100644 --- a/vtkm/cont/Storage.h +++ b/vtkm/cont/Storage.h @@ -132,8 +132,8 @@ public: /// /// The allocation may be done on an already existing array, but can wipe out /// any data already in the array. This method can throw - /// ErrorControlBadAllocation if the array cannot be allocated or - /// ErrorControlBadValue if the allocation is not feasible (for example, the + /// ErrorBadAllocation if the array cannot be allocated or + /// ErrorBadValue if the allocation is not feasible (for example, the /// array storage is read-only). /// VTKM_CONT diff --git a/vtkm/cont/StorageBasic.h b/vtkm/cont/StorageBasic.h index 69614b391012500f8ccb906149e12d35434b1187..aab94ea9730cb79ec05618c8544738e1eb871075 100755 --- a/vtkm/cont/StorageBasic.h +++ b/vtkm/cont/StorageBasic.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/vtkm/cont/StorageBasic.hxx b/vtkm/cont/StorageBasic.hxx index 356f262c69558a3bfff5aff2a78da41532d860c0..ec3056edf600c09dbb376490f044a2f2abd4dbaa 100644 --- a/vtkm/cont/StorageBasic.hxx +++ b/vtkm/cont/StorageBasic.hxx @@ -48,7 +48,7 @@ Storage::Storage(const Storage::operator=(const Storage::Allocate(vtkm::Id numberOfValues) if(this->UserProvidedMemory) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "User allocated arrays cannot be reallocated."); } @@ -134,7 +134,7 @@ void Storage::Allocate(vtkm::Id numberOfValues) this->Array = nullptr; this->NumberOfValues = 0; this->AllocatedSize = 0; - throw vtkm::cont::ErrorControlBadAllocation( + throw vtkm::cont::ErrorBadAllocation( "Could not allocate basic control array."); } @@ -147,7 +147,7 @@ void Storage::Shrink(vtkm::Id numberOfValues) { if (numberOfValues > this->GetNumberOfValues()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Shrink method cannot be used to grow array."); } diff --git a/vtkm/cont/StorageImplicit.h b/vtkm/cont/StorageImplicit.h index 773cbd7ff527ba75ae06657b241f7fb985734507..5b98630da3bfe65d1ed001555f0fec28c46292be 100644 --- a/vtkm/cont/StorageImplicit.h +++ b/vtkm/cont/StorageImplicit.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -74,7 +74,7 @@ public: VTKM_CONT PortalType GetPortal() { - throw vtkm::cont::ErrorControlBadValue("Implicit arrays are read-only."); + throw vtkm::cont::ErrorBadValue("Implicit arrays are read-only."); } VTKM_CONT PortalConstType GetPortalConst() const @@ -89,12 +89,12 @@ public: VTKM_CONT void Allocate(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadValue("Implicit arrays are read-only."); + throw vtkm::cont::ErrorBadValue("Implicit arrays are read-only."); } VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadValue("Implicit arrays are read-only."); + throw vtkm::cont::ErrorBadValue("Implicit arrays are read-only."); } VTKM_CONT void ReleaseResources() @@ -138,20 +138,20 @@ public: VTKM_CONT PortalExecution PrepareForInPlace(bool vtkmNotUsed(updateData)) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Implicit arrays cannot be used for output or in place."); } VTKM_CONT PortalExecution PrepareForOutput(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Implicit arrays cannot be used for output."); } VTKM_CONT void RetrieveOutputData(StorageType *vtkmNotUsed(controlArray)) const { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Implicit arrays cannot be used for output."); } @@ -169,7 +169,7 @@ public: VTKM_CONT void Shrink(vtkm::Id vtkmNotUsed(numberOfValues)) { - throw vtkm::cont::ErrorControlBadValue("Implicit arrays cannot be resized."); + throw vtkm::cont::ErrorBadValue("Implicit arrays cannot be resized."); } VTKM_CONT diff --git a/vtkm/cont/TryExecute.h b/vtkm/cont/TryExecute.h index c02dd29784f3b0999be0249c70af4e31713158c0..3ca9f1290fd7a00c5cf92ea0e84eb4ca900afbdc 100644 --- a/vtkm/cont/TryExecute.h +++ b/vtkm/cont/TryExecute.h @@ -21,9 +21,9 @@ #define vtk_m_cont_TryExecute_h #include -#include -#include -#include +#include +#include +#include #include @@ -59,24 +59,24 @@ struct TryExecuteRunIfValid { return functor(Device()); } - catch(vtkm::cont::ErrorControlBadAllocation e) + catch(vtkm::cont::ErrorBadAllocation e) { - std::cerr << "caught ErrorControlBadAllocation " << e.GetMessage() << std::endl; + std::cerr << "caught ErrorBadAllocation " << e.GetMessage() << std::endl; //currently we only consider OOM errors worth disabling a device for //than we fallback to another device tracker.ReportAllocationFailure(Device(), e); } - catch(vtkm::cont::ErrorControlBadType e) + catch(vtkm::cont::ErrorBadType e) { //should bad type errors should stop the execution, instead of //deferring to another device adapter? - std::cerr << "caught ErrorControlBadType : " << e.GetMessage() << std::endl; + std::cerr << "caught ErrorBadType : " << e.GetMessage() << std::endl; } - catch(vtkm::cont::ErrorControlBadValue e) + catch(vtkm::cont::ErrorBadValue e) { //should bad value errors should stop the filter, instead of deferring //to another device adapter? - std::cerr << "caught ErrorControlBadValue : " << e.GetMessage() << std::endl; + std::cerr << "caught ErrorBadValue : " << e.GetMessage() << std::endl; } catch(vtkm::cont::Error e) { diff --git a/vtkm/cont/arg/TransportTagArrayIn.h b/vtkm/cont/arg/TransportTagArrayIn.h index 5e81099c828efa427546122e1a249ccb4512ba01..d2cecd461bcff719c941958d5df93f60f6f49081 100644 --- a/vtkm/cont/arg/TransportTagArrayIn.h +++ b/vtkm/cont/arg/TransportTagArrayIn.h @@ -56,7 +56,7 @@ struct Transport if (object.GetNumberOfValues() != inputDomain.GetNumberOfValues()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Input array to worklet invocation the wrong size."); } diff --git a/vtkm/cont/arg/TransportTagArrayInOut.h b/vtkm/cont/arg/TransportTagArrayInOut.h index 6cb3609c60e599d4e007dd32125bda7de6a6cfd4..8cb97f904da416386ad218b8deaeaad2b099663e 100644 --- a/vtkm/cont/arg/TransportTagArrayInOut.h +++ b/vtkm/cont/arg/TransportTagArrayInOut.h @@ -56,7 +56,7 @@ struct Transport -#include -#include +#include +#include #include #ifdef VTKM_CUDA @@ -83,14 +83,14 @@ public: VTKM_CONT ValueType Get(vtkm::Id index) const { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandleCuda only provides access to the device pointer."); } VTKM_CONT void Set(vtkm::Id vtkmNotUsed(index), T vtkmNotUsed(value)) const { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "ArrayHandleCuda only provides access to the device pointer."); } @@ -155,7 +155,7 @@ public: void Allocate(vtkm::Id size) { if (!this->OwnsResources()) - throw vtkm::cont::ErrorControlBadAllocation( + throw vtkm::cont::ErrorBadAllocation( "ArrayHandleCuda does not own its internal device memory."); if (NumberOfValues != 0) @@ -178,7 +178,7 @@ public: void ReleaseResources() { if (!this->OwnsResources()) - throw vtkm::cont::ErrorControlBadAllocation( + throw vtkm::cont::ErrorBadAllocation( "ArrayHandleCuda does not own its internal device memory."); if (this->NumberOfValues) diff --git a/vtkm/cont/cuda/CMakeLists.txt b/vtkm/cont/cuda/CMakeLists.txt index e4c3c6c690812ec65d52a03e21f4bc192be74ac7..65d786bdb654875103ab081a870925cfa07765a0 100644 --- a/vtkm/cont/cuda/CMakeLists.txt +++ b/vtkm/cont/cuda/CMakeLists.txt @@ -22,7 +22,7 @@ set(headers ArrayHandleCuda.h ChooseCudaDevice.h DeviceAdapterCuda.h - ErrorControlCuda.h + ErrorCuda.h ) #----------------------------------------------------------------------------- diff --git a/vtkm/cont/cuda/ChooseCudaDevice.h b/vtkm/cont/cuda/ChooseCudaDevice.h index 381373a27be52337cb9a1c2015ad7ab8fe1b432b..67653932176bfbfafc76b77e5ed3548c03d2afef 100644 --- a/vtkm/cont/cuda/ChooseCudaDevice.h +++ b/vtkm/cont/cuda/ChooseCudaDevice.h @@ -22,7 +22,7 @@ #include -#include +#include #include #include diff --git a/vtkm/cont/cuda/ErrorControlCuda.h b/vtkm/cont/cuda/ErrorCuda.h similarity index 82% rename from vtkm/cont/cuda/ErrorControlCuda.h rename to vtkm/cont/cuda/ErrorCuda.h index a15b2a69f72bdbf6d73e553c7e6e393a86b42e03..e2c02476fbefdbc19144a6bc792a518cf29678cf 100644 --- a/vtkm/cont/cuda/ErrorControlCuda.h +++ b/vtkm/cont/cuda/ErrorCuda.h @@ -17,18 +17,18 @@ // Laboratory (LANL), the U.S. Government retains certain rights in // this software. //============================================================================ -#ifndef vtk_m_cont_cuda_ErrorControlCuda_h -#define vtk_m_cont_cuda_ErrorControlCuda_h +#ifndef vtk_m_cont_cuda_ErrorCuda_h +#define vtk_m_cont_cuda_ErrorCuda_h #include -#include +#include #include #include /// A macro that can be used to check to see if there are any unchecked -/// CUDA errors. Will throw an ErrorControlCuda if there are. +/// CUDA errors. Will throw an ErrorCuda if there are. /// #define VTKM_CUDA_CHECK_ASYNCHRONOUS_ERROR() \ VTKM_SWALLOW_SEMICOLON_PRE_BLOCK \ @@ -36,7 +36,7 @@ const cudaError_t vtkm_cuda_check_async_error = cudaGetLastError(); \ if (vtkm_cuda_check_async_error != cudaSuccess) \ { \ - throw ::vtkm::cont::cuda::ErrorControlCuda( \ + throw ::vtkm::cont::cuda::ErrorCuda( \ vtkm_cuda_check_async_error, \ __FILE__, \ __LINE__, \ @@ -46,7 +46,7 @@ VTKM_SWALLOW_SEMICOLON_POST_BLOCK /// A macro that can be wrapped around a CUDA command and will throw an -/// ErrorControlCuda exception if the CUDA command fails. +/// ErrorCuda exception if the CUDA command fails. /// #define VTKM_CUDA_CALL(command) \ VTKM_CUDA_CHECK_ASYNCHRONOUS_ERROR(); \ @@ -55,7 +55,7 @@ const cudaError_t vtkm_cuda_call_error = command; \ if (vtkm_cuda_call_error != cudaSuccess) \ { \ - throw ::vtkm::cont::cuda::ErrorControlCuda(vtkm_cuda_call_error, \ + throw ::vtkm::cont::cuda::ErrorCuda(vtkm_cuda_call_error, \ __FILE__, \ __LINE__, \ #command); \ @@ -70,17 +70,17 @@ namespace cuda { /// This error is thrown whenever an unidentified CUDA runtime error is /// encountered. /// -class VTKM_ALWAYS_EXPORT ErrorControlCuda : public vtkm::cont::ErrorControl +class VTKM_ALWAYS_EXPORT ErrorCuda : public vtkm::cont::Error { public: - ErrorControlCuda(cudaError_t error) + ErrorCuda(cudaError_t error) { std::stringstream message; message << "CUDA Error: " << cudaGetErrorString(error); this->SetMessage(message.str()); } - ErrorControlCuda(cudaError_t error, + ErrorCuda(cudaError_t error, const std::string &file, vtkm::Id line, const std::string &description) @@ -96,4 +96,4 @@ public: } } // namespace vtkm::cont:cuda -#endif //vtk_m_cont_cuda_ErrorControlCuda_h +#endif //vtk_m_cont_cuda_ErrorCuda_h diff --git a/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h b/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h index 7ee2ea07d941e08590e1c62a199d41dda49e1a46..c7496bc33d7e329f7d4bbe1d89daeaecde57e146 100644 --- a/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h +++ b/vtkm/cont/cuda/internal/ArrayManagerExecutionCuda.h @@ -60,7 +60,7 @@ public: // with nvcc 7.5. return this->Superclass::template _PrepareForInput(updateData); } - catch (vtkm::cont::ErrorControlBadAllocation error) + catch (vtkm::cont::ErrorBadAllocation error) { // Thrust does not seem to be clearing the CUDA error, so do it here. cudaError_t cudaError = cudaPeekAtLastError(); @@ -81,7 +81,7 @@ public: // with nvcc 7.5. return this->Superclass::template _PrepareForInPlace(updateData); } - catch (vtkm::cont::ErrorControlBadAllocation error) + catch (vtkm::cont::ErrorBadAllocation error) { // Thrust does not seem to be clearing the CUDA error, so do it here. cudaError_t cudaError = cudaPeekAtLastError(); @@ -102,7 +102,7 @@ public: // with nvcc 7.5. return this->Superclass::template _PrepareForOutput(numberOfValues); } - catch (vtkm::cont::ErrorControlBadAllocation error) + catch (vtkm::cont::ErrorBadAllocation error) { // Thrust does not seem to be clearing the CUDA error, so do it here. cudaError_t cudaError = cudaPeekAtLastError(); diff --git a/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h b/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h index 9a7e3867571b44fd7f1549016fb3b17714175aee..3c2bc93856351c33ed52c96dbf2a6992aa64caa3 100644 --- a/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h +++ b/vtkm/cont/cuda/internal/ArrayManagerExecutionThrustDevice.h @@ -21,7 +21,7 @@ #define vtk_m_cont_cuda_internal_ArrayManagerExecutionThrustDevice_h #include -#include +#include #include // Disable warnings we check vtkm for but Thrust does not. @@ -34,7 +34,7 @@ VTKM_THIRDPARTY_PRE_INCLUDE VTKM_THIRDPARTY_POST_INCLUDE -#include +#include #include #include @@ -164,7 +164,7 @@ public: std::ostringstream err; err << "Failed to allocate " << numberOfValues << " values on device: " << "Number of bytes is not representable by std::size_t."; - throw vtkm::cont::ErrorControlBadAllocation(err.str()); + throw vtkm::cont::ErrorBadAllocation(err.str()); } this->ReleaseResources(); @@ -183,7 +183,7 @@ public: std::ostringstream err; err << "Failed to allocate " << bufferSize << " bytes on device: " << error.what(); - throw vtkm::cont::ErrorControlBadAllocation(err.str()); + throw vtkm::cont::ErrorBadAllocation(err.str()); } this->Capacity = PointerType(this->Begin.get() + diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h index ce00058e09ee3a42506e239aff1534765bb8e7c0..2dccd6b19b6c367b1de09e0ecf4d7db91514abcb 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_cuda_internal_DeviceAdapterAlgorithmCuda_h #define vtk_m_cont_cuda_internal_DeviceAdapterAlgorithmCuda_h -#include +#include #include #include diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h index 5ce4edc20b3dd92dad6c2f14feac1722af9bc066..33b5fcb9674009205a45ba0f574f20a3930f7644 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/cont/cuda/internal/ThrustExceptionHandler.h b/vtkm/cont/cuda/internal/ThrustExceptionHandler.h index 68f9bc8e7f12bec3a6442e693d8e010cdc80d0f5..a0195dca6f6c63a36c049119dc499398d9102d6e 100644 --- a/vtkm/cont/cuda/internal/ThrustExceptionHandler.h +++ b/vtkm/cont/cuda/internal/ThrustExceptionHandler.h @@ -21,7 +21,7 @@ #define vtk_m_cont_cuda_interal_ThrustExecptionHandler_h #include -#include +#include #include VTKM_THIRDPARTY_PRE_INCLUDE @@ -43,7 +43,7 @@ static inline void throwAsVTKmException() } catch(std::bad_alloc &error) { - throw vtkm::cont::ErrorControlBadAllocation(error.what()); + throw vtkm::cont::ErrorBadAllocation(error.what()); } catch(thrust::system_error &error) { diff --git a/vtkm/cont/internal/ArrayHandleExecutionManager.h b/vtkm/cont/internal/ArrayHandleExecutionManager.h index 83227b3566514990f351775f94b8071ff417bda3..22e2be4ed581241502981585760c3629b2884889 100644 --- a/vtkm/cont/internal/ArrayHandleExecutionManager.h +++ b/vtkm/cont/internal/ArrayHandleExecutionManager.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_exec_ArrayHandleExecutionManager_h #define vtk_m_cont_exec_ArrayHandleExecutionManager_h -#include +#include #include #include @@ -192,7 +192,7 @@ private: { if (!this->IsDeviceAdapter(device)) { - throw vtkm::cont::ErrorControlInternal("Device Adapter Mismatch"); + throw vtkm::cont::ErrorInternal("Device Adapter Mismatch"); } } }; diff --git a/vtkm/cont/internal/ArrayPortalFromIterators.h b/vtkm/cont/internal/ArrayPortalFromIterators.h index 389d82e360b0e35427190557a58c91978159f301..40f5a2bf322bb04a01bea795b0ca91d3a6f560c5 100755 --- a/vtkm/cont/internal/ArrayPortalFromIterators.h +++ b/vtkm/cont/internal/ArrayPortalFromIterators.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -65,7 +65,7 @@ public: #ifndef VTKM_USE_64BIT_IDS if (numberOfValues > (std::numeric_limits::max)()) { - throw vtkm::cont::ErrorControlBadAllocation( + throw vtkm::cont::ErrorBadAllocation( "Distance of iterators larger than maximum array size. " "To support larger arrays, try turning on VTKM_USE_64BIT_IDS."); } @@ -149,7 +149,7 @@ public: #ifndef VTKM_USE_64BIT_IDS if (numberOfValues > (std::numeric_limits::max)()) { - throw vtkm::cont::ErrorControlBadAllocation( + throw vtkm::cont::ErrorBadAllocation( "Distance of iterators larger than maximum array size. " "To support larger arrays, try turning on VTKM_USE_64BIT_IDS."); } diff --git a/vtkm/cont/internal/ConnectivityExplicitInternals.h b/vtkm/cont/internal/ConnectivityExplicitInternals.h index 73ae03960c764d6c4044c3b93536521abcf7cd74..20e20706caf2558154bdf958008b3f7fe2ba9c44 100644 --- a/vtkm/cont/internal/ConnectivityExplicitInternals.h +++ b/vtkm/cont/internal/ConnectivityExplicitInternals.h @@ -133,7 +133,7 @@ struct ConnectivityExplicitInternals { if (!this->IndexOffsetsValid) { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "Cannot build indices using the error device. Must be created previously."); } } diff --git a/vtkm/cont/internal/RuntimeDeviceTracker.h b/vtkm/cont/internal/RuntimeDeviceTracker.h index 3e3886ba26b7309f12b678f3f2be0d0a8e17f7aa..edae02808ef290574c1f2a453a44600574c65b75 100644 --- a/vtkm/cont/internal/RuntimeDeviceTracker.h +++ b/vtkm/cont/internal/RuntimeDeviceTracker.h @@ -20,7 +20,7 @@ #ifndef vtk_m_cont_internal_RuntimeDeviceTracker_h #define vtk_m_cont_internal_RuntimeDeviceTracker_h -#include +#include #include #include @@ -67,7 +67,7 @@ public: template VTKM_CONT void ReportAllocationFailure(DeviceAdapterTag, - const vtkm::cont::ErrorControlBadAllocation&) + const vtkm::cont::ErrorBadAllocation&) { typedef vtkm::cont::DeviceAdapterTraits Traits; this->RuntimeValid[ Traits::GetId() ] = false; diff --git a/vtkm/cont/testing/TestingDataSetExplicit.h b/vtkm/cont/testing/TestingDataSetExplicit.h index 20aef3a7c49a11022ea6e384d8b82fad9c931b9d..0b34f14a6bc14560541eea120fc10fea823e3e2c 100644 --- a/vtkm/cont/testing/TestingDataSetExplicit.h +++ b/vtkm/cont/testing/TestingDataSetExplicit.h @@ -90,7 +90,7 @@ private: ds.GetField("cellvar", vtkm::cont::Field::ASSOC_POINTS); VTKM_TEST_FAIL("Failed to get expected error for association mismatch."); } - catch (vtkm::cont::ErrorControlBadValue error) + catch (vtkm::cont::ErrorBadValue error) { std::cout << "Caught expected error for association mismatch: " << std::endl << " " << error.GetMessage() << std::endl; diff --git a/vtkm/cont/testing/TestingDeviceAdapter.h b/vtkm/cont/testing/TestingDeviceAdapter.h index 6f9b9f497c920f5c97d8cb3a290b6d986fe1b23a..ccf85e7658b0dae23da8a9912d0924d8ee54a995 100644 --- a/vtkm/cont/testing/TestingDeviceAdapter.h +++ b/vtkm/cont/testing/TestingDeviceAdapter.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -423,7 +423,7 @@ private: "or the width of vtkm::Id is not large enough to express all " "array sizes."); } - catch (vtkm::cont::ErrorControlBadAllocation error) + catch (vtkm::cont::ErrorBadAllocation error) { std::cout << "Got the expected error: " << error.GetMessage() << std::endl; } diff --git a/vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx b/vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx index 5697982990a69e334ec2f98a8c05a1168df9aa0c..b77dc6972c2b3bc914f9087b026c6af988bead07 100644 --- a/vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx +++ b/vtkm/cont/testing/UnitTestArrayHandleCompositeVector.cxx @@ -331,7 +331,7 @@ void TestBadArrayLengths() { vtkm::cont::make_ArrayHandleCompositeVector(longInArray,0, shortInArray,0); VTKM_TEST_FAIL("Did not get exception like expected."); } - catch (vtkm::cont::ErrorControlBadValue error) + catch (vtkm::cont::ErrorBadValue error) { std::cout << "Got expected error: " << std::endl << error.GetMessage() << std::endl; diff --git a/vtkm/cont/testing/UnitTestDynamicArrayHandle.cxx b/vtkm/cont/testing/UnitTestDynamicArrayHandle.cxx index c82b26b9bd394ceb3327184649791e1be390b518..161fcab07ea87648a0c4fb38635583989282e64d 100644 --- a/vtkm/cont/testing/UnitTestDynamicArrayHandle.cxx +++ b/vtkm/cont/testing/UnitTestDynamicArrayHandle.cxx @@ -263,7 +263,7 @@ void TryUnusualType() CheckDynamicArray(array, 1); VTKM_TEST_FAIL("CastAndCall failed to error for unrecognized type."); } - catch (vtkm::cont::ErrorControlBadValue) + catch (vtkm::cont::ErrorBadValue) { std::cout << " Caught exception for unrecognized type." << std::endl; } @@ -285,7 +285,7 @@ void TryUnusualStorage() CheckDynamicArray(array, 1); VTKM_TEST_FAIL("CastAndCall failed to error for unrecognized storage."); } - catch (vtkm::cont::ErrorControlBadValue) + catch (vtkm::cont::ErrorBadValue) { std::cout << " Caught exception for unrecognized storage." << std::endl; } @@ -306,7 +306,7 @@ void TryUnusualTypeAndStorage() VTKM_TEST_FAIL( "CastAndCall failed to error for unrecognized type/storage."); } - catch (vtkm::cont::ErrorControlBadValue) + catch (vtkm::cont::ErrorBadValue) { std::cout << " Caught exception for unrecognized type/storage." << std::endl; @@ -317,7 +317,7 @@ void TryUnusualTypeAndStorage() CheckDynamicArray(array.ResetTypeList(TypeListTagString()), 1); VTKM_TEST_FAIL("CastAndCall failed to error for unrecognized storage."); } - catch (vtkm::cont::ErrorControlBadValue) + catch (vtkm::cont::ErrorBadValue) { std::cout << " Caught exception for unrecognized storage." << std::endl; } @@ -327,7 +327,7 @@ void TryUnusualTypeAndStorage() CheckDynamicArray(array.ResetStorageList(StorageListTagUnusual()), 1); VTKM_TEST_FAIL("CastAndCall failed to error for unrecognized type."); } - catch (vtkm::cont::ErrorControlBadValue) + catch (vtkm::cont::ErrorBadValue) { std::cout << " Caught exception for unrecognized type." << std::endl; } @@ -339,7 +339,7 @@ void TryUnusualTypeAndStorage() StorageListTagUnusual()), 1); } - catch (vtkm::cont::ErrorControlBadValue) + catch (vtkm::cont::ErrorBadValue) { VTKM_TEST_FAIL("ResetTypeAndStorageLists should have handled the custom type/storage."); } diff --git a/vtkm/cont/testing/UnitTestStorageBasic.cxx b/vtkm/cont/testing/UnitTestStorageBasic.cxx index 939767f9dc9e823fcbf30c37d028e3e1bf092541..c8495818bfe9cf5658780312ef97b5cb2d9e297c 100644 --- a/vtkm/cont/testing/UnitTestStorageBasic.cxx +++ b/vtkm/cont/testing/UnitTestStorageBasic.cxx @@ -182,7 +182,7 @@ struct TemplatedTests VTKM_TEST_ASSERT(true==false, "Array shrink do a larger size was possible. This can't be allowed."); } - catch(vtkm::cont::ErrorControlBadValue) {} + catch(vtkm::cont::ErrorBadValue) {} } void operator()() diff --git a/vtkm/cont/testing/UnitTestStorageImplicit.cxx b/vtkm/cont/testing/UnitTestStorageImplicit.cxx index c4d9ba8e5f974e126d7a6f59b4fade8deabb3470..4c6c1de95911c89e985012f6f70b9e66f1b28b69 100644 --- a/vtkm/cont/testing/UnitTestStorageImplicit.cxx +++ b/vtkm/cont/testing/UnitTestStorageImplicit.cxx @@ -85,7 +85,7 @@ struct TemplatedTests VTKM_TEST_ASSERT(false == true, "Implicit Storage Allocate method didn't throw error."); } - catch(vtkm::cont::ErrorControlBadValue e) {} + catch(vtkm::cont::ErrorBadValue e) {} try { @@ -93,7 +93,7 @@ struct TemplatedTests VTKM_TEST_ASSERT(true==false, "Array shrink do a larger size was possible. This can't be allowed."); } - catch(vtkm::cont::ErrorControlBadValue) {} + catch(vtkm::cont::ErrorBadValue) {} //verify that calling ReleaseResources doesn't throw an exception arrayStorage.ReleaseResources(); diff --git a/vtkm/filter/FilterDataSet.hxx b/vtkm/filter/FilterDataSet.hxx index b29a0e9c282109ff05c7d29e5c1a45932abb0f27..aa955096c43448d985bf3a7bf65df0d375500ff3 100644 --- a/vtkm/filter/FilterDataSet.hxx +++ b/vtkm/filter/FilterDataSet.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/filter/FilterDataSetWithField.hxx b/vtkm/filter/FilterDataSetWithField.hxx index 9282487f1d0c3c021ce4692645c4114551c2fa72..cbbc502d1538bcdeaf212664ab5b90e3d0b06128 100644 --- a/vtkm/filter/FilterDataSetWithField.hxx +++ b/vtkm/filter/FilterDataSetWithField.hxx @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/filter/FilterField.hxx b/vtkm/filter/FilterField.hxx index 4c0a22b2de5040a95a1cee3f2df6aab82bff48f4..6176bd35c795ee8694c5bcb738dfac89879b392b 100644 --- a/vtkm/filter/FilterField.hxx +++ b/vtkm/filter/FilterField.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/vtkm/interop/cuda/internal/TransferToOpenGL.h b/vtkm/interop/cuda/internal/TransferToOpenGL.h index 4967cbe9af7c979abb6e6ef97b20ea30ed3b2dde..0defa02a65bceb326fc7796d750a66bba7321c9e 100644 --- a/vtkm/interop/cuda/internal/TransferToOpenGL.h +++ b/vtkm/interop/cuda/internal/TransferToOpenGL.h @@ -21,7 +21,7 @@ #define vtkm_interop_cuda_internal_TransferToOpenGL_h #include -#include +#include #include #include @@ -91,7 +91,7 @@ public: cudaError_t cError =cudaGraphicsMapResources(1,&this->CudaResource); if(cError != cudaSuccess) { - throw vtkm::cont::ErrorControlBadAllocation( + throw vtkm::cont::ErrorBadAllocation( "Could not allocate enough memory in CUDA for OpenGL interop."); } } diff --git a/vtkm/interop/testing/TestingOpenGLInterop.h b/vtkm/interop/testing/TestingOpenGLInterop.h index 108187ef8130133027c146984c27327be5ad8ec5..5b16fec41c6cc541187196a86cb3de4bd72170f4 100644 --- a/vtkm/interop/testing/TestingOpenGLInterop.h +++ b/vtkm/interop/testing/TestingOpenGLInterop.h @@ -77,13 +77,13 @@ private: vtkm::interop::BufferState state(handle); vtkm::interop::TransferToOpenGL(array, state, DeviceAdapterTag()); } - catch (vtkm::cont::ErrorControlBadAllocation error) + catch (vtkm::cont::ErrorBadAllocation error) { std::cout << error.GetMessage() << std::endl; VTKM_TEST_ASSERT(true==false, "Got an unexpected Out Of Memory error transferring to openGL"); } - catch (vtkm::cont::ErrorControlBadValue bvError) + catch (vtkm::cont::ErrorBadValue bvError) { std::cout << bvError.GetMessage() << std::endl; VTKM_TEST_ASSERT(true==false, @@ -100,13 +100,13 @@ private: vtkm::interop::BufferState state(handle, type); vtkm::interop::TransferToOpenGL(array, state, DeviceAdapterTag()); } - catch (vtkm::cont::ErrorControlBadAllocation error) + catch (vtkm::cont::ErrorBadAllocation error) { std::cout << error.GetMessage() << std::endl; VTKM_TEST_ASSERT(true==false, "Got an unexpected Out Of Memory error transferring to openGL"); } - catch (vtkm::cont::ErrorControlBadValue bvError) + catch (vtkm::cont::ErrorBadValue bvError) { std::cout << bvError.GetMessage() << std::endl; VTKM_TEST_ASSERT(true==false, diff --git a/vtkm/io/writer/VTKDataSetWriter.h b/vtkm/io/writer/VTKDataSetWriter.h index c70e7fc1205a537e9392d22fcc1f0ecdc61a2cff..3a6deb1115b834135f96ba4afbb8ad6fd4e829cd 100644 --- a/vtkm/io/writer/VTKDataSetWriter.h +++ b/vtkm/io/writer/VTKDataSetWriter.h @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -371,7 +371,7 @@ private: } else { - throw vtkm::cont::ErrorControlBadType( + throw vtkm::cont::ErrorBadType( "Could not determine type to write out."); } @@ -399,14 +399,14 @@ public: } else { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Selected invalid cell set index."); } } if (dataSet.GetNumberOfCoordinateSystems() < 1) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "DataSet has no coordinate system, which is not supported by VTK file format."); } diff --git a/vtkm/rendering/AxisAnnotation.cxx b/vtkm/rendering/AxisAnnotation.cxx index a49208eaf58d4e40c32a6d9da2307c96d12602b6..7f94002d4f83cece44c5880b911ed6ba7589eccf 100644 --- a/vtkm/rendering/AxisAnnotation.cxx +++ b/vtkm/rendering/AxisAnnotation.cxx @@ -20,7 +20,7 @@ #include -#include +#include namespace vtkm { namespace rendering { diff --git a/vtkm/rendering/CanvasEGL.cxx b/vtkm/rendering/CanvasEGL.cxx index 928da8acc8d060de240436e6d737c2a5453f918a..7e379ef64ae9c5f3208b84f216eb8b108e97cb58 100644 --- a/vtkm/rendering/CanvasEGL.cxx +++ b/vtkm/rendering/CanvasEGL.cxx @@ -60,12 +60,12 @@ void CanvasEGL::Initialize() this->Internals->Display = eglGetDisplay(EGL_DEFAULT_DISPLAY); if (!(this->Internals->Display)) { - throw vtkm::cont::ErrorControlBadValue("Failed to get EGL display"); + throw vtkm::cont::ErrorBadValue("Failed to get EGL display"); } EGLint major, minor; if (!(eglInitialize(this->Internals->Display, &major, &minor))) { - throw vtkm::cont::ErrorControlBadValue("Failed to initialize EGL display"); + throw vtkm::cont::ErrorBadValue("Failed to initialize EGL display"); } const EGLint cfgAttrs[] = @@ -84,7 +84,7 @@ void CanvasEGL::Initialize() if (!(eglChooseConfig(this->Internals->Display, cfgAttrs, &cfg, 1, &nCfgs)) || (nCfgs == 0)) { - throw vtkm::cont::ErrorControlBadValue("Failed to get EGL config"); + throw vtkm::cont::ErrorBadValue("Failed to get EGL config"); } const EGLint pbAttrs[] = @@ -98,21 +98,21 @@ void CanvasEGL::Initialize() eglCreatePbufferSurface(this->Internals->Display, cfg, pbAttrs); if (!this->Internals->Surface) { - throw vtkm::cont::ErrorControlBadValue("Failed to create EGL PBuffer surface"); + throw vtkm::cont::ErrorBadValue("Failed to create EGL PBuffer surface"); } eglBindAPI(EGL_OPENGL_API); this->Internals->Context = eglCreateContext(this->Internals->Display, cfg, EGL_NO_CONTEXT, NULL); if (!this->Internals->Context) { - throw vtkm::cont::ErrorControlBadValue("Failed to create EGL context"); + throw vtkm::cont::ErrorBadValue("Failed to create EGL context"); } if (!(eglMakeCurrent(this->Internals->Display, this->Internals->Surface, this->Internals->Surface, this->Internals->Context))) { - throw vtkm::cont::ErrorControlBadValue("Failed to create EGL context current"); + throw vtkm::cont::ErrorBadValue("Failed to create EGL context current"); } } diff --git a/vtkm/rendering/CanvasOSMesa.cxx b/vtkm/rendering/CanvasOSMesa.cxx index f9c97492817091af3b1d049044c412d34fb5bd55..626c9dc439692c29524759883482bb37302fb2eb 100644 --- a/vtkm/rendering/CanvasOSMesa.cxx +++ b/vtkm/rendering/CanvasOSMesa.cxx @@ -68,7 +68,7 @@ void CanvasOSMesa::Initialize() if (!this->Internals->Context) { - throw vtkm::cont::ErrorControlBadValue("OSMesa context creation failed."); + throw vtkm::cont::ErrorBadValue("OSMesa context creation failed."); } vtkm::Vec *colorBuffer = this->GetColorBuffer().GetStorage().GetArray(); @@ -78,7 +78,7 @@ void CanvasOSMesa::Initialize() static_cast(this->GetWidth()), static_cast(this->GetHeight()))) { - throw vtkm::cont::ErrorControlBadValue("OSMesa context activation failed."); + throw vtkm::cont::ErrorBadValue("OSMesa context activation failed."); } @@ -110,7 +110,7 @@ void CanvasOSMesa::Finish() static_cast(w)!=this->GetWidth() || static_cast(h)!=this->GetHeight()) { - throw vtkm::cont::ErrorControlBadValue("Wrong width/height in ZBuffer"); + throw vtkm::cont::ErrorBadValue("Wrong width/height in ZBuffer"); } vtkm::cont::ArrayHandle::PortalControl depthPortal = this->GetDepthBuffer().GetPortalControl(); diff --git a/vtkm/rendering/MapperGL.cxx b/vtkm/rendering/MapperGL.cxx index 1bb7e0f242abda47ca6560fcd903b073a010596f..52d5bcba6184651390555fa35c4859564a866090 100644 --- a/vtkm/rendering/MapperGL.cxx +++ b/vtkm/rendering/MapperGL.cxx @@ -310,7 +310,7 @@ void RenderTriangles(MapperGL &mapper, msg = std::string(strInfoLog); delete [] strInfoLog; } - throw vtkm::cont::ErrorControlBadValue("Shader compile error:"+msg); + throw vtkm::cont::ErrorBadValue("Shader compile error:"+msg); } GLuint fs = glCreateShader(GL_FRAGMENT_SHADER); @@ -333,7 +333,7 @@ void RenderTriangles(MapperGL &mapper, msg = std::string(strInfoLog); delete [] strInfoLog; } - throw vtkm::cont::ErrorControlBadValue("Shader compile error:"+msg); + throw vtkm::cont::ErrorBadValue("Shader compile error:"+msg); } mapper.shader_programme = glCreateProgram(); @@ -353,7 +353,7 @@ void RenderTriangles(MapperGL &mapper, GLsizei len; glGetProgramInfoLog(mapper.shader_programme, 2048, &len, log); std::string msg = std::string("Shader program link failed: ")+std::string(log); - throw vtkm::cont::ErrorControlBadValue(msg); + throw vtkm::cont::ErrorBadValue(msg); } } } @@ -471,7 +471,7 @@ void MapperGL::SetCanvas(vtkm::rendering::Canvas *c) { this->Canvas = dynamic_cast(c); if (this->Canvas == NULL) - throw vtkm::cont::ErrorControlBadValue("Bad canvas type for MapperGL. Must be CanvasGL"); + throw vtkm::cont::ErrorBadValue("Bad canvas type for MapperGL. Must be CanvasGL"); } } diff --git a/vtkm/rendering/MapperRayTracer.cxx b/vtkm/rendering/MapperRayTracer.cxx index 2459ac383f064efe1050a6369026189d0378f4d3..f9b0db2de860d31eee4936c08ab7e2b535d7d5d8 100644 --- a/vtkm/rendering/MapperRayTracer.cxx +++ b/vtkm/rendering/MapperRayTracer.cxx @@ -90,7 +90,7 @@ void MapperRayTracer::SetCanvas(vtkm::rendering::Canvas *canvas) this->Internals->Canvas = dynamic_cast(canvas); if(this->Internals->Canvas == nullptr) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Ray Tracer: bad canvas type. Must be CanvasRayTracer"); } } diff --git a/vtkm/rendering/MapperVolume.cxx b/vtkm/rendering/MapperVolume.cxx index a47a5d2e16eee6ad504235511ebdf144a1977bea..4c1f21b397178630533234d777b4bb785a6771ac 100644 --- a/vtkm/rendering/MapperVolume.cxx +++ b/vtkm/rendering/MapperVolume.cxx @@ -96,7 +96,7 @@ void MapperVolume::SetCanvas(vtkm::rendering::Canvas *canvas) this->Internals->Canvas = dynamic_cast(canvas); if(this->Internals->Canvas == nullptr) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Ray Tracer: bad canvas type. Must be CanvasRayTracer"); } } diff --git a/vtkm/rendering/Triangulator.h b/vtkm/rendering/Triangulator.h index f6dbe2b3e279532549a8a7e5c8a8677a51a0943a..a8be44552ae59009fea7b1d24c17df8d35117f77 100644 --- a/vtkm/rendering/Triangulator.h +++ b/vtkm/rendering/Triangulator.h @@ -553,12 +553,12 @@ public: } else { - throw vtkm::cont::ErrorControlBadType("Unsupported cell type for trianglulation with CellSetSingleType"); + throw vtkm::cont::ErrorBadType("Unsupported cell type for trianglulation with CellSetSingleType"); } } else { - throw vtkm::cont::ErrorControlBadType("Unsupported cell set type for trianglulation"); + throw vtkm::cont::ErrorBadType("Unsupported cell set type for trianglulation"); } //get rid of any triagles we cannot see diff --git a/vtkm/rendering/raytracing/Camera.h b/vtkm/rendering/raytracing/Camera.h index 4a384b21eadf2bbf935e7064850fdaff08c5d111..1635f6e49bd57039dfb74419d4e9141ab0f057ba 100644 --- a/vtkm/rendering/raytracing/Camera.h +++ b/vtkm/rendering/raytracing/Camera.h @@ -21,7 +21,7 @@ #define vtk_m_rendering_raytracing_Camera_h #include #include -#include +#include #include #include #include @@ -259,7 +259,7 @@ public: { if(height <= 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Camera height must be greater than zero."); } if(Height != height) @@ -281,7 +281,7 @@ public: { if(width <= 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Camera width must be greater than zero."); } if(this->Width != width) @@ -303,7 +303,7 @@ public: { if(zoom <= 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Camera zoom must be greater than zero."); } if(this->Zoom != zoom) @@ -324,12 +324,12 @@ public: { if(degrees <= 0) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Camera feild of view must be greater than zero."); } if(degrees > 180) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Camera feild of view must be less than 180."); } // fov is stored as a half angle @@ -421,13 +421,13 @@ public: { if(canvas == nullptr) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Camera can not write to nullptr canvas"); } if(this->Height != vtkm::Int32(canvas->GetHeight()) || this->Width != vtkm::Int32(canvas->GetWidth())) { - throw vtkm::cont::ErrorControlBadValue("Camera: suface-view mismatched dims"); + throw vtkm::cont::ErrorBadValue("Camera: suface-view mismatched dims"); } vtkm::worklet::DispatcherMapField< SurfaceConverter >( SurfaceConverter( this->Width, diff --git a/vtkm/rendering/raytracing/RayTracer.h b/vtkm/rendering/raytracing/RayTracer.h index 50fbd15157f90df9a6a33c4fbac33deaddbb2e78..86298841de67c3df13eba96eced780486fe9b37d 100644 --- a/vtkm/rendering/raytracing/RayTracer.h +++ b/vtkm/rendering/raytracing/RayTracer.h @@ -239,7 +239,7 @@ public: { bool isSupportedField = (scalarField->GetAssociation() == vtkm::cont::Field::ASSOC_POINTS || scalarField->GetAssociation() == vtkm::cont::Field::ASSOC_CELL_SET ); - if(!isSupportedField) throw vtkm::cont::ErrorControlBadValue("Feild not accociated with cell set or points"); + if(!isSupportedField) throw vtkm::cont::ErrorBadValue("Field not accociated with cell set or points"); bool isAssocPoints = scalarField->GetAssociation() == vtkm::cont::Field::ASSOC_POINTS; vtkm::worklet::DispatcherMapField< CalculateNormals >( CalculateNormals(bvh.LeafNodes) ) diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.h b/vtkm/rendering/raytracing/VolumeRendererStructured.h index 383673782d54207968285a64a551a56809b54165..9a6bee8bbbb527e7bb84fffcd4ef6f7e166a7926 100644 --- a/vtkm/rendering/raytracing/VolumeRendererStructured.h +++ b/vtkm/rendering/raytracing/VolumeRendererStructured.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include @@ -1000,7 +1000,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField Rays.MaxDistance); bool isSupportedField = (ScalarField->GetAssociation() == vtkm::cont::Field::ASSOC_POINTS || ScalarField->GetAssociation() == vtkm::cont::Field::ASSOC_CELL_SET ); - if(!isSupportedField) throw vtkm::cont::ErrorControlBadValue("Feild not accociated with cell set or points"); + if(!isSupportedField) throw vtkm::cont::ErrorBadValue("Field not accociated with cell set or points"); bool isAssocPoints = ScalarField->GetAssociation() == vtkm::cont::Field::ASSOC_POINTS; if(IsUniformDataSet) { @@ -1086,7 +1086,7 @@ class SamplerCellAssocRect : public vtkm::worklet::WorkletMapField void SetSampleDistance(const vtkm::Float32 & distance) { if(distance <= 0.f) - throw vtkm::cont::ErrorControlBadValue("Sample distance must be positive."); + throw vtkm::cont::ErrorBadValue("Sample distance must be positive."); SampleDistance = distance; } diff --git a/vtkm/worklet/Keys.h b/vtkm/worklet/Keys.h index 465c124bb786551dde401c8ca941e5c82f94a725..b3936dedd1ba6be8ed284762819e5ed9edd31083 100644 --- a/vtkm/worklet/Keys.h +++ b/vtkm/worklet/Keys.h @@ -361,7 +361,7 @@ struct Transport< { if (object.GetNumberOfValues() != inputDomain.GetInputRange()) { - throw vtkm::cont::ErrorControlBadValue( + throw vtkm::cont::ErrorBadValue( "Input array to worklet invocation the wrong size."); } diff --git a/vtkm/worklet/ScatterCounting.h b/vtkm/worklet/ScatterCounting.h index 507520835e208a92c71a333d5c1a2a393d66084d..aaa1d6204b151e2f136250d7915294653dc8a80c 100644 --- a/vtkm/worklet/ScatterCounting.h +++ b/vtkm/worklet/ScatterCounting.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include @@ -206,7 +206,7 @@ struct ScatterCounting << this->InputRange << " but used with a worklet invoke of size " << inputRange << std::endl; - throw vtkm::cont::ErrorControlBadValue(msg.str()); + throw vtkm::cont::ErrorBadValue(msg.str()); } return this->VisitArray.GetNumberOfValues(); } diff --git a/vtkm/worklet/TetrahedralizeUniformGrid.h b/vtkm/worklet/TetrahedralizeUniformGrid.h index 136e12c59bf53f097435c1f4e98f5942b7d2efb0..a4780e1d9dd160192eb906895f67558bbb186e02 100644 --- a/vtkm/worklet/TetrahedralizeUniformGrid.h +++ b/vtkm/worklet/TetrahedralizeUniformGrid.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/vtkm/worklet/Threshold.h b/vtkm/worklet/Threshold.h index 8e30e132cad8ee87eb36aae29952e29d24aaf2fc..0e203b3f82b723502b23a077ec99e304b9494b70 100644 --- a/vtkm/worklet/Threshold.h +++ b/vtkm/worklet/Threshold.h @@ -135,7 +135,7 @@ public: } default: - throw vtkm::cont::ErrorControlBadValue("Expecting point or cell field."); + throw vtkm::cont::ErrorBadValue("Expecting point or cell field."); } vtkm::cont::DeviceAdapterAlgorithm @@ -168,7 +168,7 @@ public: { if (field.GetAssociation() != vtkm::cont::Field::ASSOC_CELL_SET) { - throw vtkm::cont::ErrorControlBadValue("Expecting cell field."); + throw vtkm::cont::ErrorBadValue("Expecting cell field."); } vtkm::cont::DynamicArrayHandle data; diff --git a/vtkm/worklet/TriangulateUniformGrid.h b/vtkm/worklet/TriangulateUniformGrid.h index bc2b097531078483ad91fa4b74d1137fbb506d7d..a940b6c23f753d36f38d944f3f70cceaa555e948 100644 --- a/vtkm/worklet/TriangulateUniformGrid.h +++ b/vtkm/worklet/TriangulateUniformGrid.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/vtkm/worklet/WaveletCompressor.h b/vtkm/worklet/WaveletCompressor.h index 6a9f315400aca178e93042a290aa7fa8d5c6744d..73b2489596f9968ec63dfc5c71f7b1ac36150a9c 100644 --- a/vtkm/worklet/WaveletCompressor.h +++ b/vtkm/worklet/WaveletCompressor.h @@ -47,7 +47,7 @@ public: vtkm::Id sigInLen = sigIn.GetNumberOfValues(); if( nLevels < 0 || nLevels > WaveletBase::GetWaveletMaxLevel( sigInLen ) ) { - throw vtkm::cont::ErrorControlBadValue("Number of levels of transform is not supported! "); + throw vtkm::cont::ErrorBadValue("Number of levels of transform is not supported! "); } if( nLevels == 0 ) // 0 levels means no transform { @@ -171,7 +171,7 @@ public: if( nLevels < 0 || nLevels > WaveletBase::GetWaveletMaxLevel( inX ) || nLevels > WaveletBase::GetWaveletMaxLevel( inY ) ) { - throw vtkm::cont::ErrorControlBadValue("Number of levels of transform is not supported! "); + throw vtkm::cont::ErrorBadValue("Number of levels of transform is not supported! "); } if( nLevels == 0 ) // 0 levels means no transform { @@ -243,7 +243,7 @@ public: if( nLevels < 0 || nLevels > WaveletBase::GetWaveletMaxLevel( inX ) || nLevels > WaveletBase::GetWaveletMaxLevel( inY ) ) { - throw vtkm::cont::ErrorControlBadValue("Number of levels of transform is not supported! "); + throw vtkm::cont::ErrorBadValue("Number of levels of transform is not supported! "); } typedef typename OutArrayType::ValueType OutValueType; typedef vtkm::cont::ArrayHandle OutBasicArray; diff --git a/vtkm/worklet/internal/DispatcherBase.h b/vtkm/worklet/internal/DispatcherBase.h index 4b8a098337e1b6176932745570317a009f4efb91..7ba88f5ad59fad0c3e2bb96f51e981db583053f9 100644 --- a/vtkm/worklet/internal/DispatcherBase.h +++ b/vtkm/worklet/internal/DispatcherBase.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include @@ -62,7 +62,7 @@ inline void PrintFailureMessage(int index, std::false_type) message << "Encountered bad type for parameter " << index << " when calling Invoke on a dispatcher."; - throw vtkm::cont::ErrorControlBadType(message.str()); + throw vtkm::cont::ErrorBadType(message.str()); } // Is designed as a brigand fold operation. diff --git a/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx b/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx index 5ece10a9fff8ea1814c86440109f1f025a8a3158..d9625b2be4bcb13aaa98aa7aafafe2b907abd532 100644 --- a/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx +++ b/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx @@ -318,7 +318,7 @@ void TestInvokeWithDynamicAndBadTypes() dispatcher.Invoke(nullptr, execObject, array); VTKM_TEST_FAIL("Dispatcher did not throw expected error."); } - catch (vtkm::cont::ErrorControlBadType error) + catch (vtkm::cont::ErrorBadType error) { std::cout << " Got expected exception." << std::endl; std::cout << " " << error.GetMessage() << std::endl; @@ -332,7 +332,7 @@ void TestInvokeWithDynamicAndBadTypes() dispatcher.Invoke(array, execObject, nullptr); VTKM_TEST_FAIL("Dispatcher did not throw expected error."); } - catch (vtkm::cont::ErrorControlBadType error) + catch (vtkm::cont::ErrorBadType error) { std::cout << " Got expected exception." << std::endl; std::cout << " " << error.GetMessage() << std::endl; diff --git a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx index c2feb9abaf4cf8368ac0ef87a2b91cb0aef942c0..5ac60da5750c404da3da17c87372177cb41e3e41 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapField.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapField.cxx @@ -125,7 +125,7 @@ struct DoStaticTestWorklet { dispatcher.Invoke(inputHandle, outputHandle, inoutHandle); } - catch (vtkm::cont::ErrorControlBadValue error) + catch (vtkm::cont::ErrorBadValue error) { std::cout << " Caught expected error: " << error.GetMessage() << std::endl; @@ -210,7 +210,7 @@ void TestWorkletMapField() badWorkletTest( vtkm::Vec() ); VTKM_TEST_FAIL("Did not throw expected error."); } - catch (vtkm::cont::ErrorControlBadType &error) + catch (vtkm::cont::ErrorBadType &error) { std::cout << "Got expected error: " << error.GetMessage() << std::endl; } diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx index 034f9fbbb7d3cf22a2a9fce7d3dd23b780c2e317..e83ddcfb17c1f26a3b812bb4c35a572e245f5a5b 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyExplicit.cxx @@ -143,7 +143,7 @@ TestAvgPointToCell() dataSet.GetField("cellvar"), // should be pointvar result); } - catch (vtkm::cont::ErrorControlBadValue error) + catch (vtkm::cont::ErrorBadValue error) { std::cout << " Caught expected error: " << error.GetMessage() << std::endl; @@ -184,7 +184,7 @@ TestAvgCellToPoint() dataSet.GetField("pointvar"), // should be cellvar result); } - catch (vtkm::cont::ErrorControlBadValue error) + catch (vtkm::cont::ErrorBadValue error) { std::cout << " Caught expected error: " << error.GetMessage() << std::endl; diff --git a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx index bf9123ae3f435c5605a6cd4d71d8dc03da8dd9b3..130d7e3539633a93be790dacbf87495baf5f1960 100644 --- a/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx +++ b/vtkm/worklet/testing/UnitTestWorkletMapTopologyUniform.cxx @@ -185,7 +185,7 @@ TestAvgPointToCell() dataSet.GetField("cellvar"), // should be pointvar result); } - catch (vtkm::cont::ErrorControlBadValue error) + catch (vtkm::cont::ErrorBadValue error) { std::cout << " Caught expected error: " << error.GetMessage() << std::endl; @@ -236,7 +236,7 @@ TestAvgCellToPoint() dataSet.GetField("pointvar"), // should be cellvar result); } - catch (vtkm::cont::ErrorControlBadValue error) + catch (vtkm::cont::ErrorBadValue error) { std::cout << " Caught expected error: " << error.GetMessage() << std::endl; diff --git a/vtkm/worklet/wavelets/WaveletDWT.h b/vtkm/worklet/wavelets/WaveletDWT.h index f14e405adb119d1d25edb925154d53597051bd50..933d88b9ce2d3b12001ada2176df4c1913c5ed1a 100644 --- a/vtkm/worklet/wavelets/WaveletDWT.h +++ b/vtkm/worklet/wavelets/WaveletDWT.h @@ -306,7 +306,7 @@ public: } default: { - vtkm::cont::ErrorControlInternal("Left extension mode not supported!"); + vtkm::cont::ErrorInternal("Left extension mode not supported!"); return 1; } } @@ -351,7 +351,7 @@ public: } default: { - vtkm::cont::ErrorControlInternal("Right extension mode not supported!"); + vtkm::cont::ErrorInternal("Right extension mode not supported!"); return 1; } } @@ -403,7 +403,7 @@ public: } default: { - vtkm::cont::ErrorControlInternal("Right extension mode not supported!"); + vtkm::cont::ErrorInternal("Right extension mode not supported!"); return 1; } } @@ -435,7 +435,7 @@ public: vtkm::Id sigInLen = sigIn.GetNumberOfValues(); if( GetWaveletMaxLevel( sigInLen ) < 1 ) { - vtkm::cont::ErrorControlInternal( "Signal is too short to perform DWT!" ); + vtkm::cont::ErrorInternal( "Signal is too short to perform DWT!" ); return -1; } @@ -621,7 +621,7 @@ public: } else { - vtkm::cont::ErrorControlInternal("cDTemp Length not match!"); + vtkm::cont::ErrorInternal("cDTemp Length not match!"); return 1; } } @@ -987,7 +987,7 @@ public: ext4DimX = addLen + 1; } else - vtkm::cont::ErrorControlInternal("cDTemp Length not match!"); + vtkm::cont::ErrorInternal("cDTemp Length not match!"); } } @@ -1089,7 +1089,7 @@ public: ext4DimY = addLen + 1; } else - vtkm::cont::ErrorControlInternal("cDTemp Length not match!"); + vtkm::cont::ErrorInternal("cDTemp Length not match!"); } } diff --git a/vtkm/worklet/wavelets/WaveletTransforms.h b/vtkm/worklet/wavelets/WaveletTransforms.h index 796c34f7cfd894a96082c0dcbb01a5bbd01b50bf..81cc5a2721f54bf4cffe3321cdfe9599ac4777bc 100644 --- a/vtkm/worklet/wavelets/WaveletTransforms.h +++ b/vtkm/worklet/wavelets/WaveletTransforms.h @@ -131,7 +131,7 @@ public: idx = inY * x4 + (inX - x1 - xa - x2 - x3 - xd); } else - vtkm::cont::ErrorControlInternal("Invalid index!"); + vtkm::cont::ErrorInternal("Invalid index!"); } else // top-down mode { @@ -166,7 +166,7 @@ public: idx = (inY - y1 - ya - y2 - y3 - yd) * x1 + inX; } else - vtkm::cont::ErrorControlInternal("Invalid index!"); + vtkm::cont::ErrorInternal("Invalid index!"); } } @@ -227,7 +227,7 @@ public: idx = inY * dimX3 + (inX - dimX1 - pretendDimX2); } else - vtkm::cont::ErrorControlInternal("Invalid index!"); + vtkm::cont::ErrorInternal("Invalid index!"); } else // top-down mode { @@ -247,7 +247,7 @@ public: idx = (inY - dimY1 - pretendDimY2) * dimX3 + inX; } else - vtkm::cont::ErrorControlInternal("Invalid index!"); + vtkm::cont::ErrorInternal("Invalid index!"); } } @@ -326,7 +326,7 @@ public: return MAKEVAL( portal3.Get(inIdx) ); else { - vtkm::cont::ErrorControlInternal("Invalid matrix index!"); + vtkm::cont::ErrorInternal("Invalid matrix index!"); return -1; } } @@ -713,7 +713,7 @@ public: return MAKEVAL( cAcD.Get(inIdx) ); else { - vtkm::cont::ErrorControlInternal("Invalid matrix index!"); + vtkm::cont::ErrorInternal("Invalid matrix index!"); return -1; } }