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

fix compile warnings.

Browse Source
This commit is contained in:
Dave Pugmire 2020-11-21 22:20:20 -05:00
parent 9da2b86d72
commit 9b290994f5
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/filter/particleadvection/AdvectorBaseAlgorithm.h
View File

@ -104,10 +104,8 @@ public:
{
std::vector<vtkm::Particle> v;
vtkm::Id numTerm = 0, blockId = -1;
std::size_t numV = 0;
if (GetActiveParticles(v, blockId))
{
numV = v.size();
const auto& block = this->GetDataSet(blockId);
ResultType r;

10
vtkm/filter/particleadvection/ParticleMessenger.cxx
View File

@ -51,6 +51,10 @@ std::size_t ParticleMessenger::CalcParticleBufferSize(std::size_t nParticles, st
+ sizeof(vtkm::UInt8) // Status
+ sizeof(vtkm::FloatDefault); // Time
//If this assert fires, vtkm::Particle changed
//and pSize should be updated.
VTKM_ASSERT(pSize == sizeof(vtkm::Particle));
return
// rank
sizeof(int)
@ -72,7 +76,8 @@ void ParticleMessenger::SerialExchange(
const std::unordered_map<vtkm::Id, std::vector<vtkm::Id>>& outBlockIDsMap,
vtkm::Id vtkmNotUsed(numLocalTerm),
std::vector<vtkm::Particle>& inData,
std::unordered_map<vtkm::Id, std::vector<vtkm::Id>>& inDataBlockIDsMap) const
std::unordered_map<vtkm::Id, std::vector<vtkm::Id>>& inDataBlockIDsMap,
bool vtkmNotUsed(blockAndWait)) const
{
for (auto& p : outData)
{
@ -96,7 +101,8 @@ void ParticleMessenger::Exchange(
inDataBlockIDsMap.clear();
if (this->NumRanks == 1)
return this->SerialExchange(outData, outBlockIDsMap, numLocalTerm, inData, inDataBlockIDsMap);
return this->SerialExchange(
outData, outBlockIDsMap, numLocalTerm, inData, inDataBlockIDsMap, blockAndWait);
#ifdef VTKM_ENABLE_MPI

3
vtkm/filter/particleadvection/ParticleMessenger.h
View File

@ -102,7 +102,8 @@ protected:
const std::unordered_map<vtkm::Id, std::vector<vtkm::Id>>& outBlockIDsMap,
vtkm::Id numLocalTerm,
std::vector<vtkm::Particle>& inData,
std::unordered_map<vtkm::Id, std::vector<vtkm::Id>>& inDataBlockIDsMap) const;
std::unordered_map<vtkm::Id, std::vector<vtkm::Id>>& inDataBlockIDsMap,
bool blockAndWait) const;
static std::size_t CalcParticleBufferSize(std::size_t nParticles, std::size_t numBlockIds = 2);
};