Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 02:55:47 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fixing template errors for particle advection

Browse Source
This commit is contained in:
Yenpure 2017-08-04 14:07:40 -04:00
parent 0daeee70ec
commit e99567fe16
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vtkm/worklet/particleadvection/Integrators.h
View File

@ -75,7 +75,7 @@ public:
vtkm::Vec<FieldType, 3>& velocity) const
{
using ConcreteType = IntegratorType<FieldEvaluateType, FieldType>;
return static_cast<ConcreteType>(this)->CheckStep(inpos, stepLength, velocity);
return static_cast<const ConcreteType*>(this)->CheckStep(inpos, stepLength, velocity);
}
VTKM_EXEC
@ -135,15 +135,16 @@ class RK4Integrator : public Integrator<FieldEvaluateType, FieldType, RK4Integra
public:
VTKM_EXEC_CONT
RK4Integrator()
: Integrator<FieldEvaluateType, FieldType, RK4Integrator::template RK4Integrator>()
: Integrator<FieldEvaluateType, FieldType, vtkm::worklet::particleadvection::RK4Integrator>()
{
this->ShortStepsSupported = true;
}
VTKM_EXEC_CONT
RK4Integrator(const FieldEvaluateType& evaluator, FieldType stepLength)
: Integrator<FieldEvaluateType, FieldType, RK4Integrator::template RK4Integrator>(evaluator,
stepLength)
: Integrator<FieldEvaluateType, FieldType, vtkm::worklet::particleadvection::RK4Integrator>(
evaluator,
stepLength)
{
this->ShortStepsSupported = true;
}
@ -180,8 +181,9 @@ class EulerIntegrator : public Integrator<FieldEvaluateType, FieldType, EulerInt
public:
VTKM_EXEC_CONT
EulerIntegrator(const FieldEvaluateType& evaluator, FieldType field)
: Integrator<FieldEvaluateType, FieldType, EulerIntegrator::template EulerIntegrator>(evaluator,
field)
: Integrator<FieldEvaluateType, FieldType, vtkm::worklet::particleadvection::EulerIntegrator>(
evaluator,
field)
{
this->ShortStepsSupported = false;
}