Commit 9cf62c43 authored by Michael Migliore's avatar Michael Migliore Committed by Kitware Robot
Browse files

Merge topic 'change-tag'

d8f19b8c update visit tag
eaae6dee Merge branch 'upstream-visit-databases' into change-tag
e175afdd

 visit-databases 2019-07-12 (033fd0e8)
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Mathieu Westphal's avatarMathieu Westphal <mathieu.westphal@kitware.com>
Acked-by: Will Schroeder's avatarWill Schroeder <will.schroeder@kitware.com>
Merge-request: !64
parents 6cdf4b84 d8f19b8c
......@@ -1302,7 +1302,8 @@ avtMiliFileFormat::ReadMesh(int dom)
#ifdef VTK_USE_64BIT_IDS
// Convert from int to idtype so we can compile with 64-bit support.
vtkIdType *connIdType = new vtkIdType[nelems * conn_count[i]];
for (int idx = 0; idx < nelems < conn_count[i]; ++idx)
int maxIdx = nelems * conn_count[i];
for (int idx = 0; idx < maxIdx; ++idx)
{
connIdType[idx] = conn[idx];
}
......
......@@ -6417,7 +6417,7 @@ void visit_vtkOpenFOAMReaderPrivate::InterpolateCellToPoint(vtkFloatArray *pData
vtkCellLinks *cl = NULL;
if (ug)
{
cl = ug->GetCellLinks();
cl = vtkCellLinks::SafeDownCast(ug->GetCellLinks());
}
const int nComponents = iData->GetNumberOfComponents();
......@@ -6429,7 +6429,7 @@ void visit_vtkOpenFOAMReaderPrivate::InterpolateCellToPoint(vtkFloatArray *pData
for (int pointI = 0; pointI < nPoints; pointI++)
{
const int pI = (pointList ? pointList->GetValue(pointI) : pointI);
unsigned short nCells;
vtkIdType nCells;
vtkIdType *cells;
if (cl)
{
......@@ -6459,7 +6459,7 @@ void visit_vtkOpenFOAMReaderPrivate::InterpolateCellToPoint(vtkFloatArray *pData
for (int pointI = 0; pointI < nPoints; pointI++)
{
const int pI = (pointList ? pointList->GetValue(pointI) : pointI);
unsigned short nCells;
vtkIdType nCells;
vtkIdType *cells;
if (cl)
{
......@@ -6496,7 +6496,7 @@ void visit_vtkOpenFOAMReaderPrivate::InterpolateCellToPoint(vtkFloatArray *pData
for (int pointI = 0; pointI < nPoints; pointI++)
{
const int pI = (pointList ? pointList->GetValue(pointI) : pointI);
unsigned short nCells;
vtkIdType nCells;
vtkIdType *cells;
if (cl)
{
......
......@@ -8,7 +8,7 @@ readonly name="visit-databases"
readonly ownership="VisIt Upstream <kwrobot@kitware.com>"
readonly subtree="databases/readers"
readonly repo="https://gitlab.kitware.com/third-party/visit.git"
readonly tag="for/paraview-20190320-trunk-r34006"
readonly tag="for/paraview-20190712-trunk-r34006"
readonly paths="
COPYRIGHT
......
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