Commit 1d064f65 authored by Kitware Robot's avatar Kitware Robot Committed by Utkarsh Ayachit
Browse files

visit-databases 2019-07-15 (0bd6ed10)

Code extracted from:

    https://gitlab.kitware.com/third-party/visit.git

at commit 0bd6ed10e254bdbd42a1d43104cac716d9fdbb25 (for/paraview-20190715-trunk-r34006).
parent e175afdd
#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
......
......@@ -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)
{
......
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