Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fixing streamline output for no step

Browse Source
This commit is contained in:
Abhishek Yenpure 2023-07-12 15:19:46 -07:00
parent 1026b6dbaf
commit 6f57f33318
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vtkm/filter/flow/worklet/Analysis.h
View File

@ -35,6 +35,12 @@ public:
VTKM_EXEC_CONT
NoAnalysisExec() {}
VTKM_EXEC void PreStepAnalyze(const vtkm::Id index, const ParticleType& particle)
{
(void)index;
(void)particle;
}
//template <typename ParticleType>
VTKM_EXEC void Analyze(const vtkm::Id index,
const ParticleType& oldParticle,
@ -147,21 +153,26 @@ public:
Validity = validity.PrepareForInPlace(device, token);
}
VTKM_EXEC void PreStepAnalyze(const vtkm::Id index, const ParticleType& particle)
{
vtkm::Id streamLength = this->StreamLengths.Get(index);
if (streamLength == 0)
{
this->StreamLengths.Set(index, 1);
vtkm::Id loc = index * MaxSteps;
this->Streams.Set(loc, particle.GetPosition());
this->Validity.Set(loc, 1);
}
}
//template <typename ParticleType>
VTKM_EXEC void Analyze(const vtkm::Id index,
const ParticleType& oldParticle,
const ParticleType& newParticle)
{
vtkm::Id loc = index * MaxSteps;
(void)oldParticle;
vtkm::Id streamLength = this->StreamLengths.Get(index);
if (streamLength == 0)
{
this->StreamLengths.Set(index, 1);
this->Streams.Set(loc, oldParticle.GetPosition());
this->Validity.Set(loc, 1);
++streamLength;
}
loc += streamLength;
vtkm::Id loc = index * MaxSteps + streamLength;
this->StreamLengths.Set(index, ++streamLength);
this->Streams.Set(loc, newParticle.GetPosition());
this->Validity.Set(loc, 1);
@ -317,9 +328,6 @@ public:
this->PolyLines.Fill(this->Streams.GetNumberOfValues(), cellTypes, connectivity, offsets);
this->Particles = particles;
//this->Validity.ReleaseResources();
//this->InitialLengths.ReleaseResources();
//this->StreamLengths.ReleaseResources();
}

2
vtkm/filter/flow/worklet/ParticleAdvectionWorklets.h
View File

@ -64,7 +64,7 @@ public:
// 1. you could have success AND at temporal boundary.
// 2. could you have success AND at spatial?
// 3. all three?
integralCurve.PreStepUpdate(idx);
integralCurve.PreStepUpdate(idx, particle);
do
{
particle = integralCurve.GetParticle(idx);

5
vtkm/filter/flow/worklet/Particles.h
View File

@ -51,7 +51,10 @@ public:
ParticleType GetParticle(const vtkm::Id& idx) { return this->Particles.Get(idx); }
VTKM_EXEC
void PreStepUpdate(const vtkm::Id& vtkmNotUsed(idx)) {}
void PreStepUpdate(const vtkm::Id& idx, const ParticleType& particle)
{
this->Analysis.PreStepAnalyze(idx, particle);
}
VTKM_EXEC
void StepUpdate(const vtkm::Id& idx,