From f9dbfe9303f07eee96589733810c5020956a454c Mon Sep 17 00:00:00 2001
From: Dave Pugmire <dpugmire@gmail.com>
Date: Wed, 24 Aug 2022 09:47:31 -0400
Subject: [PATCH] Code cleanup. Add some comments.

---
 vtkm/cont/PartitionedDataSet.h         | 6 +-----
 vtkm/cont/internal/FieldCollection.cxx | 3 +++
 vtkm/cont/internal/FieldCollection.h   | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/vtkm/cont/PartitionedDataSet.h b/vtkm/cont/PartitionedDataSet.h
index 243d716f3..853040362 100644
--- a/vtkm/cont/PartitionedDataSet.h
+++ b/vtkm/cont/PartitionedDataSet.h
@@ -17,15 +17,11 @@
 #include <vtkm/cont/Field.h>
 #include <vtkm/cont/internal/FieldCollection.h>
 
-#include <set>
-
 namespace vtkm
 {
 namespace cont
 {
 
-//Should field data and methods be put into a base class for DataSet and PartitionedDataSet ???
-
 class VTKM_CONT_EXPORT PartitionedDataSet
 {
   using StorageVec = std::vector<vtkm::cont::DataSet>;
@@ -138,7 +134,7 @@ public:
   VTKM_CONT void AddWholeMeshField(const std::string& fieldName,
                                    const vtkm::cont::ArrayHandle<T, Storage>& field)
   {
-    this->AddField(vtkm::cont::Field(vtkm::cont::Field::Association::WholeMesh, field));
+    this->AddField(vtkm::cont::Field(fieldName, vtkm::cont::Field::Association::WholeMesh, field));
   }
 
   template <typename T>
diff --git a/vtkm/cont/internal/FieldCollection.cxx b/vtkm/cont/internal/FieldCollection.cxx
index def8a6984..ff954c20e 100644
--- a/vtkm/cont/internal/FieldCollection.cxx
+++ b/vtkm/cont/internal/FieldCollection.cxx
@@ -46,6 +46,9 @@ vtkm::cont::Field& FieldCollection::GetField(vtkm::Id index)
 vtkm::Id FieldCollection::GetFieldIndex(const std::string& name,
                                         vtkm::cont::Field::Association assoc) const
 {
+  // Find the field with the given name and association. If the association is
+  // `vtkm::cont::Field::Association::Any`, then the `Fields` object has a
+  // special comparator that will match the field to any association.
   const auto it = this->Fields.find({ name, assoc });
   if (it != this->Fields.end())
   {
diff --git a/vtkm/cont/internal/FieldCollection.h b/vtkm/cont/internal/FieldCollection.h
index 9a2ccc43b..4bb077478 100644
--- a/vtkm/cont/internal/FieldCollection.h
+++ b/vtkm/cont/internal/FieldCollection.h
@@ -24,8 +24,8 @@ class VTKM_CONT_EXPORT FieldCollection
 {
 public:
   VTKM_CONT
-  FieldCollection(const std::set<vtkm::cont::Field::Association>& validAssoc)
-    : ValidAssoc(validAssoc)
+  FieldCollection(std::set<vtkm::cont::Field::Association>&& validAssoc)
+    : ValidAssoc(std::move(validAssoc))
   {
   }