Create a function for copying fields from particle arrays.
This commit is contained in:
parent
1ef1180692
commit
24451a3de2
@ -100,34 +100,6 @@ public:
|
|||||||
vtkm::ParticleStatus Status;
|
vtkm::ParticleStatus Status;
|
||||||
vtkm::FloatDefault Time = 0;
|
vtkm::FloatDefault Time = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace ParticleWorklet
|
|
||||||
{
|
|
||||||
|
|
||||||
struct CopyPositionWorklet : public vtkm::worklet::WorkletMapField
|
|
||||||
{
|
|
||||||
using ControlSignature = void(FieldIn inParticle, FieldOut outPos);
|
|
||||||
|
|
||||||
VTKM_EXEC void operator()(const vtkm::Particle& inParticle, vtkm::Vec3f& outPos) const
|
|
||||||
{
|
|
||||||
outPos = inParticle.Pos;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
struct CopyPositionIDWorklet : public vtkm::worklet::WorkletMapField
|
|
||||||
{
|
|
||||||
using ControlSignature = void(FieldIn inParticle, FieldOut outPos, FieldOut outID);
|
|
||||||
|
|
||||||
VTKM_EXEC void operator()(const vtkm::Particle& inParticle,
|
|
||||||
vtkm::Vec3f& outPos,
|
|
||||||
vtkm::Id& outID) const
|
|
||||||
{
|
|
||||||
outPos = inParticle.Pos;
|
|
||||||
outID = inParticle.ID;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // vtk_m_Particle_h
|
#endif // vtk_m_Particle_h
|
||||||
|
@ -97,6 +97,7 @@ set(headers
|
|||||||
Initialize.h
|
Initialize.h
|
||||||
Invoker.h
|
Invoker.h
|
||||||
Logging.h
|
Logging.h
|
||||||
|
ParticleArrayCopy.h
|
||||||
PartitionedDataSet.h
|
PartitionedDataSet.h
|
||||||
PointLocator.h
|
PointLocator.h
|
||||||
PointLocatorUniformGrid.h
|
PointLocatorUniformGrid.h
|
||||||
|
104
vtkm/cont/ParticleArrayCopy.h
Normal file
104
vtkm/cont/ParticleArrayCopy.h
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
//============================================================================
|
||||||
|
// 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_cont_ParticleArrayCopy_h
|
||||||
|
#define vtk_m_cont_ParticleArrayCopy_h
|
||||||
|
|
||||||
|
#include <vtkm/Particle.h>
|
||||||
|
//#include <vtkm/cont/Algorithm.h>
|
||||||
|
#include <vtkm/cont/ArrayHandle.h>
|
||||||
|
//#include <vtkm/cont/DeviceAdapterTag.h>
|
||||||
|
//#include <vtkm/cont/ErrorExecution.h>
|
||||||
|
#include <vtkm/cont/Invoker.h>
|
||||||
|
//#include <vtkm/cont/Logging.h>
|
||||||
|
|
||||||
|
namespace vtkm
|
||||||
|
{
|
||||||
|
namespace cont
|
||||||
|
{
|
||||||
|
|
||||||
|
namespace detail
|
||||||
|
{
|
||||||
|
struct CopyParticlePositionWorklet : public vtkm::worklet::WorkletMapField
|
||||||
|
{
|
||||||
|
using ControlSignature = void(FieldIn inParticle, FieldOut outPos);
|
||||||
|
|
||||||
|
VTKM_EXEC void operator()(const vtkm::Particle& inParticle, vtkm::Vec3f& outPos) const
|
||||||
|
{
|
||||||
|
outPos = inParticle.Pos;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct CopyParticleAllWorklet : public vtkm::worklet::WorkletMapField
|
||||||
|
{
|
||||||
|
using ControlSignature = void(FieldIn inParticle,
|
||||||
|
FieldOut outPos,
|
||||||
|
FieldOut outID,
|
||||||
|
FieldOut outSteps,
|
||||||
|
FieldOut outStatus,
|
||||||
|
FieldOut outTime);
|
||||||
|
|
||||||
|
VTKM_EXEC void operator()(const vtkm::Particle& inParticle,
|
||||||
|
vtkm::Vec3f& outPos,
|
||||||
|
vtkm::Id& outID,
|
||||||
|
vtkm::Id& outSteps,
|
||||||
|
vtkm::ParticleStatus& outStatus,
|
||||||
|
vtkm::FloatDefault& outTime) const
|
||||||
|
{
|
||||||
|
outPos = inParticle.Pos;
|
||||||
|
outID = inParticle.ID;
|
||||||
|
outSteps = inParticle.NumSteps;
|
||||||
|
outStatus = inParticle.Status;
|
||||||
|
outTime = inParticle.Time;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace detail
|
||||||
|
|
||||||
|
/// \brief Copy fields in vtkm::Particle to standard types.
|
||||||
|
///
|
||||||
|
/// Given an \c ArrayHandle of vtkm::Particle, this function copies the
|
||||||
|
/// position field into an \c ArrayHandle of \c Vec3f objects.
|
||||||
|
///
|
||||||
|
|
||||||
|
template <typename InStorage, typename OutStorage>
|
||||||
|
VTKM_CONT void ParticleArrayCopy(const vtkm::cont::ArrayHandle<vtkm::Particle, InStorage>& inP,
|
||||||
|
vtkm::cont::ArrayHandle<vtkm::Vec3f, OutStorage>& outPos)
|
||||||
|
{
|
||||||
|
vtkm::cont::Invoker invoke;
|
||||||
|
detail::CopyParticlePositionWorklet worklet;
|
||||||
|
|
||||||
|
invoke(worklet, inP, outPos);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// \brief Copy all fields in vtkm::Particle to standard types.
|
||||||
|
///
|
||||||
|
/// Given an \c ArrayHandle of vtkm::Particle, this function copies the
|
||||||
|
/// position, ID, number of steps, status and time into a separate
|
||||||
|
/// \c ArrayHandle.
|
||||||
|
///
|
||||||
|
|
||||||
|
template <typename InStorage, typename OutStorage>
|
||||||
|
VTKM_CONT void ParticleArrayCopy(
|
||||||
|
const vtkm::cont::ArrayHandle<vtkm::Particle, InStorage>& inP,
|
||||||
|
vtkm::cont::ArrayHandle<vtkm::Vec3f, OutStorage>& outPos,
|
||||||
|
vtkm::cont::ArrayHandle<vtkm::Id, OutStorage>& outID,
|
||||||
|
vtkm::cont::ArrayHandle<vtkm::Id, OutStorage>& outSteps,
|
||||||
|
vtkm::cont::ArrayHandle<vtkm::ParticleStatus, OutStorage>& outStatus,
|
||||||
|
vtkm::cont::ArrayHandle<vtkm::FloatDefault, OutStorage>& outTime)
|
||||||
|
{
|
||||||
|
vtkm::cont::Invoker invoke;
|
||||||
|
detail::CopyParticleAllWorklet worklet;
|
||||||
|
|
||||||
|
invoke(worklet, inP, outPos, outID, outSteps, outStatus, outTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} // namespace vtkm::cont
|
||||||
|
|
||||||
|
#endif //vtk_m_cont_ParticleArrayCopy_h
|
@ -16,6 +16,7 @@
|
|||||||
#include <vtkm/cont/ArrayHandleIndex.h>
|
#include <vtkm/cont/ArrayHandleIndex.h>
|
||||||
#include <vtkm/cont/CellSetSingleType.h>
|
#include <vtkm/cont/CellSetSingleType.h>
|
||||||
#include <vtkm/cont/ErrorFilterExecution.h>
|
#include <vtkm/cont/ErrorFilterExecution.h>
|
||||||
|
#include <vtkm/cont/ParticleArrayCopy.h>
|
||||||
#include <vtkm/worklet/particleadvection/GridEvaluators.h>
|
#include <vtkm/worklet/particleadvection/GridEvaluators.h>
|
||||||
#include <vtkm/worklet/particleadvection/Integrators.h>
|
#include <vtkm/worklet/particleadvection/Integrators.h>
|
||||||
#include <vtkm/worklet/particleadvection/Particles.h>
|
#include <vtkm/worklet/particleadvection/Particles.h>
|
||||||
@ -75,11 +76,11 @@ inline VTKM_CONT vtkm::cont::DataSet ParticleAdvection::DoExecute(
|
|||||||
res = this->Worklet.Run(rk4, seedArray, this->NumberOfSteps);
|
res = this->Worklet.Run(rk4, seedArray, this->NumberOfSteps);
|
||||||
|
|
||||||
vtkm::cont::DataSet outData;
|
vtkm::cont::DataSet outData;
|
||||||
vtkm::cont::ArrayHandle<vtkm::Vec3f> outPos;
|
|
||||||
|
|
||||||
//Copy particles to coordinate array
|
//Copy particles to coordinate array
|
||||||
vtkm::ParticleWorklet::CopyPositionWorklet copyWorklet;
|
vtkm::cont::ArrayHandle<vtkm::Vec3f> outPos;
|
||||||
this->Invoke(copyWorklet, res.Particles, outPos);
|
vtkm::cont::ParticleArrayCopy(res.Particles, outPos);
|
||||||
|
|
||||||
vtkm::cont::CoordinateSystem outCoords("coordinates", outPos);
|
vtkm::cont::CoordinateSystem outCoords("coordinates", outPos);
|
||||||
outData.AddCoordinateSystem(outCoords);
|
outData.AddCoordinateSystem(outCoords);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user