Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RK4Integrator now properly initializes all variables.

Browse Source 
Previously the RK4Integrator could compute velocity with uninitialized inputs.
This commit is contained in:
Robert Maynard 2018-04-17 12:00:23 -04:00
parent d2001fb52e
commit c33bf063f4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@
#ifndef vtk_m_worklet_particleadvection_Integrators_h
#define vtk_m_worklet_particleadvection_Integrators_h
#include <vtkm/TypeTraits.h>
#include <vtkm/Types.h>
#include <vtkm/VectorAnalysis.h>
#include <vtkm/cont/DataSet.h>
@ -171,7 +172,8 @@ public:
{
return ParticleStatus::EXITED_SPATIAL_BOUNDARY;
}
vtkm::Vec<FieldType, 3> k1, k2, k3, k4;
vtkm::Vec<FieldType, 3> k1 = vtkm::TypeTraits<vtkm::Vec<FieldType, 3>>::ZeroInitialization();
vtkm::Vec<FieldType, 3> k2 = k1, k3 = k1, k4 = k1;
bool firstOrderValid = this->Evaluator.Evaluate(inpos, k1);
bool secondOrderValid = this->Evaluator.Evaluate(inpos + (stepLength / 2) * k1, k2);
bool thirdOrderValid = this->Evaluator.Evaluate(inpos + (stepLength / 2) * k2, k3);
@ -179,6 +181,7 @@ public:
velocity = (k1 + 2 * k2 + 2 * k3 + k4) / 6.0f;
if (firstOrderValid && secondOrderValid && thirdOrderValid && fourthOrderValid)
{
return ParticleStatus::STATUS_OK;
}
else