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

warnings: int/size_t conversion warnings.

Browse Source
This commit is contained in:
Utkarsh Ayachit 2018-02-22 13:25:47 -05:00
parent 18fec92119
commit 4ade3984ac
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vtkm/cont/AssignerMultiBlock.cxx
View File

@ -54,16 +54,18 @@ AssignerMultiBlock::AssignerMultiBlock(const vtkm::cont::MultiBlock& mb)
VTKM_CONT
void AssignerMultiBlock::local_gids(int my_rank, std::vector<int>& gids) const
{
const size_t s_rank = static_cast<size_t>(my_rank);
if (my_rank == 0)
{
assert(this->IScanBlockCounts.size() > 0);
gids.resize(this->IScanBlockCounts[my_rank]);
gids.resize(static_cast<size_t>(this->IScanBlockCounts[s_rank]));
std::iota(gids.begin(), gids.end(), 0);
}
else if (my_rank > 0 && my_rank < static_cast<int>(this->IScanBlockCounts.size()))
else if (my_rank > 0 && s_rank < this->IScanBlockCounts.size())
{
gids.resize(this->IScanBlockCounts[my_rank] - this->IScanBlockCounts[my_rank - 1]);
std::iota(gids.begin(), gids.end(), this->IScanBlockCounts[my_rank - 1]);
gids.resize(
static_cast<size_t>(this->IScanBlockCounts[s_rank] - this->IScanBlockCounts[s_rank - 1]));
std::iota(gids.begin(), gids.end(), static_cast<int>(this->IScanBlockCounts[s_rank - 1]));
}
}

11
vtkm/cont/MultiBlock.cxx
View File

@ -52,10 +52,15 @@ template <typename PortalType>
VTKM_CONT std::vector<typename PortalType::ValueType> CopyArrayPortalToVector(
const PortalType& portal)
{
const size_t count =
portal.GetNumberOfValues() > 0 ? static_cast<size_t>(portal.GetNumberOfValues()) : 0;
using ValueType = typename PortalType::ValueType;
std::vector<ValueType> result(portal.GetNumberOfValues());
vtkm::cont::ArrayPortalToIterators<PortalType> iterators(portal);
std::copy(iterators.GetBegin(), iterators.GetEnd(), result.begin());
std::vector<ValueType> result(count);
if (count > 0)
{
vtkm::cont::ArrayPortalToIterators<PortalType> iterators(portal);
std::copy(iterators.GetBegin(), iterators.GetEnd(), result.begin());
}
return result;
}