Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Use {} initialization of FieldCollection.

Browse Source
This commit is contained in:
Dave Pugmire 2022-08-29 16:53:17 -04:00
parent 4b60978a03
commit a215ac3202
4 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vtkm/cont/DataSet.h
View File

@ -353,10 +353,9 @@ public:
private:
std::vector<vtkm::cont::CoordinateSystem> CoordSystems;
vtkm::cont::internal::FieldCollection Fields =
vtkm::cont::internal::FieldCollection({ vtkm::cont::Field::Association::WholeDataSet,
vtkm::cont::Field::Association::Points,
vtkm::cont::Field::Association::Cells });
vtkm::cont::internal::FieldCollection Fields{ vtkm::cont::Field::Association::WholeDataSet,
vtkm::cont::Field::Association::Points,
vtkm::cont::Field::Association::Cells };
vtkm::cont::UnknownCellSet CellSet;
std::shared_ptr<std::string> GhostCellName;

20
vtkm/cont/PartitionedDataSet.cxx
View File

@ -33,12 +33,6 @@ PartitionedDataSet::PartitionedDataSet(const vtkm::cont::DataSet& ds)
this->Partitions.insert(this->Partitions.end(), ds);
}
VTKM_CONT
PartitionedDataSet::PartitionedDataSet(const vtkm::cont::PartitionedDataSet& src)
{
this->Partitions = src.GetPartitions();
}
VTKM_CONT
PartitionedDataSet::PartitionedDataSet(const std::vector<vtkm::cont::DataSet>& partitions)
{
@ -51,20 +45,6 @@ PartitionedDataSet::PartitionedDataSet(vtkm::Id size)
this->Partitions.reserve(static_cast<std::size_t>(size));
}
VTKM_CONT
PartitionedDataSet::PartitionedDataSet() {}
VTKM_CONT
PartitionedDataSet::~PartitionedDataSet() {}
VTKM_CONT
PartitionedDataSet& PartitionedDataSet::operator=(const vtkm::cont::PartitionedDataSet& src)
{
this->Partitions = src.GetPartitions();
this->Fields = src.Fields;
return *this;
}
VTKM_CONT
vtkm::cont::Field PartitionedDataSet::GetFieldFromPartition(const std::string& field_name,
int partition_index) const

16
vtkm/cont/PartitionedDataSet.h
View File

@ -36,9 +36,7 @@ public:
/// Create a new PartitionedDataSet containng a single DataSet @a ds.
VTKM_CONT
PartitionedDataSet(const vtkm::cont::DataSet& ds);
/// Create a new PartitionedDataSet with the existing one @a src.
VTKM_CONT
PartitionedDataSet(const vtkm::cont::PartitionedDataSet& src);
/// Create a new PartitionedDataSet with a DataSet vector @a partitions.
VTKM_CONT
explicit PartitionedDataSet(const std::vector<vtkm::cont::DataSet>& partitions);
@ -47,13 +45,7 @@ public:
explicit PartitionedDataSet(vtkm::Id size);
VTKM_CONT
PartitionedDataSet();
VTKM_CONT
PartitionedDataSet& operator=(const vtkm::cont::PartitionedDataSet& src);
VTKM_CONT
~PartitionedDataSet();
PartitionedDataSet() = default;
VTKM_DEPRECATED(1.9, "Renamed to GetFieldFromPartition.")
VTKM_CONT vtkm::cont::Field GetField(const std::string& field_name, int partition_index) const
@ -248,8 +240,8 @@ public:
private:
std::vector<vtkm::cont::DataSet> Partitions;
vtkm::cont::internal::FieldCollection Fields = vtkm::cont::internal::FieldCollection(
{ vtkm::cont::Field::Association::Partitions, vtkm::cont::Field::Association::Global });
vtkm::cont::internal::FieldCollection Fields{ vtkm::cont::Field::Association::Partitions,
vtkm::cont::Field::Association::Global };
};
}
} // namespace vtkm::cont

8
vtkm/cont/internal/FieldCollection.h
View File

@ -23,6 +23,14 @@ namespace internal
class VTKM_CONT_EXPORT FieldCollection
{
public:
VTKM_CONT
FieldCollection(std::initializer_list<vtkm::cont::Field::Association> validAssoc)
{
auto it = this->ValidAssoc.begin();
for (const auto& item : validAssoc)
it = this->ValidAssoc.insert(it, item);
}
VTKM_CONT
FieldCollection(std::set<vtkm::cont::Field::Association>&& validAssoc)
: ValidAssoc(std::move(validAssoc))