Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
b1343474c1
vtk-m/vtkm/cont/DataSetBuilderRectilinear.h

248 lines
9.2 KiB
C
Raw Normal View History

Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +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 support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +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_DataSetBuilderRectilinear_h
#define vtk_m_cont_DataSetBuilderRectilinear_h
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
#include <vtkm/cont/ArrayCopy.h>
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
#include <vtkm/cont/ArrayHandleCartesianProduct.h>
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
#include <vtkm/cont/ArrayPortalToIterators.h>
#include <vtkm/cont/CoordinateSystem.h>
#include <vtkm/cont/DataSet.h>
Add vtkm/cont/serial directory for the serial backend.
2016-09-28 15:38:31 +00:00
#include <vtkm/cont/serial/DeviceAdapterSerial.h>
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
namespace vtkm
{
namespace cont
{
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
Split the DataSetBuilders into h/cxx files.
2018-05-29 20:49:34 +00:00
class VTKM_CONT_EXPORT DataSetBuilderRectilinear
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T, typename U>
VTKM_CONT static void CopyInto(const std::vector<T>& input, vtkm::cont::ArrayHandle<U>& output)
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
Improvements to moving data into ArrayHandle We have made several improvements to adding data into an `ArrayHandle`. ## Moving data from an `std::vector` For numerous reasons, it is convenient to define data in a `std::vector` and then wrap that into an `ArrayHandle`. It is often the case that an `std::vector` is filled and then becomes unused once it is converted to an `ArrayHandle`. In this case, what we really want is to pass the data off to the `ArrayHandle` so that the `ArrayHandle` is now managing the data and not the `std::vector`. C++11 has a mechanism to do this: move semantics. You can now pass variables to functions as an "rvalue" (right-hand value). When something is passed as an rvalue, it can pull state out of that variable and move it somewhere else. `std::vector` implements this movement so that an rvalue can be moved to another `std::vector` without actually copying the data. `make_ArrayHandle` now also takes advantage of this feature to move rvalue `std::vector`s. There is a special form of `make_ArrayHandle` named `make_ArrayHandleMove` that takes an rvalue. There is also a special overload of `make_ArrayHandle` itself that handles an rvalue `vector`. (However, using the explicit move version is better if you want to make sure the data is actually moved.) ## Make `ArrayHandle` from initalizer list A common use case for using `std::vector` (particularly in our unit tests) is to quickly add an initalizer list into an `ArrayHandle`. Now you can by simply passing an initializer list to `make_ArrayHandle`. ## Deprecated `make_ArrayHandle` with default shallow copy For historical reasons, passing an `std::vector` or a pointer to `make_ArrayHandle` does a shallow copy (i.e. `CopyFlag` defaults to `Off`). Although more efficient, this mode is inherintly unsafe, and making it the default is asking for trouble. To combat this, calling `make_ArrayHandle` without a copy flag is deprecated. In this way, if you wish to do the faster but more unsafe creation of an `ArrayHandle` you should explicitly express that. This requried quite a few changes through the VTK-m source (particularly in the tests). ## Similar changes to `Field` `vtkm::cont::Field` has a `make_Field` helper function that is similar to `make_ArrayHandle`. It also features the ability to create fields from `std::vector`s and C arrays. It also likewise had the same unsafe behavior by default of not copying from the source of the arrays. That behavior has similarly been depreciated. You now have to specify a copy flag. The ability to construct a `Field` from an initializer list of values has also been added.
2020-07-16 16:32:32 +00:00
DataSetBuilderRectilinear::CopyInto(vtkm::cont::make_ArrayHandle(input, vtkm::CopyFlag::Off),
output);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T, typename U>
VTKM_CONT static void CopyInto(const vtkm::cont::ArrayHandle<T>& input,
vtkm::cont::ArrayHandle<U>& output)
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
Make DispatcherBase invoke using a TryExecute Rather than force all dispatchers to be templated on a device adapter, instead use a TryExecute internally within the invoke to select a device adapter. Because this removes the need to declare a device when invoking a worklet, this commit also removes the need to declare a device in several other areas of the code.
2018-08-28 20:36:50 +00:00
vtkm::cont::ArrayCopy(input, output);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T, typename U>
VTKM_CONT static void CopyInto(const T* input, vtkm::Id len, vtkm::cont::ArrayHandle<U>& output)
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
Improvements to moving data into ArrayHandle We have made several improvements to adding data into an `ArrayHandle`. ## Moving data from an `std::vector` For numerous reasons, it is convenient to define data in a `std::vector` and then wrap that into an `ArrayHandle`. It is often the case that an `std::vector` is filled and then becomes unused once it is converted to an `ArrayHandle`. In this case, what we really want is to pass the data off to the `ArrayHandle` so that the `ArrayHandle` is now managing the data and not the `std::vector`. C++11 has a mechanism to do this: move semantics. You can now pass variables to functions as an "rvalue" (right-hand value). When something is passed as an rvalue, it can pull state out of that variable and move it somewhere else. `std::vector` implements this movement so that an rvalue can be moved to another `std::vector` without actually copying the data. `make_ArrayHandle` now also takes advantage of this feature to move rvalue `std::vector`s. There is a special form of `make_ArrayHandle` named `make_ArrayHandleMove` that takes an rvalue. There is also a special overload of `make_ArrayHandle` itself that handles an rvalue `vector`. (However, using the explicit move version is better if you want to make sure the data is actually moved.) ## Make `ArrayHandle` from initalizer list A common use case for using `std::vector` (particularly in our unit tests) is to quickly add an initalizer list into an `ArrayHandle`. Now you can by simply passing an initializer list to `make_ArrayHandle`. ## Deprecated `make_ArrayHandle` with default shallow copy For historical reasons, passing an `std::vector` or a pointer to `make_ArrayHandle` does a shallow copy (i.e. `CopyFlag` defaults to `Off`). Although more efficient, this mode is inherintly unsafe, and making it the default is asking for trouble. To combat this, calling `make_ArrayHandle` without a copy flag is deprecated. In this way, if you wish to do the faster but more unsafe creation of an `ArrayHandle` you should explicitly express that. This requried quite a few changes through the VTK-m source (particularly in the tests). ## Similar changes to `Field` `vtkm::cont::Field` has a `make_Field` helper function that is similar to `make_ArrayHandle`. It also features the ability to create fields from `std::vector`s and C arrays. It also likewise had the same unsafe behavior by default of not copying from the source of the arrays. That behavior has similarly been depreciated. You now have to specify a copy flag. The ability to construct a `Field` from an initializer list of values has also been added.
2020-07-16 16:32:32 +00:00
DataSetBuilderRectilinear::CopyInto(
vtkm::cont::make_ArrayHandle(input, len, vtkm::CopyFlag::Off), output);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
}
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +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
DataSetBuilderRectilinear();
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
//1D grids.
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,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
std::vector<T> yvals(1, 0), zvals(1, 0);
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(xvals, yvals, zvals, coordNm);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +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(vtkm::Id nx,
T* xvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
T yvals = 0, zvals = 0;
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(nx, 1, 1, xvals, &yvals, &zvals, coordNm);
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
}
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +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 vtkm::cont::ArrayHandle<T>& xvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
{
vtkm::cont::ArrayHandle<T> yvals, zvals;
yvals.Allocate(1);
Use new ways to get array portal in control environment Also fix deadlocks that occur when portals are not destroyed in time.
2020-01-28 19:14:32 +00:00
yvals.WritePortal().Set(0, 0.0);
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
zvals.Allocate(1);
Use new ways to get array portal in control environment Also fix deadlocks that occur when portals are not destroyed in time.
2020-01-28 19:14:32 +00:00
zvals.WritePortal().Set(0, 0.0);
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(xvals, yvals, zvals, coordNm);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
}
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
//2D grids.
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,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
std::vector<T> zvals(1, 0);
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(xvals, yvals, zvals, coordNm);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +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(vtkm::Id nx,
vtkm::Id ny,
T* xvals,
T* yvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
{
T zvals = 0;
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(nx, ny, 1, xvals, yvals, &zvals, coordNm);
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00: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 vtkm::cont::ArrayHandle<T>& xvals,
const vtkm::cont::ArrayHandle<T>& yvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
vtkm::cont::ArrayHandle<T> zvals;
zvals.Allocate(1);
Use new ways to get array portal in control environment Also fix deadlocks that occur when portals are not destroyed in time.
2020-01-28 19:14:32 +00:00
zvals.WritePortal().Set(0, 0.0);
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(xvals, yvals, zvals, coordNm);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
}
//3D grids.
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(vtkm::Id nx,
vtkm::Id ny,
vtkm::Id nz,
T* xvals,
T* yvals,
T* zvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(nx, ny, nz, xvals, yvals, zvals, coordNm);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +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<T>& zvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(xvals, yvals, zvals, coordNm);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +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 vtkm::cont::ArrayHandle<T>& xvals,
const vtkm::cont::ArrayHandle<T>& yvals,
const vtkm::cont::ArrayHandle<T>& zvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm = "coords")
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(xvals, yvals, zvals, coordNm);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
}
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
private:
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
VTKM_CONT static vtkm::cont::DataSet BuildDataSet(const std::vector<T>& xvals,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
const std::vector<T>& yvals,
const std::vector<T>& zvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm)
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
vtkm::cont::ArrayHandle<vtkm::FloatDefault> 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
DataSetBuilderRectilinear::CopyInto(xvals, Xc);
DataSetBuilderRectilinear::CopyInto(yvals, Yc);
DataSetBuilderRectilinear::CopyInto(zvals, Zc);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(Xc, Yc, Zc, coordNm);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +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 BuildDataSet(vtkm::Id nx,
vtkm::Id ny,
vtkm::Id nz,
const T* xvals,
const T* yvals,
const T* zvals,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm)
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
{
vtkm::cont::ArrayHandle<vtkm::FloatDefault> Xc, Yc, Zc;
DataSetBuilderRectilinear::CopyInto(xvals, nx, Xc);
DataSetBuilderRectilinear::CopyInto(yvals, ny, Yc);
DataSetBuilderRectilinear::CopyInto(zvals, nz, Zc);
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
return DataSetBuilderRectilinear::BuildDataSet(Xc, Yc, Zc, coordNm);
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
}
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
template <typename T>
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
VTKM_CONT static vtkm::cont::DataSet BuildDataSet(const vtkm::cont::ArrayHandle<T>& X,
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
const vtkm::cont::ArrayHandle<T>& Y,
const vtkm::cont::ArrayHandle<T>& Z,
DataSetBuilders don't require a cellset name
2019-08-13 20:35:16 +00:00
const std::string& coordNm)
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
{
vtkm::cont::DataSet dataSet;
//Convert all coordinates to floatDefault.
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
vtkm::cont::ArrayHandleCartesianProduct<vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
vtkm::cont::ArrayHandle<vtkm::FloatDefault>,
vtkm::cont::ArrayHandle<vtkm::FloatDefault>>
coords;
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
vtkm::cont::ArrayHandle<vtkm::FloatDefault> 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
DataSetBuilderRectilinear::CopyInto(X, Xc);
DataSetBuilderRectilinear::CopyInto(Y, Yc);
DataSetBuilderRectilinear::CopyInto(Z, Zc);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
coords = vtkm::cont::make_ArrayHandleCartesianProduct(Xc, Yc, Zc);
removing all references to field order.
2016-03-23 14:38:14 +00:00
vtkm::cont::CoordinateSystem cs(coordNm, coords);
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
dataSet.AddCoordinateSystem(cs);
Misc. typos Found via `codespell` and `grep` more typos includes source typo change and a typo that needs further review follow-up typos Follow-up typos Revert a commit
2018-06-14 20:49:11 +00:00
// compute the dimensions of the cellset by counting the number of axes
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
// with >1 dimension
int ndims = 0;
vtkm::Id dims[3];
if (Xc.GetNumberOfValues() > 1)
{
dims[ndims++] = Xc.GetNumberOfValues();
}
if (Yc.GetNumberOfValues() > 1)
{
dims[ndims++] = Yc.GetNumberOfValues();
}
if (Zc.GetNumberOfValues() > 1)
{
dims[ndims++] = Zc.GetNumberOfValues();
}
if (ndims == 1)
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
{
CellSet classes don't require a name
2019-08-13 21:28:37 +00:00
vtkm::cont::CellSetStructured<1> cellSet;
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
cellSet.SetPointDimensions(dims[0]);
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);
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
}
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
else if (ndims == 2)
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
{
CellSet classes don't require a name
2019-08-13 21:28:37 +00:00
vtkm::cont::CellSetStructured<2> cellSet;
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
cellSet.SetPointDimensions(vtkm::make_Vec(dims[0], dims[1]));
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);
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
}
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
else if (ndims == 3)
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
{
CellSet classes don't require a name
2019-08-13 21:28:37 +00:00
vtkm::cont::CellSetStructured<3> cellSet;
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
cellSet.SetPointDimensions(vtkm::make_Vec(dims[0], dims[1], dims[2]));
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);
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
}
Add 1D support for uniform and rectilinear data.
2016-09-23 13:00:40 +00:00
else
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
{
clang-format: apply to the entire tree
2017-05-18 14:29:41 +00:00
throw vtkm::cont::ErrorBadValue("Invalid cell set dimension");
Fix DataSetBuilder for Uniform and Rectilinear Allow 1 and 2 dimensional data along any orthogonal plane/axis.
2017-05-24 18:25:57 +00:00
}
Don't use DeviceAdapter inside DataSetBuilderRectilinear. No need to use the device adapter, just do a manual host side copy.
2016-01-15 22:07:06 +00:00
return dataSet;
}
Add support for rectilinear coordinates via ArrayHandleCartesianProduct. It consists of 3 ArrayHandles, and handles indexing to give each point in the grid. Added some examples to the test dataset class, and a basic test.
2015-12-01 20:06:28 +00:00
};
} // namespace cont
} // namespace vtkm
#endif //vtk_m_cont_DataSetBuilderRectilinear_h
Reference in New Issue Copy Permalink