mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 18:45:43 +00:00
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
This commit is contained in:
commit
b9c7396184
@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
set(headers
|
set(headers
|
||||||
CellInterpolationHelper.h
|
CellInterpolationHelper.h
|
||||||
|
EvaluatorStatus.h
|
||||||
GridEvaluators.h
|
GridEvaluators.h
|
||||||
Integrators.h
|
Integrators.h
|
||||||
Particles.h
|
Particles.h
|
||||||
|
34
vtkm/worklet/particleadvection/EvaluatorStatus.h
Normal file
34
vtkm/worklet/particleadvection/EvaluatorStatus.h
Normal file
@ -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
|
@ -23,6 +23,7 @@
|
|||||||
#include <vtkm/cont/DeviceAdapter.h>
|
#include <vtkm/cont/DeviceAdapter.h>
|
||||||
|
|
||||||
#include <vtkm/worklet/particleadvection/CellInterpolationHelper.h>
|
#include <vtkm/worklet/particleadvection/CellInterpolationHelper.h>
|
||||||
|
#include <vtkm/worklet/particleadvection/EvaluatorStatus.h>
|
||||||
#include <vtkm/worklet/particleadvection/Integrators.h>
|
#include <vtkm/worklet/particleadvection/Integrators.h>
|
||||||
|
|
||||||
namespace vtkm
|
namespace vtkm
|
||||||
@ -31,12 +32,6 @@ namespace worklet
|
|||||||
{
|
{
|
||||||
namespace particleadvection
|
namespace particleadvection
|
||||||
{
|
{
|
||||||
enum class EvaluatorStatus
|
|
||||||
{
|
|
||||||
SUCCESS = 0,
|
|
||||||
OUTSIDE_SPATIAL_BOUNDS,
|
|
||||||
OUTSIDE_TEMPORAL_BOUNDS
|
|
||||||
};
|
|
||||||
|
|
||||||
template <typename DeviceAdapter, typename FieldArrayType>
|
template <typename DeviceAdapter, typename FieldArrayType>
|
||||||
class ExecutionGridEvaluator
|
class ExecutionGridEvaluator
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#include <vtkm/cont/DataSet.h>
|
#include <vtkm/cont/DataSet.h>
|
||||||
#include <vtkm/cont/VirtualObjectHandle.h>
|
#include <vtkm/cont/VirtualObjectHandle.h>
|
||||||
|
|
||||||
#include <vtkm/worklet/particleadvection/GridEvaluators.h>
|
#include <vtkm/worklet/particleadvection/EvaluatorStatus.h>
|
||||||
#include <vtkm/worklet/particleadvection/Particles.h>
|
#include <vtkm/worklet/particleadvection/Particles.h>
|
||||||
|
|
||||||
namespace vtkm
|
namespace vtkm
|
||||||
|
Loading…
Reference in New Issue
Block a user