Commit 7dd96fbb authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Merge branch 'upstream-visit-databases' into boxlib-fixes

* upstream-visit-databases:
  visit-databases 2019-07-15 (0bd6ed10)
parents db1b489f 1d064f65
Pipeline #141258 failed with stage
#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
......
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