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

Merge topic 'conversion-warning'

Browse Source 
b5ed6e725 Fix some conversion warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2235
This commit is contained in:
Kenneth Moreland 2020-08-25 14:55:53 +00:00 committed by Kitware Robot
commit 82f2e37959
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarking/BenchmarkODEIntegrators.cxx
View File

@ -59,7 +59,7 @@ void BenchParticleAdvection(::benchmark::State& state)
vtkm::filter::ParticleAdvection particleAdvection;
particleAdvection.SetStepSize(vtkm::FloatDefault(1) / state.range(0));
particleAdvection.SetNumberOfSteps(state.range(0));
particleAdvection.SetNumberOfSteps(static_cast<vtkm::Id>(state.range(0)));
particleAdvection.SetSeeds(seedArray);
particleAdvection.SetActiveField("vector");
vtkm::cont::Timer timer{ device };

10
vtkm/cont/testing/TestingBitField.h
View File

@ -150,12 +150,12 @@ struct TestingBitField
// NumBits should be rounded up to the nearest block of bytes, as defined in
// the traits:
const vtkm::Id bytesInFieldData = field.GetBuffer().GetNumberOfBytes();
const vtkm::BufferSizeType bytesInFieldData = field.GetBuffer().GetNumberOfBytes();
const vtkm::Id blockSize = vtkm::cont::detail::BitFieldTraits::BlockSize;
const vtkm::Id numBytes = (NUM_BITS + CHAR_BIT - 1) / CHAR_BIT;
const vtkm::Id numBlocks = (numBytes + blockSize - 1) / blockSize;
const vtkm::Id expectedBytes = numBlocks * blockSize;
const vtkm::BufferSizeType blockSize = vtkm::cont::detail::BitFieldTraits::BlockSize;
const vtkm::BufferSizeType numBytes = (NUM_BITS + CHAR_BIT - 1) / CHAR_BIT;
const vtkm::BufferSizeType numBlocks = (numBytes + blockSize - 1) / blockSize;
const vtkm::BufferSizeType expectedBytes = numBlocks * blockSize;
VTKM_TEST_ASSERT(bytesInFieldData == expectedBytes,
"The BitField allocation does not round up to the nearest "