Commit bfd1cedd authored by Berk Geveci's avatar Berk Geveci Committed by Kitware Robot

Merge topic 'plot3d_fixes'

557ec619 Error checking: check status of collective call.
d9555377 Fix typo in call to superclass method.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci's avatarBerk Geveci <berk.geveci@kitware.com>
Merge-request: !432
parents cbaa45e0 557ec619
...@@ -120,8 +120,11 @@ namespace ...@@ -120,8 +120,11 @@ namespace
int numIterations = static_cast<int>(valuesToRead/_INT_MAX) + 1; int numIterations = static_cast<int>(valuesToRead/_INT_MAX) + 1;
int maxNumIterations; int maxNumIterations;
MPI_Allreduce(&numIterations, &maxNumIterations, 1, mpi_type<int>::type(), if (MPI_Allreduce(&numIterations, &maxNumIterations, 1, mpi_type<int>::type(),
MPI_MAX, *this->Communicator.GetHandle()); MPI_MAX, *this->Communicator.GetHandle()) != MPI_SUCCESS)
{
throw MPIPlot3DException();
}
vtkTypeUInt64 byteOffset = this->Offset; vtkTypeUInt64 byteOffset = this->Offset;
// simply use the VTK array for scalars. // simply use the VTK array for scalars.
...@@ -266,7 +269,7 @@ int vtkMPIMultiBlockPLOT3DReader::ReadIntScalar( ...@@ -266,7 +269,7 @@ int vtkMPIMultiBlockPLOT3DReader::ReadIntScalar(
{ {
if (!this->CanUseMPIIO()) if (!this->CanUseMPIIO())
{ {
return this->Superclass::ReadScalar(vfp, extent, wextent, scalar, offset); return this->Superclass::ReadIntScalar(vfp, extent, wextent, scalar, offset);
} }
return this->ReadScalar(vfp, extent, wextent, scalar, offset); return this->ReadScalar(vfp, extent, wextent, scalar, offset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment