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

Fix compiler warnings......

Browse Source
This commit is contained in:
Dave Pugmire 2023-04-18 21:09:10 -04:00
parent b8e9ca4ca5
commit 9d0a9bfbae
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/filter/flow/internal/BoundsMap.h
View File

@ -63,10 +63,10 @@ public:
vtkm::Bounds GetGlobalBounds() const { return this->GlobalBounds; }
vtkm::Bounds GetBlockBounds(std::size_t idx) const
vtkm::Bounds GetBlockBounds(vtkm::Id idx) const
{
VTKM_ASSERT(idx < this->BlockBounds.size());
return this->BlockBounds[idx];
VTKM_ASSERT(idx >= 0 && static_cast<std::size_t>(idx) < this->BlockBounds.size());
return this->BlockBounds[static_cast<std::size_t>(idx)];
}
vtkm::Id GetLocalBlockId(vtkm::Id idx) const
@ -146,7 +146,7 @@ private:
//note: there might be duplicates...
vtkm::Id globalNumBlocks =
std::accumulate(globalBlockCounts.begin(), globalBlockCounts.end(), 0);
std::accumulate(globalBlockCounts.begin(), globalBlockCounts.end(), vtkm::Id{ 0 });
//3. given the counts per rank, calc offset for this rank.
vtkm::Id offset = 0;

17
vtkm/filter/flow/internal/DataSetIntegrator.h
View File

@ -74,15 +74,16 @@ public:
void Validate(vtkm::Id num)
{
#ifndef NDEBUG
//Make sure we didn't miss anything. Every particle goes into a single bucket.
VTKM_ASSERT(static_cast<std::size_t>(num) ==
(this->InBounds.Particles.size() + this->OutOfBounds.Particles.size() +
this->TermIdx.size()));
VTKM_ASSERT(this->InBounds.Particles.size() == this->InBounds.BlockIDs.size());
VTKM_ASSERT(this->OutOfBounds.Particles.size() == this->OutOfBounds.BlockIDs.size());
VTKM_ASSERT(this->TermIdx.size() == this->TermID.size());
#endif
if ((static_cast<std::size_t>(num) !=
(this->InBounds.Particles.size() + this->OutOfBounds.Particles.size() +
this->TermIdx.size())) ||
(this->InBounds.Particles.size() != this->InBounds.BlockIDs.size()) ||
(this->OutOfBounds.Particles.size() != this->OutOfBounds.BlockIDs.size()) ||
(this->TermIdx.size() != this->TermID.size()))
{
throw vtkm::cont::ErrorFilterExecution("Particle count mismatch after classification");
}
}
void AddTerminated(vtkm::Id idx, vtkm::Id pID)