mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Resolving error introduced in merge
This commit is contained in:
ayenpure
parent
3c9413345d
commit
d636dea4e3
@ -171,7 +171,7 @@ private:
|
||||
CellSetPortal CellSet;
|
||||
RectilinearPortalType Coords;
|
||||
AxisPortalType AxisPortals[3];
|
||||
vtkm::Id3 PointDimensions;
|
||||
vtkm::Vec<vtkm::Id, dimensions> PointDimensions;
|
||||
vtkm::Vec3f MinPoint;
|
||||
vtkm::Vec3f MaxPoint;
|
||||
};
|
||||
|
||||
@ -74,7 +74,7 @@ public:
|
||||
else if (status == ParticleStatus::AT_SPATIAL_BOUNDARY)
|
||||
{
|
||||
status = integrator->SmallStep(inpos, time, outpos);
|
||||
integralCurve.TakeStep(idx, outpos, status);
|
||||
integralCurve.TakeStep(idx, outpos);
|
||||
integralCurve.SetTime(idx, time);
|
||||
if (status == ParticleStatus::AT_SPATIAL_BOUNDARY)
|
||||
{
|
||||
|
||||
@ -108,254 +108,253 @@ public:
|
||||
{
|
||||
ClearBit(idx, STATUS_OK);
|
||||
SetBit(idx, AT_TEMPORAL_BOUNDARY);
|
||||
void SetTookAnySteps(const vtkm::Id& idx, const bool& val)
|
||||
{
|
||||
if (val)
|
||||
SetBit(idx, TOOK_ANY_STEPS);
|
||||
else
|
||||
ClearBit(idx, TOOK_ANY_STEPS);
|
||||
}
|
||||
VTKM_EXEC
|
||||
void SetExitedSpatialBoundary(const vtkm::Id& idx)
|
||||
{
|
||||
ClearBit(idx, STATUS_OK);
|
||||
SetBit(idx, EXITED_SPATIAL_BOUNDARY);
|
||||
}
|
||||
VTKM_EXEC
|
||||
void SetExitedTemporalBoundary(const vtkm::Id& idx)
|
||||
{
|
||||
ClearBit(idx, STATUS_OK);
|
||||
SetBit(idx, EXITED_TEMPORAL_BOUNDARY);
|
||||
}
|
||||
VTKM_EXEC
|
||||
void SetError(const vtkm::Id& idx)
|
||||
{
|
||||
ClearBit(idx, STATUS_OK);
|
||||
SetBit(idx, STATUS_ERROR);
|
||||
}
|
||||
|
||||
/* Check Status */
|
||||
VTKM_EXEC
|
||||
bool OK(const vtkm::Id& idx) { return CheckBit(idx, STATUS_OK); }
|
||||
VTKM_EXEC
|
||||
bool Terminated(const vtkm::Id& idx) { return CheckBit(idx, TERMINATED); }
|
||||
VTKM_EXEC
|
||||
bool AtSpatialBoundary(const vtkm::Id& idx) { return CheckBit(idx, AT_SPATIAL_BOUNDARY); }
|
||||
VTKM_EXEC
|
||||
bool AtTemporalBoundary(const vtkm::Id& idx) { return CheckBit(idx, AT_TEMPORAL_BOUNDARY); }
|
||||
VTKM_EXEC
|
||||
bool ExitedSpatialBoundary(const vtkm::Id& idx)
|
||||
{
|
||||
return CheckBit(idx, EXITED_SPATIAL_BOUNDARY);
|
||||
}
|
||||
VTKM_EXEC
|
||||
bool ExitedTemporalBoundary(const vtkm::Id& idx)
|
||||
{
|
||||
return CheckBit(idx, EXITED_TEMPORAL_BOUNDARY);
|
||||
}
|
||||
VTKM_EXEC
|
||||
bool Error(const vtkm::Id& idx) { return CheckBit(idx, STATUS_ERROR); }
|
||||
VTKM_EXEC
|
||||
bool Integrateable(const vtkm::Id& idx)
|
||||
{
|
||||
return OK(idx) && !(Terminated(idx) || AtSpatialBoundary(idx) || AtTemporalBoundary(idx));
|
||||
}
|
||||
VTKM_EXEC
|
||||
bool Done(const vtkm::Id& idx) { return !Integrateable(idx); }
|
||||
|
||||
/* Bit Operations */
|
||||
VTKM_EXEC
|
||||
void Clear(const vtkm::Id& idx) { Status.Set(idx, 0); }
|
||||
VTKM_EXEC
|
||||
void SetBit(const vtkm::Id& idx, const ParticleStatus& b)
|
||||
{
|
||||
Status.Set(idx, Status.Get(idx) | b);
|
||||
}
|
||||
VTKM_EXEC
|
||||
void ClearBit(const vtkm::Id& idx, const ParticleStatus& b)
|
||||
{
|
||||
Status.Set(idx, Status.Get(idx) & ~b);
|
||||
}
|
||||
VTKM_EXEC
|
||||
bool CheckBit(const vtkm::Id& idx, const ParticleStatus& b) const
|
||||
{
|
||||
return (Status.Get(idx) & b) != 0;
|
||||
}
|
||||
|
||||
VTKM_EXEC
|
||||
VectorType GetPos(const vtkm::Id& idx) const { return Pos.Get(idx); }
|
||||
VTKM_EXEC
|
||||
vtkm::Id GetStep(const vtkm::Id& idx) const { return Steps.Get(idx); }
|
||||
VTKM_EXEC
|
||||
vtkm::Id GetStatus(const vtkm::Id& idx) const { return Status.Get(idx); }
|
||||
VTKM_EXEC
|
||||
ScalarType GetTime(const vtkm::Id& idx) const { return Time.Get(idx); }
|
||||
VTKM_EXEC
|
||||
void SetTime(const vtkm::Id& idx, ScalarType time) const { Time.Set(idx, time); }
|
||||
|
||||
protected:
|
||||
using IdPortal =
|
||||
typename vtkm::cont::ArrayHandle<vtkm::Id>::template ExecutionTypes<Device>::Portal;
|
||||
using PositionPortal =
|
||||
typename vtkm::cont::ArrayHandle<VectorType>::template ExecutionTypes<Device>::Portal;
|
||||
using FloatPortal =
|
||||
typename vtkm::cont::ArrayHandle<ScalarType>::template ExecutionTypes<Device>::Portal;
|
||||
|
||||
PositionPortal Pos;
|
||||
IdPortal Status;
|
||||
IdPortal Steps;
|
||||
FloatPortal Time;
|
||||
vtkm::Id MaxSteps;
|
||||
};
|
||||
|
||||
|
||||
class Particles : public vtkm::cont::ExecutionObjectBase
|
||||
}
|
||||
VTKM_EXEC
|
||||
void SetTookAnySteps(const vtkm::Id& idx, const bool& val)
|
||||
{
|
||||
private:
|
||||
using ScalarType = vtkm::worklet::particleadvection::ScalarType;
|
||||
using VectorType = vtkm::Vec<ScalarType, 3>;
|
||||
if (val)
|
||||
SetBit(idx, TOOK_ANY_STEPS);
|
||||
else
|
||||
ClearBit(idx, TOOK_ANY_STEPS);
|
||||
}
|
||||
VTKM_EXEC
|
||||
void SetExitedSpatialBoundary(const vtkm::Id& idx)
|
||||
{
|
||||
ClearBit(idx, STATUS_OK);
|
||||
SetBit(idx, EXITED_SPATIAL_BOUNDARY);
|
||||
}
|
||||
VTKM_EXEC
|
||||
void SetExitedTemporalBoundary(const vtkm::Id& idx)
|
||||
{
|
||||
ClearBit(idx, STATUS_OK);
|
||||
SetBit(idx, EXITED_TEMPORAL_BOUNDARY);
|
||||
}
|
||||
VTKM_EXEC
|
||||
void SetError(const vtkm::Id& idx)
|
||||
{
|
||||
ClearBit(idx, STATUS_OK);
|
||||
SetBit(idx, STATUS_ERROR);
|
||||
}
|
||||
|
||||
public:
|
||||
template <typename Device>
|
||||
VTKM_CONT vtkm::worklet::particleadvection::ParticleExecutionObject<Device> PrepareForExecution(
|
||||
Device) const
|
||||
{
|
||||
/* Check Status */
|
||||
VTKM_EXEC
|
||||
bool OK(const vtkm::Id& idx) { return CheckBit(idx, STATUS_OK); }
|
||||
VTKM_EXEC
|
||||
bool Terminated(const vtkm::Id& idx) { return CheckBit(idx, TERMINATED); }
|
||||
VTKM_EXEC
|
||||
bool AtSpatialBoundary(const vtkm::Id& idx) { return CheckBit(idx, AT_SPATIAL_BOUNDARY); }
|
||||
VTKM_EXEC
|
||||
bool AtTemporalBoundary(const vtkm::Id& idx) { return CheckBit(idx, AT_TEMPORAL_BOUNDARY); }
|
||||
VTKM_EXEC
|
||||
bool ExitedSpatialBoundary(const vtkm::Id& idx) { return CheckBit(idx, EXITED_SPATIAL_BOUNDARY); }
|
||||
VTKM_EXEC
|
||||
bool ExitedTemporalBoundary(const vtkm::Id& idx)
|
||||
{
|
||||
return CheckBit(idx, EXITED_TEMPORAL_BOUNDARY);
|
||||
}
|
||||
VTKM_EXEC
|
||||
bool Error(const vtkm::Id& idx) { return CheckBit(idx, STATUS_ERROR); }
|
||||
VTKM_EXEC
|
||||
bool Integrateable(const vtkm::Id& idx)
|
||||
{
|
||||
return OK(idx) && !(Terminated(idx) || AtSpatialBoundary(idx) || AtTemporalBoundary(idx));
|
||||
}
|
||||
VTKM_EXEC
|
||||
bool Done(const vtkm::Id& idx) { return !Integrateable(idx); }
|
||||
|
||||
return vtkm::worklet::particleadvection::ParticleExecutionObject<Device>(
|
||||
this->PosArray, this->StepsArray, this->StatusArray, this->TimeArray, this->MaxSteps);
|
||||
}
|
||||
/* Bit Operations */
|
||||
VTKM_EXEC
|
||||
void Clear(const vtkm::Id& idx) { Status.Set(idx, 0); }
|
||||
VTKM_EXEC
|
||||
void SetBit(const vtkm::Id& idx, const ParticleStatus& b)
|
||||
{
|
||||
Status.Set(idx, Status.Get(idx) | b);
|
||||
}
|
||||
VTKM_EXEC
|
||||
void ClearBit(const vtkm::Id& idx, const ParticleStatus& b)
|
||||
{
|
||||
Status.Set(idx, Status.Get(idx) & ~b);
|
||||
}
|
||||
VTKM_EXEC
|
||||
bool CheckBit(const vtkm::Id& idx, const ParticleStatus& b) const
|
||||
{
|
||||
return (Status.Get(idx) & b) != 0;
|
||||
}
|
||||
|
||||
VTKM_CONT
|
||||
Particles(vtkm::cont::ArrayHandle<VectorType>& posArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& stepsArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& statusArray,
|
||||
vtkm::cont::ArrayHandle<ScalarType>& timeArray,
|
||||
const vtkm::Id& maxSteps)
|
||||
: PosArray(posArray)
|
||||
, StepsArray(stepsArray)
|
||||
, StatusArray(statusArray)
|
||||
, TimeArray(timeArray)
|
||||
, MaxSteps(maxSteps)
|
||||
{
|
||||
}
|
||||
VTKM_EXEC
|
||||
VectorType GetPos(const vtkm::Id& idx) const { return Pos.Get(idx); }
|
||||
VTKM_EXEC
|
||||
vtkm::Id GetStep(const vtkm::Id& idx) const { return Steps.Get(idx); }
|
||||
VTKM_EXEC
|
||||
vtkm::Id GetStatus(const vtkm::Id& idx) const { return Status.Get(idx); }
|
||||
VTKM_EXEC
|
||||
ScalarType GetTime(const vtkm::Id& idx) const { return Time.Get(idx); }
|
||||
VTKM_EXEC
|
||||
void SetTime(const vtkm::Id& idx, ScalarType time) const { Time.Set(idx, time); }
|
||||
|
||||
Particles() {}
|
||||
protected:
|
||||
using IdPortal =
|
||||
typename vtkm::cont::ArrayHandle<vtkm::Id>::template ExecutionTypes<Device>::Portal;
|
||||
using PositionPortal =
|
||||
typename vtkm::cont::ArrayHandle<VectorType>::template ExecutionTypes<Device>::Portal;
|
||||
using FloatPortal =
|
||||
typename vtkm::cont::ArrayHandle<ScalarType>::template ExecutionTypes<Device>::Portal;
|
||||
|
||||
protected:
|
||||
bool fromArray = false;
|
||||
PositionPortal Pos;
|
||||
IdPortal Status;
|
||||
IdPortal Steps;
|
||||
FloatPortal Time;
|
||||
vtkm::Id MaxSteps;
|
||||
};
|
||||
|
||||
protected:
|
||||
vtkm::cont::ArrayHandle<VectorType> PosArray;
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> StepsArray;
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> StatusArray;
|
||||
vtkm::cont::ArrayHandle<ScalarType> TimeArray;
|
||||
vtkm::Id MaxSteps;
|
||||
};
|
||||
|
||||
class Particles : public vtkm::cont::ExecutionObjectBase
|
||||
{
|
||||
private:
|
||||
using ScalarType = vtkm::worklet::particleadvection::ScalarType;
|
||||
using VectorType = vtkm::Vec<ScalarType, 3>;
|
||||
|
||||
public:
|
||||
template <typename Device>
|
||||
VTKM_CONT vtkm::worklet::particleadvection::ParticleExecutionObject<Device> PrepareForExecution(
|
||||
Device) const
|
||||
{
|
||||
|
||||
return vtkm::worklet::particleadvection::ParticleExecutionObject<Device>(
|
||||
this->PosArray, this->StepsArray, this->StatusArray, this->TimeArray, this->MaxSteps);
|
||||
}
|
||||
|
||||
VTKM_CONT
|
||||
Particles(vtkm::cont::ArrayHandle<VectorType>& posArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& stepsArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& statusArray,
|
||||
vtkm::cont::ArrayHandle<ScalarType>& timeArray,
|
||||
const vtkm::Id& maxSteps)
|
||||
: PosArray(posArray)
|
||||
, StepsArray(stepsArray)
|
||||
, StatusArray(statusArray)
|
||||
, TimeArray(timeArray)
|
||||
, MaxSteps(maxSteps)
|
||||
{
|
||||
}
|
||||
|
||||
Particles() {}
|
||||
|
||||
protected:
|
||||
bool fromArray = false;
|
||||
|
||||
protected:
|
||||
vtkm::cont::ArrayHandle<VectorType> PosArray;
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> StepsArray;
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> StatusArray;
|
||||
vtkm::cont::ArrayHandle<ScalarType> TimeArray;
|
||||
vtkm::Id MaxSteps;
|
||||
};
|
||||
|
||||
|
||||
template <typename Device>
|
||||
class StateRecordingParticleExecutionObject : public ParticleExecutionObject<Device>
|
||||
{
|
||||
using ScalarType = vtkm::worklet::particleadvection::ScalarType;
|
||||
using VectorType = vtkm::Vec<ScalarType, 3>;
|
||||
|
||||
public:
|
||||
VTKM_EXEC_CONT
|
||||
StateRecordingParticleExecutionObject()
|
||||
: ParticleExecutionObject<Device>()
|
||||
, History()
|
||||
, Length(0)
|
||||
, ValidPoint()
|
||||
{
|
||||
}
|
||||
|
||||
StateRecordingParticleExecutionObject(vtkm::cont::ArrayHandle<VectorType> posArray,
|
||||
vtkm::cont::ArrayHandle<VectorType> historyArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> stepsArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> statusArray,
|
||||
vtkm::cont::ArrayHandle<ScalarType> timeArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> validPointArray,
|
||||
vtkm::Id maxSteps)
|
||||
: ParticleExecutionObject<Device>(posArray, stepsArray, statusArray, timeArray, maxSteps)
|
||||
{
|
||||
Length = maxSteps;
|
||||
vtkm::Id numPos = posArray.GetNumberOfValues();
|
||||
History = historyArray.PrepareForOutput(numPos * Length, Device());
|
||||
ValidPoint = validPointArray.PrepareForInPlace(Device());
|
||||
}
|
||||
|
||||
VTKM_EXEC_CONT
|
||||
void TakeStep(const vtkm::Id& idx, const VectorType& pt)
|
||||
{
|
||||
this->ParticleExecutionObject<Device>::TakeStep(idx, pt);
|
||||
|
||||
//TakeStep incremented the step, so we want the PREV step value.
|
||||
vtkm::Id nSteps = this->Steps.Get(idx) - 1;
|
||||
|
||||
// Update the step for streamline storing portals.
|
||||
// This includes updating the history and the valid points.
|
||||
vtkm::Id loc = idx * Length + nSteps;
|
||||
this->History.Set(loc, pt);
|
||||
this->ValidPoint.Set(loc, 1);
|
||||
}
|
||||
|
||||
VectorType GetHistory(const vtkm::Id& idx, const vtkm::Id& step) const
|
||||
{
|
||||
return this->History.Get(idx * this->Length + step);
|
||||
}
|
||||
|
||||
protected:
|
||||
using IdPortal =
|
||||
typename vtkm::cont::ArrayHandle<vtkm::Id>::template ExecutionTypes<Device>::Portal;
|
||||
using PositionPortal =
|
||||
typename vtkm::cont::ArrayHandle<VectorType>::template ExecutionTypes<Device>::Portal;
|
||||
|
||||
PositionPortal History;
|
||||
vtkm::Id Length;
|
||||
IdPortal ValidPoint;
|
||||
};
|
||||
|
||||
class StateRecordingParticles : vtkm::cont::ExecutionObjectBase
|
||||
{
|
||||
public:
|
||||
using ScalarType = vtkm::worklet::particleadvection::ScalarType;
|
||||
using VectorType = vtkm::Vec<ScalarType, 3>;
|
||||
|
||||
template <typename Device>
|
||||
class StateRecordingParticleExecutionObject : public ParticleExecutionObject<Device>
|
||||
VTKM_CONT vtkm::worklet::particleadvection::StateRecordingParticleExecutionObject<Device>
|
||||
PrepareForExecution(Device) const
|
||||
{
|
||||
using ScalarType = vtkm::worklet::particleadvection::ScalarType;
|
||||
using VectorType = vtkm::Vec<ScalarType, 3>;
|
||||
return vtkm::worklet::particleadvection::StateRecordingParticleExecutionObject<Device>(
|
||||
PosArray, HistoryArray, StepsArray, StatusArray, TimeArray, ValidPointArray, MaxSteps);
|
||||
}
|
||||
|
||||
public:
|
||||
VTKM_EXEC_CONT
|
||||
StateRecordingParticleExecutionObject()
|
||||
: ParticleExecutionObject<Device>()
|
||||
, History()
|
||||
, Length(0)
|
||||
, ValidPoint()
|
||||
{
|
||||
}
|
||||
|
||||
StateRecordingParticleExecutionObject(vtkm::cont::ArrayHandle<VectorType> posArray,
|
||||
vtkm::cont::ArrayHandle<VectorType> historyArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> stepsArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> statusArray,
|
||||
vtkm::cont::ArrayHandle<ScalarType> timeArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> validPointArray,
|
||||
vtkm::Id maxSteps)
|
||||
: ParticleExecutionObject<Device>(posArray, stepsArray, statusArray, timeArray, maxSteps)
|
||||
{
|
||||
Length = maxSteps;
|
||||
vtkm::Id numPos = posArray.GetNumberOfValues();
|
||||
History = historyArray.PrepareForOutput(numPos * Length, Device());
|
||||
ValidPoint = validPointArray.PrepareForInPlace(Device());
|
||||
}
|
||||
|
||||
VTKM_EXEC_CONT
|
||||
void TakeStep(const vtkm::Id& idx, const VectorType& pt)
|
||||
{
|
||||
this->ParticleExecutionObject<Device>::TakeStep(idx, pt);
|
||||
|
||||
//TakeStep incremented the step, so we want the PREV step value.
|
||||
vtkm::Id nSteps = this->Steps.Get(idx) - 1;
|
||||
|
||||
// Update the step for streamline storing portals.
|
||||
// This includes updating the history and the valid points.
|
||||
vtkm::Id loc = idx * Length + nSteps;
|
||||
this->History.Set(loc, pt);
|
||||
this->ValidPoint.Set(loc, 1);
|
||||
}
|
||||
|
||||
VectorType GetHistory(const vtkm::Id& idx, const vtkm::Id& step) const
|
||||
{
|
||||
return this->History.Get(idx * this->Length + step);
|
||||
}
|
||||
|
||||
protected:
|
||||
using IdPortal =
|
||||
typename vtkm::cont::ArrayHandle<vtkm::Id>::template ExecutionTypes<Device>::Portal;
|
||||
using PositionPortal =
|
||||
typename vtkm::cont::ArrayHandle<VectorType>::template ExecutionTypes<Device>::Portal;
|
||||
|
||||
PositionPortal History;
|
||||
vtkm::Id Length;
|
||||
IdPortal ValidPoint;
|
||||
};
|
||||
|
||||
class StateRecordingParticles : vtkm::cont::ExecutionObjectBase
|
||||
VTKM_CONT
|
||||
StateRecordingParticles(vtkm::cont::ArrayHandle<VectorType>& posArray,
|
||||
vtkm::cont::ArrayHandle<VectorType>& historyArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& stepsArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& statusArray,
|
||||
vtkm::cont::ArrayHandle<ScalarType>& timeArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& validPointArray,
|
||||
const vtkm::Id& maxSteps)
|
||||
{
|
||||
public:
|
||||
using ScalarType = vtkm::worklet::particleadvection::ScalarType;
|
||||
using VectorType = vtkm::Vec<ScalarType, 3>;
|
||||
PosArray = posArray;
|
||||
HistoryArray = historyArray;
|
||||
StepsArray = stepsArray;
|
||||
StatusArray = statusArray;
|
||||
TimeArray = timeArray;
|
||||
ValidPointArray = validPointArray;
|
||||
MaxSteps = maxSteps;
|
||||
}
|
||||
|
||||
template <typename Device>
|
||||
VTKM_CONT vtkm::worklet::particleadvection::StateRecordingParticleExecutionObject<Device>
|
||||
PrepareForExecution(Device) const
|
||||
{
|
||||
return vtkm::worklet::particleadvection::StateRecordingParticleExecutionObject<Device>(
|
||||
PosArray, HistoryArray, StepsArray, StatusArray, TimeArray, ValidPointArray, MaxSteps);
|
||||
}
|
||||
|
||||
VTKM_CONT
|
||||
StateRecordingParticles(vtkm::cont::ArrayHandle<VectorType>& posArray,
|
||||
vtkm::cont::ArrayHandle<VectorType>& historyArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& stepsArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& statusArray,
|
||||
vtkm::cont::ArrayHandle<ScalarType>& timeArray,
|
||||
vtkm::cont::ArrayHandle<vtkm::Id>& validPointArray,
|
||||
const vtkm::Id& maxSteps)
|
||||
{
|
||||
PosArray = posArray;
|
||||
HistoryArray = historyArray;
|
||||
StepsArray = stepsArray;
|
||||
StatusArray = statusArray;
|
||||
TimeArray = timeArray;
|
||||
ValidPointArray = validPointArray;
|
||||
MaxSteps = maxSteps;
|
||||
}
|
||||
|
||||
protected:
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> StepsArray;
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> StatusArray;
|
||||
vtkm::cont::ArrayHandle<ScalarType> TimeArray;
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> ValidPointArray;
|
||||
vtkm::cont::ArrayHandle<VectorType> HistoryArray;
|
||||
vtkm::cont::ArrayHandle<VectorType> PosArray;
|
||||
vtkm::Id MaxSteps;
|
||||
};
|
||||
protected:
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> StepsArray;
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> StatusArray;
|
||||
vtkm::cont::ArrayHandle<ScalarType> TimeArray;
|
||||
vtkm::cont::ArrayHandle<vtkm::Id> ValidPointArray;
|
||||
vtkm::cont::ArrayHandle<VectorType> HistoryArray;
|
||||
vtkm::cont::ArrayHandle<VectorType> PosArray;
|
||||
vtkm::Id MaxSteps;
|
||||
};
|
||||
|
||||
|
||||
} //namespace particleadvection
|
||||
|
||||
Loading…
Reference in New Issue
Block a user