mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
removing all references to field order.
This commit is contained in:
parent
a0636e7078
commit
ba8517eb67
@ -83,44 +83,38 @@ class CoordinateSystem : public vtkm::cont::Field
|
||||
public:
|
||||
VTKM_CONT_EXPORT
|
||||
CoordinateSystem(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
const vtkm::cont::DynamicArrayHandle &data)
|
||||
: Superclass(name, order, ASSOC_POINTS, data) { }
|
||||
: Superclass(name, ASSOC_POINTS, data) { }
|
||||
|
||||
template<typename T, typename Storage>
|
||||
VTKM_CONT_EXPORT
|
||||
CoordinateSystem(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
const ArrayHandle<T, Storage> &data)
|
||||
: Superclass(name, order, ASSOC_POINTS, data) { }
|
||||
: Superclass(name, ASSOC_POINTS, data) { }
|
||||
|
||||
template<typename T>
|
||||
VTKM_CONT_EXPORT
|
||||
CoordinateSystem(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
const std::vector<T> &data)
|
||||
: Superclass(name, order, ASSOC_POINTS, data) { }
|
||||
: Superclass(name, ASSOC_POINTS, data) { }
|
||||
|
||||
template<typename T>
|
||||
VTKM_CONT_EXPORT
|
||||
CoordinateSystem(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
const T *data,
|
||||
vtkm::Id numberOfValues)
|
||||
: Superclass(name, order, ASSOC_POINTS, data, numberOfValues) { }
|
||||
: Superclass(name, ASSOC_POINTS, data, numberOfValues) { }
|
||||
|
||||
/// This constructor of coordinate system sets up a regular grid of points.
|
||||
///
|
||||
VTKM_CONT_EXPORT
|
||||
CoordinateSystem(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
vtkm::Id3 dimensions,
|
||||
vtkm::Vec<vtkm::FloatDefault,3> origin
|
||||
= vtkm::Vec<vtkm::FloatDefault,3>(0.0f, 0.0f, 0.0f),
|
||||
vtkm::Vec<vtkm::FloatDefault,3> spacing
|
||||
= vtkm::Vec<vtkm::FloatDefault,3>(1.0f, 1.0f, 1.0f))
|
||||
: Superclass(name,
|
||||
order,
|
||||
ASSOC_POINTS,
|
||||
vtkm::cont::DynamicArrayHandle(
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates(dimensions, origin, spacing)))
|
||||
|
@ -255,7 +255,7 @@ DataSetBuilderExplicit::BuildDataSet(
|
||||
|
||||
vtkm::cont::DataSet dataSet;
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem(coordsNm, 1,
|
||||
vtkm::cont::CoordinateSystem(coordsNm,
|
||||
make_ArrayHandleCompositeVector(X,0, Y,0, Z,0)));
|
||||
vtkm::Id nPts = X.GetNumberOfValues();
|
||||
vtkm::cont::CellSetExplicit<> cellSet(nPts, cellNm, dimensionality);
|
||||
@ -304,7 +304,7 @@ DataSetBuilderExplicit::BuildDataSet(const vtkm::cont::ArrayHandle<vtkm::Vec<T,3
|
||||
vtkm::cont::DataSet dataSet;
|
||||
|
||||
dataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem(coordsNm,
|
||||
1, coords));
|
||||
coords));
|
||||
vtkm::Id nPts = static_cast<vtkm::Id>(coords.GetNumberOfValues());
|
||||
vtkm::cont::CellSetExplicit<> cellSet(nPts, cellNm, dimensionality);
|
||||
|
||||
@ -342,7 +342,7 @@ DataSetBuilderExplicit::BuildDataSet(const vtkm::cont::ArrayHandle<vtkm::Vec<T,3
|
||||
{
|
||||
vtkm::cont::DataSet dataSet;
|
||||
|
||||
dataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem(coordsNm,1, coords));
|
||||
dataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem(coordsNm, coords));
|
||||
vtkm::cont::CellSetSingleType<> cellSet(tag, cellNm);
|
||||
|
||||
cellSet.Fill(connectivity);
|
||||
@ -486,7 +486,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
|
||||
coords[i][2] = 0;
|
||||
}
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem(coordsNm, 1, coords));
|
||||
vtkm::cont::CoordinateSystem(coordsNm, coords));
|
||||
|
||||
vtkm::cont::CellSetSingleType< > cellSet(CellType(), cellNm);
|
||||
cellSet.FillViaCopy(connectivity);
|
||||
@ -520,7 +520,7 @@ DataSetBuilderExplicit::Create(const std::vector<T> &xVals,
|
||||
coords[i][2] = zVals[i];
|
||||
}
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem(coordsNm, 1, coords));
|
||||
vtkm::cont::CoordinateSystem(coordsNm, coords));
|
||||
|
||||
vtkm::cont::CellSetSingleType< > cellSet(CellType(), cellNm);
|
||||
cellSet.FillViaCopy(connectivity);
|
||||
@ -542,7 +542,7 @@ DataSetBuilderExplicit::Create(const std::vector<vtkm::Vec<T,3> > &coords,
|
||||
CopyInto(coords, coordsArray);
|
||||
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem(coordsNm, 1, coordsArray));
|
||||
vtkm::cont::CoordinateSystem(coordsNm, coordsArray));
|
||||
|
||||
vtkm::cont::CellSetSingleType< > cellSet(CellType(), cellNm);
|
||||
cellSet.FillViaCopy(connectivity);
|
||||
|
@ -218,7 +218,7 @@ private:
|
||||
DataSetBuilderRectilinear::CopyInto(Z, Zc);
|
||||
|
||||
coords = vtkm::cont::make_ArrayHandleCartesianProduct(Xc,Yc,Zc);
|
||||
vtkm::cont::CoordinateSystem cs(coordNm, 1, coords);
|
||||
vtkm::cont::CoordinateSystem cs(coordNm, coords);
|
||||
dataSet.AddCoordinateSystem(cs);
|
||||
|
||||
if (dim == 2)
|
||||
|
@ -88,7 +88,7 @@ private:
|
||||
);
|
||||
|
||||
|
||||
vtkm::cont::CoordinateSystem cs(coordNm, 1, coords);
|
||||
vtkm::cont::CoordinateSystem cs(coordNm, coords);
|
||||
dataSet.AddCoordinateSystem(cs);
|
||||
|
||||
if (dim == 2)
|
||||
|
@ -40,7 +40,7 @@ public:
|
||||
const std::string &fieldName,
|
||||
const vtkm::cont::DynamicArrayHandle &field)
|
||||
{
|
||||
dataSet.AddField(Field(fieldName, 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
dataSet.AddField(Field(fieldName, vtkm::cont::Field::ASSOC_POINTS,
|
||||
field));
|
||||
}
|
||||
|
||||
@ -51,7 +51,7 @@ public:
|
||||
const std::string &fieldName,
|
||||
const vtkm::cont::ArrayHandle<T, Storage> &field)
|
||||
{
|
||||
dataSet.AddField(Field(fieldName, 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
dataSet.AddField(Field(fieldName, vtkm::cont::Field::ASSOC_POINTS,
|
||||
field));
|
||||
}
|
||||
|
||||
@ -62,7 +62,7 @@ public:
|
||||
const std::string &fieldName,
|
||||
const std::vector<T> &field)
|
||||
{
|
||||
dataSet.AddField(Field(fieldName, 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
dataSet.AddField(Field(fieldName, vtkm::cont::Field::ASSOC_POINTS,
|
||||
field));
|
||||
}
|
||||
|
||||
@ -73,7 +73,7 @@ public:
|
||||
const std::string &fieldName,
|
||||
const T *field, const vtkm::Id &n)
|
||||
{
|
||||
dataSet.AddField(Field(fieldName, 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
dataSet.AddField(Field(fieldName, vtkm::cont::Field::ASSOC_POINTS,
|
||||
field, n));
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ public:
|
||||
const vtkm::cont::DynamicArrayHandle &field,
|
||||
const std::string &cellSetName)
|
||||
{
|
||||
dataSet.AddField(Field(fieldName, 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(Field(fieldName, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
cellSetName, field));
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@ public:
|
||||
const vtkm::cont::ArrayHandle<T, Storage> &field,
|
||||
const std::string &cellSetName)
|
||||
{
|
||||
dataSet.AddField(Field(fieldName, 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(Field(fieldName, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
cellSetName, field));
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ public:
|
||||
const std::vector<T> &field,
|
||||
const std::string &cellSetName)
|
||||
{
|
||||
dataSet.AddField(Field(fieldName, 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(Field(fieldName, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
cellSetName, field));
|
||||
}
|
||||
|
||||
@ -121,7 +121,7 @@ public:
|
||||
const T *field, const vtkm::Id &n,
|
||||
const std::string &cellSetName)
|
||||
{
|
||||
dataSet.AddField(Field(fieldName, 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(Field(fieldName, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
cellSetName, field, n));
|
||||
}
|
||||
|
||||
|
@ -253,11 +253,9 @@ public:
|
||||
/// constructors for points / whole mesh
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
const vtkm::cont::DynamicArrayHandle &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(),
|
||||
AssocLogicalDim(-1),
|
||||
@ -272,11 +270,9 @@ public:
|
||||
template<typename T, typename Storage>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
const ArrayHandle<T, Storage> &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(),
|
||||
AssocLogicalDim(-1),
|
||||
@ -291,11 +287,9 @@ public:
|
||||
template <typename T>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
const std::vector<T> &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(),
|
||||
AssocLogicalDim(-1),
|
||||
@ -310,12 +304,10 @@ public:
|
||||
template <typename T>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
const T *data,
|
||||
vtkm::Id nvals)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(),
|
||||
AssocLogicalDim(-1),
|
||||
@ -330,12 +322,10 @@ public:
|
||||
/// constructors for cell set associations
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
const std::string& cellSetName,
|
||||
const vtkm::cont::DynamicArrayHandle &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(cellSetName),
|
||||
AssocLogicalDim(-1),
|
||||
@ -349,12 +339,10 @@ public:
|
||||
template <typename T, typename Storage>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
const std::string& cellSetName,
|
||||
const vtkm::cont::ArrayHandle<T, Storage> &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(cellSetName),
|
||||
AssocLogicalDim(-1),
|
||||
@ -368,12 +356,10 @@ public:
|
||||
template <typename T>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
const std::string& cellSetName,
|
||||
const std::vector<T> &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(cellSetName),
|
||||
AssocLogicalDim(-1),
|
||||
@ -387,13 +373,11 @@ public:
|
||||
template <typename T>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
const std::string& cellSetName,
|
||||
const T *data,
|
||||
vtkm::Id nvals)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(cellSetName),
|
||||
AssocLogicalDim(-1),
|
||||
@ -407,12 +391,10 @@ public:
|
||||
/// constructors for logical dimension associations
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
vtkm::IdComponent logicalDim,
|
||||
const vtkm::cont::DynamicArrayHandle &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocCellSetName(),
|
||||
AssocLogicalDim(logicalDim),
|
||||
@ -426,12 +408,10 @@ public:
|
||||
template <typename T, typename Storage>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
vtkm::IdComponent logicalDim,
|
||||
const vtkm::cont::ArrayHandle<T, Storage> &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocLogicalDim(logicalDim),
|
||||
Data(data),
|
||||
@ -444,12 +424,10 @@ public:
|
||||
template <typename T>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
vtkm::IdComponent logicalDim,
|
||||
const std::vector<T> &data)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocLogicalDim(logicalDim),
|
||||
Bounds(),
|
||||
@ -462,12 +440,10 @@ public:
|
||||
template <typename T>
|
||||
VTKM_CONT_EXPORT
|
||||
Field(std::string name,
|
||||
vtkm::IdComponent order,
|
||||
AssociationEnum association,
|
||||
vtkm::IdComponent logicalDim,
|
||||
const T *data, vtkm::Id nvals)
|
||||
: Name(name),
|
||||
Order(order),
|
||||
Association(association),
|
||||
AssocLogicalDim(logicalDim),
|
||||
Bounds(),
|
||||
@ -480,7 +456,6 @@ public:
|
||||
VTKM_CONT_EXPORT
|
||||
Field()
|
||||
: Name(),
|
||||
Order(),
|
||||
Association(ASSOC_ANY),
|
||||
AssocCellSetName(),
|
||||
AssocLogicalDim(),
|
||||
@ -503,12 +478,6 @@ public:
|
||||
return this->Association;
|
||||
}
|
||||
|
||||
VTKM_CONT_EXPORT
|
||||
vtkm::IdComponent GetOrder() const
|
||||
{
|
||||
return this->Order;
|
||||
}
|
||||
|
||||
VTKM_CONT_EXPORT
|
||||
std::string GetAssocCellSet() const
|
||||
{
|
||||
@ -647,14 +616,12 @@ public:
|
||||
case ASSOC_LOGICAL_DIM: out<<"LogicalDim "; break;
|
||||
}
|
||||
this->Data.PrintSummary(out);
|
||||
//out<<" Order= "<<Order;
|
||||
out<<"\n";
|
||||
}
|
||||
|
||||
private:
|
||||
std::string Name; ///< name of field
|
||||
|
||||
vtkm::IdComponent Order; ///< 0=(piecewise) constant, 1=linear, 2=quadratic
|
||||
AssociationEnum Association;
|
||||
std::string AssocCellSetName; ///< only populate if assoc is cells
|
||||
vtkm::IdComponent AssocLogicalDim; ///< only populate if assoc is logical dim
|
||||
|
@ -268,7 +268,7 @@ MakeTestDataSet::Make3DExplicitDataSet1()
|
||||
vtkm::Float32 vars[nVerts] = {10.1f, 20.1f, 30.2f, 40.2f, 50.3f};
|
||||
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates, nVerts));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates, nVerts));
|
||||
vtkm::cont::CellSetExplicit<> cellSet(nVerts, "cells", 2);
|
||||
cellSet.PrepareToAddCells(2, 7);
|
||||
cellSet.AddCell(vtkm::CELL_SHAPE_TRIANGLE, 3, make_Vec<vtkm::Id>(0,1,2));
|
||||
@ -277,11 +277,11 @@ MakeTestDataSet::Make3DExplicitDataSet1()
|
||||
dataSet.AddCellSet(cellSet);
|
||||
|
||||
//Set point scalar
|
||||
dataSet.AddField(Field("pointvar", 1, vtkm::cont::Field::ASSOC_POINTS, vars, nVerts));
|
||||
dataSet.AddField(Field("pointvar", vtkm::cont::Field::ASSOC_POINTS, vars, nVerts));
|
||||
|
||||
//Set cell scalar
|
||||
vtkm::Float32 cellvar[2] = {100.1f, 100.2f};
|
||||
dataSet.AddField(Field("cellvar", 1, vtkm::cont::Field::ASSOC_CELL_SET, "cells", cellvar, 2));
|
||||
dataSet.AddField(Field("cellvar", vtkm::cont::Field::ASSOC_CELL_SET, "cells", cellvar, 2));
|
||||
|
||||
return dataSet;
|
||||
}
|
||||
@ -337,7 +337,7 @@ MakeTestDataSet::Make3DExplicitDataSetCowNose()
|
||||
// create DataSet
|
||||
vtkm::cont::DataSet dataSet;
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates, nVerts));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates, nVerts));
|
||||
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> connectivity;
|
||||
connectivity.Allocate(nPointIds);
|
||||
|
@ -54,7 +54,7 @@ private:
|
||||
const vtkm::Id nvals = 11;
|
||||
T data[nvals] = { 1, 2, 3, 4, 5, -5, -4, -3, -2, -1, 0 };
|
||||
std::random_shuffle(data, data + nvals);
|
||||
vtkm::cont::Field field("TestField", 1, vtkm::cont::Field::ASSOC_POINTS, data,
|
||||
vtkm::cont::Field field("TestField", vtkm::cont::Field::ASSOC_POINTS, data,
|
||||
nvals);
|
||||
|
||||
vtkm::Float64 result[2];
|
||||
@ -86,7 +86,7 @@ private:
|
||||
fieldData[j][i] = data[j];
|
||||
}
|
||||
}
|
||||
vtkm::cont::Field field("TestField", 1, vtkm::cont::Field::ASSOC_POINTS, fieldData,
|
||||
vtkm::cont::Field field("TestField", vtkm::cont::Field::ASSOC_POINTS, fieldData,
|
||||
nvals);
|
||||
|
||||
vtkm::Float64 result[NumberOfComponents * 2];
|
||||
@ -128,7 +128,6 @@ private:
|
||||
{
|
||||
vtkm::cont::CoordinateSystem field(
|
||||
"TestField",
|
||||
1,
|
||||
vtkm::Id3(10, 20, 5),
|
||||
vtkm::Vec<vtkm::FloatDefault,3>(0.0f,-5.0f,4.0f),
|
||||
vtkm::Vec<vtkm::FloatDefault,3>(1.0f,0.5f,2.0f));
|
||||
|
@ -59,7 +59,7 @@ vtkm::filter::FieldResult CellAverage::DoExecute(const vtkm::cont::DataSet &inpu
|
||||
//that the dispatcher should do, including the result from GetCellSet
|
||||
dispatcher.Invoke(field, cellSet, outArray);
|
||||
|
||||
vtkm::cont::Field outField(this->GetOutputFieldName(), 1,
|
||||
vtkm::cont::Field outField(this->GetOutputFieldName(),
|
||||
vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
cellSet.GetCellSet().GetName(),
|
||||
outArray);
|
||||
|
@ -34,7 +34,6 @@ public:
|
||||
FieldMetadata():
|
||||
Name(),
|
||||
Association(vtkm::cont::Field::ASSOC_ANY),
|
||||
Order(1),
|
||||
CellSetName()
|
||||
{
|
||||
}
|
||||
@ -43,7 +42,6 @@ public:
|
||||
FieldMetadata(const vtkm::cont::Field& f):
|
||||
Name(f.GetName()),
|
||||
Association(f.GetAssociation()),
|
||||
Order(f.GetOrder()),
|
||||
CellSetName(f.GetAssocCellSet())
|
||||
{
|
||||
}
|
||||
@ -52,7 +50,6 @@ public:
|
||||
FieldMetadata(const vtkm::cont::CoordinateSystem &sys):
|
||||
Name(sys.GetName()),
|
||||
Association(sys.GetAssociation()),
|
||||
Order(sys.GetOrder()),
|
||||
CellSetName(sys.GetAssocCellSet())
|
||||
{
|
||||
}
|
||||
@ -82,19 +79,18 @@ public:
|
||||
vtkm::cont::DynamicArrayHandle dhandle(handle);
|
||||
if(this->IsCellField())
|
||||
{
|
||||
return vtkm::cont::Field(this->Name, this->Order, this->Association,
|
||||
return vtkm::cont::Field(this->Name, this->Association,
|
||||
this->CellSetName, dhandle);
|
||||
}
|
||||
else
|
||||
{
|
||||
return vtkm::cont::Field(this->Name, this->Order, this->Association, dhandle);
|
||||
return vtkm::cont::Field(this->Name, this->Association, dhandle);
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
std::string Name; ///< name of field
|
||||
vtkm::cont::Field::AssociationEnum Association;
|
||||
vtkm::IdComponent Order; ///< 0=(piecewise) constant, 1=linear, 2=quadratic
|
||||
std::string CellSetName; ///< only populate if assoc is cells
|
||||
};
|
||||
|
||||
@ -102,4 +98,4 @@ private:
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -520,14 +520,14 @@ vtkm::filter::DataSetResult MarchingCubes::DoExecute(const vtkm::cont::DataSet&
|
||||
//no cleanup of the normals is required
|
||||
if(this->GenerateNormals)
|
||||
{
|
||||
vtkm::cont::Field normalField(std::string("normals"), 1,
|
||||
vtkm::cont::Field normalField(std::string("normals"),
|
||||
vtkm::cont::Field::ASSOC_POINTS, normals);
|
||||
output.AddField( normalField );
|
||||
}
|
||||
|
||||
|
||||
//add the coordinates to the output dataset
|
||||
vtkm::cont::CoordinateSystem outputCoords("coordinates", 1, vertices);
|
||||
vtkm::cont::CoordinateSystem outputCoords("coordinates", vertices);
|
||||
output.AddCoordinateSystem( outputCoords );
|
||||
|
||||
//todo: figure out how to pass the fields to interpolate to the Result
|
||||
|
@ -69,7 +69,7 @@ PointElevation::DoExecute(const vtkm::cont::DataSet &,
|
||||
//that the dispatcher should do
|
||||
dispatcher.Invoke(field, outArray);
|
||||
|
||||
vtkm::cont::Field outField(this->GetOutputFieldName(), 1,
|
||||
vtkm::cont::Field outField(this->GetOutputFieldName(),
|
||||
vtkm::cont::Field::ASSOC_WHOLE_MESH,
|
||||
outArray);
|
||||
return vtkm::filter::FieldResult(outField);
|
||||
|
@ -44,7 +44,7 @@ void TestExternalFacesExplicitGrid()
|
||||
};
|
||||
|
||||
ds.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates, nVerts));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates, nVerts));
|
||||
|
||||
//Construct the VTK-m shapes and numIndices connectivity arrays
|
||||
const int nCells = 6; //The tetrahedrons of the cube
|
||||
@ -101,4 +101,4 @@ void TestExternalFacesFilter()
|
||||
int UnitTestExternalFacesFilter(int, char *[])
|
||||
{
|
||||
return vtkm::cont::testing::Testing::Run(TestExternalFacesFilter);
|
||||
}
|
||||
}
|
||||
|
@ -26,12 +26,12 @@ namespace {
|
||||
|
||||
vtkm::cont::Field makeCellField()
|
||||
{
|
||||
return vtkm::cont::Field("foo", 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
return vtkm::cont::Field("foo", vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
std::string(), vtkm::cont::ArrayHandle<vtkm::Float32>() );
|
||||
}
|
||||
vtkm::cont::Field makePointField()
|
||||
{
|
||||
return vtkm::cont::Field("foo", 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
return vtkm::cont::Field("foo", vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::ArrayHandle<vtkm::Float32>() );
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ void TestFieldTypesPoint()
|
||||
|
||||
//verify the field helper works properly
|
||||
vtkm::Float32 vars[6] = {10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f};
|
||||
vtkm::cont::Field field("pointvar", 1, vtkm::cont::Field::ASSOC_POINTS, vars, 6);
|
||||
vtkm::cont::Field field("pointvar", vtkm::cont::Field::ASSOC_POINTS, vars, 6);
|
||||
vtkm::filter::FieldMetadata makeMDFromField(field);
|
||||
VTKM_TEST_ASSERT(makeMDFromField.IsPointField() == true, "point should be a point field");
|
||||
VTKM_TEST_ASSERT(makeMDFromField.IsCellField() == false, "point can't be a cell field");
|
||||
@ -71,7 +71,7 @@ void TestFieldTypesCell()
|
||||
|
||||
//verify the field helper works properly
|
||||
vtkm::Float32 vars[6] = {10.1f, 20.1f, 30.1f, 40.1f, 50.1f, 60.1f};
|
||||
vtkm::cont::Field field("pointvar", 1, vtkm::cont::Field::ASSOC_CELL_SET, std::string(), vars, 6);
|
||||
vtkm::cont::Field field("pointvar", vtkm::cont::Field::ASSOC_CELL_SET, std::string(), vars, 6);
|
||||
vtkm::filter::FieldMetadata makeMDFromField(field);
|
||||
VTKM_TEST_ASSERT(makeMDFromField.IsPointField() == false, "cell can't be a point field");
|
||||
VTKM_TEST_ASSERT(makeMDFromField.IsCellField() == true, "cell should be a cell field");
|
||||
|
@ -86,9 +86,9 @@ vtkm::cont::DataSet MakeIsosurfaceTestDataSet(vtkm::Id3 dims)
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates
|
||||
coordinates(vdims, origin, spacing);
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
dataSet.AddField(vtkm::cont::Field(std::string("nodevar"), 1, vtkm::cont::Field::ASSOC_POINTS, fieldArray));
|
||||
dataSet.AddField(vtkm::cont::Field(std::string("nodevar"), vtkm::cont::Field::ASSOC_POINTS, fieldArray));
|
||||
|
||||
static const vtkm::IdComponent ndim = 3;
|
||||
vtkm::cont::CellSetStructured<ndim> cellSet("cells");
|
||||
@ -239,14 +239,14 @@ vtkm::Float32 spacing = vtkm::Float32(1./dim);
|
||||
CubeGridConnectivity(dim));
|
||||
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
//Set point scalar
|
||||
dataSet.AddField(
|
||||
vtkm::cont::Field("distanceToOrigin", 1,vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::Field("distanceToOrigin", vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::DynamicArrayHandle(distanceToOrigin)));
|
||||
dataSet.AddField(
|
||||
vtkm::cont::Field("distanceToOther", 1,vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::Field("distanceToOther", vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::DynamicArrayHandle(distanceToOther)));
|
||||
|
||||
CellSet cellSet(HexTag(), "cells");
|
||||
|
@ -46,7 +46,7 @@ vtkm::cont::DataSet MakePointElevationTestDataSet()
|
||||
|
||||
vtkm::Id numCells = (dim - 1) * (dim - 1);
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
vtkm::cont::CellSetExplicit<> cellSet(vtkm::Id(coordinates.size()), "cells", 3);
|
||||
cellSet.PrepareToAddCells(numCells, numCells * 4);
|
||||
|
@ -231,7 +231,7 @@ protected:
|
||||
this->DoReadDynamicArray(dataType, numPoints, 3, points);
|
||||
|
||||
this->DataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, points));
|
||||
vtkm::cont::CoordinateSystem("coordinates", points));
|
||||
}
|
||||
|
||||
void ReadCells(vtkm::cont::ArrayHandle<vtkm::Id> &connectivity,
|
||||
@ -356,12 +356,12 @@ protected:
|
||||
switch (association)
|
||||
{
|
||||
case vtkm::cont::Field::ASSOC_POINTS:
|
||||
this->DataSet.AddField(vtkm::cont::Field(name, 0, association, data));
|
||||
this->DataSet.AddField(vtkm::cont::Field(name, association, data));
|
||||
break;
|
||||
case vtkm::cont::Field::ASSOC_CELL_SET:
|
||||
data.CastAndCall(PermuteCellData(this->CellsPermutation, data));
|
||||
this->DataSet.AddField(
|
||||
vtkm::cont::Field(name, 0, association, "cells", data));
|
||||
vtkm::cont::Field(name, association, "cells", data));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
@ -107,7 +107,7 @@ private:
|
||||
|
||||
this->DataSet.AddCellSet(cs);
|
||||
this->DataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates",
|
||||
1, dim, origin, spacing));
|
||||
dim, origin, spacing));
|
||||
|
||||
// Read points and cell attributes
|
||||
this->ReadAttributes();
|
||||
|
@ -427,7 +427,7 @@ public:
|
||||
|
||||
outCellSet.Fill(cellTypes, numIndices, connectivity);
|
||||
OutDataSet.AddCellSet(outCellSet);
|
||||
OutDataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", 0, coordinates));
|
||||
OutDataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
return OutDataSet;
|
||||
}
|
||||
|
@ -175,7 +175,7 @@ public:
|
||||
vtkm::cont::DynamicArrayHandle data;
|
||||
field.GetData().CastAndCall(PermuteCellData(this->ValidCellIds, data));
|
||||
|
||||
return vtkm::cont::Field(field.GetName(), field.GetOrder(), field.GetAssociation(),
|
||||
return vtkm::cont::Field(field.GetName(), field.GetAssociation(),
|
||||
field.GetAssocCellSet(), data);
|
||||
}
|
||||
|
||||
|
@ -476,7 +476,7 @@ public:
|
||||
/// output
|
||||
vtkm::cont::DataSet output;
|
||||
|
||||
output.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", 0, repPointArray));
|
||||
output.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", repPointArray));
|
||||
|
||||
vtkm::cont::CellSetSingleType< > triangles(vtkm::CellShapeTagTriangle(),
|
||||
"cells");
|
||||
|
@ -258,19 +258,19 @@ vtkm::cont::DataSet MakeTestDataSet()
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates
|
||||
coordinates(vtkm::Id3(xVerts, yVerts, 1));
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
// Set point scalars
|
||||
dataSet.AddField(vtkm::cont::Field("p_poisson", 1, vtkm::cont::Field::ASSOC_POINTS, poisson, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_normal", 1, vtkm::cont::Field::ASSOC_POINTS, normal, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_chiSquare", 1, vtkm::cont::Field::ASSOC_POINTS, chiSquare, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_uniform", 1, vtkm::cont::Field::ASSOC_POINTS, uniform, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_poisson", vtkm::cont::Field::ASSOC_POINTS, poisson, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_normal", vtkm::cont::Field::ASSOC_POINTS, normal, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_chiSquare", vtkm::cont::Field::ASSOC_POINTS, chiSquare, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_uniform", vtkm::cont::Field::ASSOC_POINTS, uniform, nVerts));
|
||||
|
||||
// Set cell scalars
|
||||
dataSet.AddField(vtkm::cont::Field("c_poisson", 1, vtkm::cont::Field::ASSOC_CELL_SET, "cells", poisson, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_normal", 1, vtkm::cont::Field::ASSOC_CELL_SET, "cells", normal, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_chiSquare", 1, vtkm::cont::Field::ASSOC_CELL_SET, "cells", chiSquare, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_uniform", 1, vtkm::cont::Field::ASSOC_CELL_SET, "cells", poisson, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_poisson", vtkm::cont::Field::ASSOC_CELL_SET, "cells", poisson, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_normal", vtkm::cont::Field::ASSOC_CELL_SET, "cells", normal, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_chiSquare", vtkm::cont::Field::ASSOC_CELL_SET, "cells", chiSquare, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_uniform", vtkm::cont::Field::ASSOC_CELL_SET, "cells", poisson, nCells));
|
||||
|
||||
vtkm::cont::CellSetStructured<dimension> cellSet("cells");
|
||||
|
||||
|
@ -44,11 +44,11 @@ vtkm::cont::DataSet Make2DUniformStatDataSet0()
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates
|
||||
coordinates(vtkm::Id3(xVerts, yVerts, 1));
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
// Create cell scalar
|
||||
vtkm::Float32 data[nVerts] = {4,1,10,6,8,2,9,3,5,7};
|
||||
dataSet.AddField(vtkm::cont::Field("data", 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(vtkm::cont::Field("data", vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
"cells", data, nCells));
|
||||
|
||||
vtkm::cont::CellSetStructured<dimension> cellSet("cells");
|
||||
@ -295,26 +295,26 @@ vtkm::cont::DataSet Make2DUniformStatDataSet1()
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates
|
||||
coordinates(vtkm::Id3(xVerts, yVerts, 1));
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
// Set point scalars
|
||||
dataSet.AddField(vtkm::cont::Field("p_poisson", 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
dataSet.AddField(vtkm::cont::Field("p_poisson", vtkm::cont::Field::ASSOC_POINTS,
|
||||
poisson, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_normal", 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
dataSet.AddField(vtkm::cont::Field("p_normal", vtkm::cont::Field::ASSOC_POINTS,
|
||||
normal, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_chiSquare", 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
dataSet.AddField(vtkm::cont::Field("p_chiSquare", vtkm::cont::Field::ASSOC_POINTS,
|
||||
chiSquare, nVerts));
|
||||
dataSet.AddField(vtkm::cont::Field("p_uniform", 1, vtkm::cont::Field::ASSOC_POINTS,
|
||||
dataSet.AddField(vtkm::cont::Field("p_uniform", vtkm::cont::Field::ASSOC_POINTS,
|
||||
uniform, nVerts));
|
||||
|
||||
// Set cell scalars
|
||||
dataSet.AddField(vtkm::cont::Field("c_poisson", 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(vtkm::cont::Field("c_poisson", vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
"cells", poisson, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_normal", 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(vtkm::cont::Field("c_normal", vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
"cells", normal, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_chiSquare", 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(vtkm::cont::Field("c_chiSquare", vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
"cells", chiSquare, nCells));
|
||||
dataSet.AddField(vtkm::cont::Field("c_uniform", 1, vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
dataSet.AddField(vtkm::cont::Field("c_uniform", vtkm::cont::Field::ASSOC_CELL_SET,
|
||||
"cells", poisson, nCells));
|
||||
|
||||
vtkm::cont::CellSetStructured<dimension> cellSet("cells");
|
||||
|
@ -87,9 +87,9 @@ vtkm::cont::DataSet MakeIsosurfaceTestDataSet(vtkm::Id3 dims)
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates
|
||||
coordinates(vdims, origin, spacing);
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
dataSet.AddField(vtkm::cont::Field("nodevar", 1, vtkm::cont::Field::ASSOC_POINTS, fieldArray));
|
||||
dataSet.AddField(vtkm::cont::Field("nodevar", vtkm::cont::Field::ASSOC_POINTS, fieldArray));
|
||||
|
||||
static const vtkm::IdComponent ndim = 3;
|
||||
vtkm::cont::CellSetStructured<ndim> cellSet("cells");
|
||||
@ -212,14 +212,14 @@ vtkm::Float32 spacing = vtkm::Float32(1./dim);
|
||||
CubeGridConnectivity(dim));
|
||||
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
//Set point scalar
|
||||
dataSet.AddField(
|
||||
vtkm::cont::Field("distanceToOrigin", 1,vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::Field("distanceToOrigin", vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::DynamicArrayHandle(distanceToOrigin)));
|
||||
dataSet.AddField(
|
||||
vtkm::cont::Field("distanceToOther", 1,vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::Field("distanceToOther", vtkm::cont::Field::ASSOC_POINTS,
|
||||
vtkm::cont::DynamicArrayHandle(distanceToOther)));
|
||||
|
||||
CellSet cellSet(HexTag(), "cells");
|
||||
|
@ -51,7 +51,7 @@ vtkm::cont::DataSet MakePointElevationTestDataSet()
|
||||
|
||||
vtkm::Id numCells = (dim - 1) * (dim - 1);
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
vtkm::cont::CellSetExplicit<> cellSet(vtkm::Id(coordinates.size()), "cells", 3);
|
||||
cellSet.PrepareToAddCells(numCells, numCells * 4);
|
||||
|
@ -205,8 +205,8 @@ void TestStreamLineUniformGrid()
|
||||
// Construct the input dataset (uniform) to hold the input and set vector data
|
||||
vtkm::cont::DataSet inDataSet;
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates coordinates(vdims);
|
||||
inDataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
inDataSet.AddField(vtkm::cont::Field("vecData", 1, vtkm::cont::Field::ASSOC_POINTS, fieldArray));
|
||||
inDataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
inDataSet.AddField(vtkm::cont::Field("vecData", vtkm::cont::Field::ASSOC_POINTS, fieldArray));
|
||||
|
||||
vtkm::cont::CellSetStructured<3> inCellSet("cells");
|
||||
inCellSet.SetPointDimensions(vtkm::make_Vec(vdims[0], vdims[1], vdims[2]));
|
||||
|
@ -42,7 +42,7 @@ vtkm::cont::DataSet MakeTriangulateTestDataSet(vtkm::Id2 dims)
|
||||
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates coordinates(vdims, origin, spacing);
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
static const vtkm::IdComponent ndim = 2;
|
||||
vtkm::cont::CellSetStructured<ndim> cellSet("cells");
|
||||
@ -68,7 +68,7 @@ vtkm::cont::DataSet MakeTetrahedralizeTestDataSet(vtkm::Id3 dims)
|
||||
|
||||
vtkm::cont::ArrayHandleUniformPointCoordinates coordinates(vdims, origin, spacing);
|
||||
dataSet.AddCoordinateSystem(
|
||||
vtkm::cont::CoordinateSystem("coordinates", 1, coordinates));
|
||||
vtkm::cont::CoordinateSystem("coordinates", coordinates));
|
||||
|
||||
static const vtkm::IdComponent ndim = 3;
|
||||
vtkm::cont::CellSetStructured<ndim> cellSet("cells");
|
||||
|
Loading…
Reference in New Issue
Block a user