Commit 08d240c8 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Merge branch 'boxlib-fixes' into 'master'

Boxlib fixes

See merge request !63
parents 9cf62c43 7dd96fbb
#include "vtkPVConfig.h"
#ifdef PARAVIEW_USE_MPI
// xxx(kitware)
#if VTK_MODULE_ENABLE_VTK_mpi
// if MPI is enabled, let BoxLib know that too.
#define BL_USE_MPI 1
#endif
......
......@@ -3,15 +3,6 @@ SET(SOURCES
BoxLibHelper.C
)
set(defines)
if (PARAVIEW_USE_MPI)
list(APPEND defines
BL_USE_MPI)
endif ()
set_source_files_properties(avtBoxlibFileFormat.C
COMPILE_DEFINITIONS ${defines})
if(Boxlib_FOUND)
ADD_VISIT_READER(VisItBoxlib3DReader "1.0"
VISIT_READER_TYPE "STMD"
......
......@@ -67,7 +67,10 @@
// It is necessary to define BL_USE_MPI for Boxlib to avoid collision of
// type definitions for MPI_Comm in Boxlib header files with MPI library
#ifdef PARALLEL
// xxx(kitware)
#if VTK_MODULE_ENABLE_VTK_mpi
// if MPI is enabled, let BoxLib know that too.
#define BL_USE_MPI 1
#endif
#define BL_USE_SPACEDIM_SYMBOLS
......
......@@ -1302,8 +1302,7 @@ 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]];
int maxIdx = nelems * conn_count[i];
for (int idx = 0; idx < maxIdx; ++idx)
for (int idx = 0; idx < nelems < conn_count[i]; ++idx)
{
connIdType[idx] = conn[idx];
}
......
......@@ -6417,7 +6417,7 @@ void visit_vtkOpenFOAMReaderPrivate::InterpolateCellToPoint(vtkFloatArray *pData
vtkCellLinks *cl = NULL;
if (ug)
{
cl = vtkCellLinks::SafeDownCast(ug->GetCellLinks());
cl = 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);
vtkIdType nCells;
unsigned short 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);
vtkIdType nCells;
unsigned short 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);
vtkIdType nCells;
unsigned short 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-20190712-trunk-r34006"
readonly tag="for/paraview-20190715-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