Merge topic 'circular-dependency'

001617b2a Fix comment and install.
60711eb19 Remove circular dependency between GridEvaluators and Integrators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1813

vtkm/worklet/particleadvection/CMakeLists.txt

@@ -10,6 +10,7 @@
 
 set(headers
   CellInterpolationHelper.h
+  EvaluatorStatus.h
   GridEvaluators.h
   Integrators.h
   Particles.h

vtkm/worklet/particleadvection/EvaluatorStatus.h

@@ -0,0 +1,34 @@
+//=============================================================================
+//
+//  Copyright (c) Kitware, Inc.
+//  All rights reserved.
+//  See LICENSE.txt for details.
+//
+//  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_worklet_particleadvection_EvaluatorStatus_h
+#define vtk_m_worklet_particleadvection_EvaluatorStatus_h
+
+namespace vtkm
+{
+namespace worklet
+{
+namespace particleadvection
+{
+enum class EvaluatorStatus
+{
+  SUCCESS = 0,
+  OUTSIDE_SPATIAL_BOUNDS,
+  OUTSIDE_TEMPORAL_BOUNDS
+};
+
+} //namespace particleadvection
+} //namespace worklet
+} //namespace vtkm
+
+
+#endif // vtk_m_worklet_particleadvection_EvaluatorStatus_h

vtkm/worklet/particleadvection/GridEvaluators.h

@@ -23,6 +23,7 @@
 #include <vtkm/cont/DeviceAdapter.h>
 
 #include <vtkm/worklet/particleadvection/CellInterpolationHelper.h>
+#include <vtkm/worklet/particleadvection/EvaluatorStatus.h>
 #include <vtkm/worklet/particleadvection/Integrators.h>
 
 namespace vtkm
@@ -31,12 +32,6 @@ namespace worklet
 {
 namespace particleadvection
 {
-enum class EvaluatorStatus
-{
-  SUCCESS = 0,
-  OUTSIDE_SPATIAL_BOUNDS,
-  OUTSIDE_TEMPORAL_BOUNDS
-};
 
 template <typename DeviceAdapter, typename FieldArrayType>
 class ExecutionGridEvaluator

vtkm/worklet/particleadvection/Integrators.h

@@ -22,7 +22,7 @@
 #include <vtkm/cont/DataSet.h>
 #include <vtkm/cont/VirtualObjectHandle.h>
 
-#include <vtkm/worklet/particleadvection/GridEvaluators.h>
+#include <vtkm/worklet/particleadvection/EvaluatorStatus.h>
 #include <vtkm/worklet/particleadvection/Particles.h>
 
 namespace vtkm