Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 02:55:47 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
b2daec0e35
vtk-m/vtkm/cont/DataSetBuilderExplicit.h

347 lines
13 KiB
C
Raw Normal View History

Add dataset builder classes.
2015-11-03 03:24:57 +00:00
//============================================================================
// Copyright (c) Kitware, Inc.
// All rights reserved.
// See LICENSE.txt for details.
conslidate the license statement
2019-04-15 23:24:21 +00:00
//
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
// 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.
//============================================================================
#ifndef vtk_m_cont_DataSetBuilderExplicit_h
#define vtk_m_cont_DataSetBuilderExplicit_h
Use ArrayHandleCompositeVector to represent separated point arrays for DataSetBuilderExplicit.h.
2016-01-06 18:47:34 +00:00
#include <vtkm/cont/ArrayHandleCompositeVector.h>
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
#include <vtkm/cont/ArrayPortalToIterators.h>
#include <vtkm/cont/CoordinateSystem.h>
#include <vtkm/cont/DataSet.h>
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
namespace vtkm
{
namespace cont
{
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
//Coordinates builder??
//Need a singlecellset handler.
Split the DataSetBuilders into h/cxx files.
2018-05-29 20:49:34 +00:00
class VTKM_CONT_EXPORT DataSetBuilderExplicit
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT static void CopyInto(const std::vector<T>& input, vtkm::cont::ArrayHandle<T>& output)
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
output.Allocate(static_cast<vtkm::Id>(input.size()));
std::copy(input.begin(), input.end(), ArrayPortalToIteratorBegin(output.GetPortalControl()));
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
public:
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
DataSetBuilderExplicit() {}
//Single cell explicits.
//TODO
//Zoo explicit cell
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT static vtkm::cont::DataSet Create(const std::vector<T>& xVals,
const std::vector<vtkm::UInt8>& shapes,
const std::vector<vtkm::IdComponent>& numIndices,
const std::vector<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm = "coords")
Add explicit 1D rendering. Also added some data model suport.
2016-11-28 21:07:40 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
std::vector<T> yVals(xVals.size(), 0), zVals(xVals.size(), 0);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
return DataSetBuilderExplicit::Create(
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
xVals, yVals, zVals, shapes, numIndices, connectivity, coordsNm);
Add explicit 1D rendering. Also added some data model suport.
2016-11-28 21:07:40 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT static vtkm::cont::DataSet Create(const std::vector<T>& xVals,
const std::vector<T>& yVals,
const std::vector<vtkm::UInt8>& shapes,
const std::vector<vtkm::IdComponent>& numIndices,
const std::vector<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
std::vector<T> zVals(xVals.size(), 0);
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
return DataSetBuilderExplicit::Create(
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
xVals, yVals, zVals, shapes, numIndices, connectivity, coordsNm);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
VTKM_CONT static vtkm::cont::DataSet Create(const std::vector<T>& xVals,
const std::vector<T>& yVals,
const std::vector<T>& zVals,
const std::vector<vtkm::UInt8>& shapes,
const std::vector<vtkm::IdComponent>& numIndices,
const std::vector<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm = "coords");
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT static vtkm::cont::DataSet Create(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<T>& xVals,
const vtkm::cont::ArrayHandle<T>& yVals,
const vtkm::cont::ArrayHandle<T>& zVals,
const vtkm::cont::ArrayHandle<vtkm::UInt8>& shapes,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
const vtkm::cont::ArrayHandle<vtkm::IdComponent>& numIndices,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
{
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
return DataSetBuilderExplicit::BuildDataSet(
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
xVals, yVals, zVals, shapes, numIndices, connectivity, coordsNm);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT static vtkm::cont::DataSet Create(const std::vector<vtkm::Vec<T, 3>>& coords,
const std::vector<vtkm::UInt8>& shapes,
const std::vector<vtkm::IdComponent>& numIndices,
const std::vector<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm = "coords");
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT static vtkm::cont::DataSet Create(
const vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>>& coords,
const vtkm::cont::ArrayHandle<vtkm::UInt8>& shapes,
const vtkm::cont::ArrayHandle<vtkm::IdComponent>& numIndices,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
{
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderExplicit::BuildDataSet(coords, shapes, numIndices, connectivity, coordsNm);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T, typename CellShapeTag>
VTKM_CONT static vtkm::cont::DataSet Create(const std::vector<vtkm::Vec<T, 3>>& coords,
CellShapeTag tag,
vtkm::IdComponent numberOfPointsPerCell,
const std::vector<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm = "coords");
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T, typename CellShapeTag>
VTKM_CONT static vtkm::cont::DataSet Create(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>>& coords,
CellShapeTag tag,
vtkm::IdComponent numberOfPointsPerCell,
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
{
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
return DataSetBuilderExplicit::BuildDataSet(
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
coords, tag, numberOfPointsPerCell, connectivity, coordsNm);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
}
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
Add tests for DataSetBuilderExplicit. Added cont/testing/ExplicitTestData.h which includes several explicit datasets. These datasets come from VTK data generated in VisIt. The new unit tests build datasets in several different ways and do some basic validation. Add some new methods for DataSetFieldAdd class to improve usability.
2016-01-05 21:28:57 +00:00
private:
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
static vtkm::cont::DataSet BuildDataSet(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<T>& X,
const vtkm::cont::ArrayHandle<T>& Y,
const vtkm::cont::ArrayHandle<T>& Z,
const vtkm::cont::ArrayHandle<vtkm::UInt8>& shapes,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
const vtkm::cont::ArrayHandle<vtkm::IdComponent>& numIndices,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT static vtkm::cont::DataSet BuildDataSet(
const vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>>& coords,
const vtkm::cont::ArrayHandle<vtkm::UInt8>& shapes,
const vtkm::cont::ArrayHandle<vtkm::IdComponent>& numIndices,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T, typename CellShapeTag>
VTKM_CONT static vtkm::cont::DataSet BuildDataSet(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>>& coords,
CellShapeTag tag,
vtkm::IdComponent numberOfPointsPerCell,
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm);
Add tests for DataSetBuilderExplicit. Added cont/testing/ExplicitTestData.h which includes several explicit datasets. These datasets come from VTK data generated in VisIt. The new unit tests build datasets in several different ways and do some basic validation. Add some new methods for DataSetFieldAdd class to improve usability.
2016-01-05 21:28:57 +00:00
};
fix warnings...
2015-12-11 14:53:06 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::Create(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const std::vector<T>& xVals,
const std::vector<T>& yVals,
const std::vector<T>& zVals,
const std::vector<vtkm::UInt8>& shapes,
const std::vector<vtkm::IdComponent>& numIndices,
const std::vector<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm)
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
VTKM_ASSERT(xVals.size() == yVals.size() && yVals.size() == zVals.size() && xVals.size() > 0);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::cont::ArrayHandle<T> Xc, Yc, Zc;
Make DataSetBuilder methods static This makes is slightly easier to use as you do not actually have to construct the DataSetBuilder object but just call its static method. The DataSetBuilderExplicitIterative methods are not static because they use state of the builder object to create the data.
2016-01-21 17:45:33 +00:00
DataSetBuilderExplicit::CopyInto(xVals, Xc);
DataSetBuilderExplicit::CopyInto(yVals, Yc);
DataSetBuilderExplicit::CopyInto(zVals, Zc);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::cont::ArrayHandle<vtkm::UInt8> Sc;
vtkm::cont::ArrayHandle<vtkm::IdComponent> Nc;
vtkm::cont::ArrayHandle<vtkm::Id> Cc;
Make DataSetBuilder methods static This makes is slightly easier to use as you do not actually have to construct the DataSetBuilder object but just call its static method. The DataSetBuilderExplicitIterative methods are not static because they use state of the builder object to create the data.
2016-01-21 17:45:33 +00:00
DataSetBuilderExplicit::CopyInto(shapes, Sc);
DataSetBuilderExplicit::CopyInto(numIndices, Nc);
DataSetBuilderExplicit::CopyInto(connectivity, Cc);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderExplicit::BuildDataSet(Xc, Yc, Zc, Sc, Nc, Cc, coordsNm);
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::BuildDataSet(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<T>& X,
const vtkm::cont::ArrayHandle<T>& Y,
const vtkm::cont::ArrayHandle<T>& Z,
const vtkm::cont::ArrayHandle<vtkm::UInt8>& shapes,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
const vtkm::cont::ArrayHandle<vtkm::IdComponent>& numIndices,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm)
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
{
Remove cont/Assert.h and exec/Assert.h These asserts are consolidated into the unified Assert.h. Also made some minor edits to add asserts where appropriate and a little bit of reconfiguring as found.
2016-04-20 21:41:14 +00:00
VTKM_ASSERT(X.GetNumberOfValues() == Y.GetNumberOfValues() &&
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
Y.GetNumberOfValues() == Z.GetNumberOfValues() && X.GetNumberOfValues() > 0 &&
shapes.GetNumberOfValues() == numIndices.GetNumberOfValues());
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::cont::DataSet dataSet;
dataSet.AddCoordinateSystem(
Refactor ArrayHandleCompositeVector to simplify usage and impl. - Use tao::tuple instead of FunctionInterface to hold array/portal collections. - Type signatures are simplified. Now just use: - ArrayHandleCompositeVector<ArrayT1, ArrayT2, ...> - make_ArrayHandleCompositeVector(array1, array2, ...) instead of relying on helper structs to determine types. - No longer support component selection from an input array. All input arrays must have the same ValueType (See ArrayHandleSwizzle and ArrayHandleExtractComponent as the replacements for these usecases.
2018-05-10 17:06:08 +00:00
vtkm::cont::CoordinateSystem(coordsNm, make_ArrayHandleCompositeVector(X, Y, Z)));
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::Id nPts = X.GetNumberOfValues();
CellSet classes don't require a name
2019-08-13 21:28:37 +00:00
vtkm::cont::CellSetExplicit<> cellSet;
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
Make it not possible to create a cell set without specifying num points The CellSetExplicit and CellSetSingleType classes have an ivar that marks the number of points. There were several instances of code creating cell sets without specifying the number of points. This can be very bad if subsequent code needs that information.
2016-12-20 23:14:50 +00:00
cellSet.Fill(nPts, shapes, numIndices, connectivity);
Remove multiple vtkm::cont::CellSet from vtkm::cont::DataSet By removing the ability to have multiple CellSets in a DataSet we can simplify the following things: - Cell Fields now don't require a CellSet name when being constructed - Filters don't need to manage what the active cellset is
2019-08-13 17:08:54 +00:00
dataSet.SetCellSet(cellSet);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
return dataSet;
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::Create(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const std::vector<vtkm::Vec<T, 3>>& coords,
const std::vector<vtkm::UInt8>& shapes,
const std::vector<vtkm::IdComponent>& numIndices,
const std::vector<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm)
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::cont::ArrayHandle<Vec<T, 3>> coordsArray;
Make DataSetBuilder methods static This makes is slightly easier to use as you do not actually have to construct the DataSetBuilder object but just call its static method. The DataSetBuilderExplicitIterative methods are not static because they use state of the builder object to create the data.
2016-01-21 17:45:33 +00:00
DataSetBuilderExplicit::CopyInto(coords, coordsArray);
Cleanup and fix an issue in Explicit dataset testing with the initial merge.
2015-12-04 21:15:51 +00:00
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::cont::ArrayHandle<vtkm::UInt8> Sc;
vtkm::cont::ArrayHandle<vtkm::IdComponent> Nc;
vtkm::cont::ArrayHandle<vtkm::Id> Cc;
Make DataSetBuilder methods static This makes is slightly easier to use as you do not actually have to construct the DataSetBuilder object but just call its static method. The DataSetBuilderExplicitIterative methods are not static because they use state of the builder object to create the data.
2016-01-21 17:45:33 +00:00
DataSetBuilderExplicit::CopyInto(shapes, Sc);
DataSetBuilderExplicit::CopyInto(numIndices, Nc);
DataSetBuilderExplicit::CopyInto(connectivity, Cc);
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderExplicit::Create(coordsArray, Sc, Nc, Cc, coordsNm);
Add tests for DataSetBuilderExplicit. Added cont/testing/ExplicitTestData.h which includes several explicit datasets. These datasets come from VTK data generated in VisIt. The new unit tests build datasets in several different ways and do some basic validation. Add some new methods for DataSetFieldAdd class to improve usability.
2016-01-05 21:28:57 +00:00
}
Cleanup and fix an issue in Explicit dataset testing with the initial merge.
2015-12-04 21:15:51 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::BuildDataSet(
const vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>>& coords,
const vtkm::cont::ArrayHandle<vtkm::UInt8>& shapes,
const vtkm::cont::ArrayHandle<vtkm::IdComponent>& numIndices,
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm)
Add tests for DataSetBuilderExplicit. Added cont/testing/ExplicitTestData.h which includes several explicit datasets. These datasets come from VTK data generated in VisIt. The new unit tests build datasets in several different ways and do some basic validation. Add some new methods for DataSetFieldAdd class to improve usability.
2016-01-05 21:28:57 +00:00
{
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::cont::DataSet dataSet;
Add tests for DataSetBuilderExplicit. Added cont/testing/ExplicitTestData.h which includes several explicit datasets. These datasets come from VTK data generated in VisIt. The new unit tests build datasets in several different ways and do some basic validation. Add some new methods for DataSetFieldAdd class to improve usability.
2016-01-05 21:28:57 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
dataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem(coordsNm, coords));
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::Id nPts = static_cast<vtkm::Id>(coords.GetNumberOfValues());
CellSet classes don't require a name
2019-08-13 21:28:37 +00:00
vtkm::cont::CellSetExplicit<> cellSet;
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
Make it not possible to create a cell set without specifying num points The CellSetExplicit and CellSetSingleType classes have an ivar that marks the number of points. There were several instances of code creating cell sets without specifying the number of points. This can be very bad if subsequent code needs that information.
2016-12-20 23:14:50 +00:00
cellSet.Fill(nPts, shapes, numIndices, connectivity);
Remove multiple vtkm::cont::CellSet from vtkm::cont::DataSet By removing the ability to have multiple CellSets in a DataSet we can simplify the following things: - Cell Fields now don't require a CellSet name when being constructed - Filters don't need to manage what the active cellset is
2019-08-13 17:08:54 +00:00
dataSet.SetCellSet(cellSet);
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
return dataSet;
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T, typename CellShapeTag>
inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::Create(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const std::vector<vtkm::Vec<T, 3>>& coords,
CellShapeTag tag,
vtkm::IdComponent numberOfPointsPerCell,
const std::vector<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm)
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::cont::ArrayHandle<Vec<T, 3>> coordsArray;
Make DataSetBuilder methods static This makes is slightly easier to use as you do not actually have to construct the DataSetBuilder object but just call its static method. The DataSetBuilderExplicitIterative methods are not static because they use state of the builder object to create the data.
2016-01-21 17:45:33 +00:00
DataSetBuilderExplicit::CopyInto(coords, coordsArray);
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::cont::ArrayHandle<vtkm::Id> Cc;
Make DataSetBuilder methods static This makes is slightly easier to use as you do not actually have to construct the DataSetBuilder object but just call its static method. The DataSetBuilderExplicitIterative methods are not static because they use state of the builder object to create the data.
2016-01-21 17:45:33 +00:00
DataSetBuilderExplicit::CopyInto(connectivity, Cc);
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderExplicit::Create(coordsArray, tag, numberOfPointsPerCell, Cc, coordsNm);
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T, typename CellShapeTag>
inline VTKM_CONT vtkm::cont::DataSet DataSetBuilderExplicit::BuildDataSet(
Respect VTK-m convention of parameters all or nothing on a line clang-format BinPack settings have been disabled to make sure that the VTK-m style guideline is obeyed.
2017-05-26 17:53:28 +00:00
const vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>>& coords,
CellShapeTag tag,
vtkm::IdComponent numberOfPointsPerCell,
const vtkm::cont::ArrayHandle<vtkm::Id>& connectivity,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordsNm)
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
{
Enable highest level of warnings(W4) under MSVC This will make VTK-m warning level match the one used by VTK. This commit also resolves the first round of warnings that W4 exposes.
2017-09-21 14:33:17 +00:00
(void)tag; //C4100 false positive workaround
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::cont::DataSet dataSet;
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
removing all references to field order.
2016-03-23 14:38:14 +00:00
dataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem(coordsNm, coords));
CellSet classes don't require a name
2019-08-13 21:28:37 +00:00
vtkm::cont::CellSetSingleType<> cellSet;
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
cellSet.Fill(coords.GetNumberOfValues(), tag.Id, numberOfPointsPerCell, connectivity);
Remove multiple vtkm::cont::CellSet from vtkm::cont::DataSet By removing the ability to have multiple CellSets in a DataSet we can simplify the following things: - Cell Fields now don't require a CellSet name when being constructed - Filters don't need to manage what the active cellset is
2019-08-13 17:08:54 +00:00
dataSet.SetCellSet(cellSet);
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
return dataSet;
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
}
Make sure DataSetBuilderExplicitIterative is usable by vtkm consumers
2018-06-01 17:00:16 +00:00
class VTKM_CONT_EXPORT DataSetBuilderExplicitIterative
Add iterative explicit dataset builder class.
2015-11-04 12:45:51 +00:00
{
public:
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Split the DataSetBuilders into h/cxx files.
2018-05-29 20:49:34 +00:00
DataSetBuilderExplicitIterative();
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
void Begin(const std::string& coordName = "coords");
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
//Define points.
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
vtkm::cont::DataSet Create();
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Use default float to build explicit data sets The DataSetBuilderExplicitIterative class used to use an ArrayHandle of vtkm::Vec3f_32 values, which are always of type Float32. This can cause unexpected results when using double precision by default (i.e. when FloatDefault is set to Float64). Change that to give Float32 values by default.
2019-09-08 20:44:57 +00:00
vtkm::Id AddPoint(const vtkm::Vec3f& pt);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Use default float to build explicit data sets The DataSetBuilderExplicitIterative class used to use an ArrayHandle of vtkm::Vec3f_32 values, which are always of type Float32. This can cause unexpected results when using double precision by default (i.e. when FloatDefault is set to Float64). Change that to give Float32 values by default.
2019-09-08 20:44:57 +00:00
vtkm::Id AddPoint(const vtkm::FloatDefault& x,
const vtkm::FloatDefault& y,
const vtkm::FloatDefault& z = 0);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT vtkm::Id AddPoint(const T& x, const T& y, const T& z = 0)
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
{
Use default float to build explicit data sets The DataSetBuilderExplicitIterative class used to use an ArrayHandle of vtkm::Vec3f_32 values, which are always of type Float32. This can cause unexpected results when using double precision by default (i.e. when FloatDefault is set to Float64). Change that to give Float32 values by default.
2019-09-08 20:44:57 +00:00
return AddPoint(static_cast<vtkm::FloatDefault>(x),
static_cast<vtkm::FloatDefault>(y),
static_cast<vtkm::FloatDefault>(z));
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
VTKM_CONT vtkm::Id AddPoint(const vtkm::Vec<T, 3>& pt)
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
{
Use default float to build explicit data sets The DataSetBuilderExplicitIterative class used to use an ArrayHandle of vtkm::Vec3f_32 values, which are always of type Float32. This can cause unexpected results when using double precision by default (i.e. when FloatDefault is set to Float64). Change that to give Float32 values by default.
2019-09-08 20:44:57 +00:00
return AddPoint(static_cast<vtkm::Vec3f>(pt));
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
}
//Define cells.
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Split the DataSetBuilders into h/cxx files.
2018-05-29 20:49:34 +00:00
void AddCell(vtkm::UInt8 shape);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Split the DataSetBuilders into h/cxx files.
2018-05-29 20:49:34 +00:00
void AddCell(const vtkm::UInt8& shape, const std::vector<vtkm::Id>& conn);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Split the DataSetBuilders into h/cxx files.
2018-05-29 20:49:34 +00:00
void AddCell(const vtkm::UInt8& shape, const vtkm::Id* conn, const vtkm::IdComponent& n);
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
Remove exports for header-only functions/methods Change the VTKM_CONT_EXPORT to VTKM_CONT. (Likewise for EXEC and EXEC_CONT.) Remove the inline from these macros so that they can be applied to everything, including implementations in a library. Because inline is not declared in these modifies, you have to add the keyword to functions and methods where the implementation is not inlined in the class.
2016-10-19 22:42:58 +00:00
VTKM_CONT
Split the DataSetBuilders into h/cxx files.
2018-05-29 20:49:34 +00:00
void AddCellPoint(vtkm::Id pointIndex);
Allow DataSetBuilderExplicit to create CellSetSingleType. If you have only a single cell shape, you can now efficiently create a vtkm::cont::DataSet whose CellSet is vtkm::cont::CellSetSingleType.
2016-01-15 20:06:09 +00:00
Add iterative explicit dataset builder class.
2015-11-04 12:45:51 +00:00
private:
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
std::string coordNm;
Add iterative explicit dataset builder class.
2015-11-04 12:45:51 +00:00
Use default float to build explicit data sets The DataSetBuilderExplicitIterative class used to use an ArrayHandle of vtkm::Vec3f_32 values, which are always of type Float32. This can cause unexpected results when using double precision by default (i.e. when FloatDefault is set to Float64). Change that to give Float32 values by default.
2019-09-08 20:44:57 +00:00
std::vector<vtkm::Vec3f> points;
Don't use DeviceAdapter inside DataSetBuilderExplicit. No need to use the device adapter, just do a manual host side copy.
2016-01-15 21:31:05 +00:00
std::vector<vtkm::UInt8> shapes;
std::vector<vtkm::IdComponent> numIdx;
std::vector<vtkm::Id> connectivity;
Add iterative explicit dataset builder class.
2015-11-04 12:45:51 +00:00
};
Add dataset builder classes.
2015-11-03 03:24:57 +00:00
}
}
#endif //vtk_m_cont_DataSetBuilderExplicit_h
Reference in New Issue Copy Permalink