Merge pull request #38 from visit-dav/task/biagas/remove_eavl

Remove Eavl support.
visit-dav · Jan 30, 2019 · 184c993 · 184c993
2 parents cea5ccd + 6b59216
commit 184c993
Show file tree

Hide file tree

Showing 140 changed files with 296 additions and 565 deletions.
diff --git a/src/databases/ADIOS/CMakeLists.txt b/src/databases/ADIOS/CMakeLists.txt
@@ -8,7 +8,7 @@ ADIOSPluginInfo.C
 ADIOSCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ADIOSPluginInfo.C
 )
 
@@ -61,12 +61,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${ADIOS_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${ADIOS_LIBRARY_DIR} )
 
 ADD_LIBRARY(IADIOSDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IADIOSDatabase visitcommon)

diff --git a/src/databases/ADIOS2/ADIOS2.xml b/src/databases/ADIOS2/ADIOS2.xml
@@ -9,6 +9,7 @@
     </FilePatterns>
     <Files components="M">
       avtADIOS2FileFormat.C
+      avtMEUMMAPSFileFormat.C
       avtGTCFileFormat.C
       avtADIOS2BaseFileFormat.C
       avtADIOS2SSTFileFormat.C
@@ -18,6 +19,7 @@
     </LIBS>
     <Files components="E">
       avtADIOS2FileFormat.C
+      avtMEUMMAPSFileFormat.C
       avtGTCFileFormat.C
       avtADIOS2BaseFileFormat.C
       avtADIOS2SSTFileFormat.C

diff --git a/src/databases/ADIOS2/CMakeLists.txt b/src/databases/ADIOS2/CMakeLists.txt
@@ -55,12 +55,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IADIOS2Database ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IADIOS2Database visitcommon)
@@ -88,3 +86,4 @@ ENDIF(VISIT_PARALLEL)
 VISIT_INSTALL_DATABASE_PLUGINS(${INSTALLTARGETS})
 VISIT_PLUGIN_TARGET_RTOD(databases ${INSTALLTARGETS})
 VISIT_PLUGIN_TARGET_FOLDER(databases ADIOS2 ${INSTALLTARGETS})
+
diff --git a/src/databases/ALS/CMakeLists.txt b/src/databases/ALS/CMakeLists.txt
@@ -8,7 +8,7 @@ ALSPluginInfo.C
 ALSCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ALSPluginInfo.C
 )
 
@@ -47,12 +47,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
 
 ADD_LIBRARY(IALSDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IALSDatabase visitcommon)

diff --git a/src/databases/AMR/CMakeLists.txt b/src/databases/AMR/CMakeLists.txt
@@ -8,7 +8,7 @@ AMRPluginInfo.C
 AMRCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 AMRPluginInfo.C
 )
 
@@ -63,12 +63,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
 
 ADD_LIBRARY(IAMRDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IAMRDatabase visitcommon)

diff --git a/src/databases/AMRTest/CMakeLists.txt b/src/databases/AMRTest/CMakeLists.txt
@@ -8,7 +8,7 @@ AMRTestPluginInfo.C
 AMRTestCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 AMRTestPluginInfo.C
 )
 
@@ -46,12 +46,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IAMRTestDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IAMRTestDatabase visitcommon)

diff --git a/src/databases/ANALYZE/CMakeLists.txt b/src/databases/ANALYZE/CMakeLists.txt
@@ -8,7 +8,7 @@ ANALYZEPluginInfo.C
 ANALYZECommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ANALYZEPluginInfo.C
 )
 
@@ -48,12 +48,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IANALYZEDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IANALYZEDatabase visitcommon)

diff --git a/src/databases/ANSYS/CMakeLists.txt b/src/databases/ANSYS/CMakeLists.txt
@@ -8,7 +8,7 @@ ANSYSPluginInfo.C
 ANSYSCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 ANSYSPluginInfo.C
 )
 
@@ -46,12 +46,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IANSYSDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IANSYSDatabase visitcommon)

diff --git a/src/databases/AUXFile/CMakeLists.txt b/src/databases/AUXFile/CMakeLists.txt
@@ -8,7 +8,7 @@ AUXFilePluginInfo.C
 AUXFileCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 AUXFilePluginInfo.C
 )
 
@@ -46,12 +46,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IAUXFileDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IAUXFileDatabase visitcommon)

diff --git a/src/databases/Adventure/CMakeLists.txt b/src/databases/Adventure/CMakeLists.txt
@@ -8,7 +8,7 @@ AdventurePluginInfo.C
 AdventureCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 AdventurePluginInfo.C
 )
 
@@ -53,12 +53,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${ADVIO_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${ADVIO_LIBRARY_DIR} )
 
 ADD_LIBRARY(IAdventureDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IAdventureDatabase visitcommon)

diff --git a/src/databases/AugDecomp/CMakeLists.txt b/src/databases/AugDecomp/CMakeLists.txt
@@ -8,7 +8,7 @@ AugDecompPluginInfo.C
 AugDecompCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 AugDecompPluginInfo.C
 )
 
@@ -46,12 +46,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IAugDecompDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IAugDecompDatabase visitcommon)

diff --git a/src/databases/BATL/CMakeLists.txt b/src/databases/BATL/CMakeLists.txt
@@ -8,7 +8,7 @@ BATLPluginInfo.C
 BATLCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 BATLPluginInfo.C
 )
 
@@ -49,12 +49,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${HDF5_LIBRARY_DIR} )
 
 ADD_LIBRARY(IBATLDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IBATLDatabase visitcommon)

diff --git a/src/databases/BOV/CMakeLists.txt b/src/databases/BOV/CMakeLists.txt
@@ -8,7 +8,7 @@ BOVPluginInfo.C
 BOVCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 BOVPluginInfo.C
 )
 
@@ -50,12 +50,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${VTK_LIBRARY_DIRS} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IBOVDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IBOVDatabase visitcommon)

diff --git a/src/databases/Blueprint/CMakeLists.txt b/src/databases/Blueprint/CMakeLists.txt
@@ -8,7 +8,7 @@ BlueprintPluginInfo.C
 BlueprintCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 BlueprintPluginInfo.C
 )
 
@@ -53,12 +53,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${MFEM_LIBRARY_DIR} ${CONDUIT_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${MFEM_LIBRARY_DIR} ${CONDUIT_LIBRARY_DIR} )
 
 ADD_LIBRARY(IBlueprintDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IBlueprintDatabase visitcommon)

diff --git a/src/databases/Boxlib2D/CMakeLists.txt b/src/databases/Boxlib2D/CMakeLists.txt
@@ -8,7 +8,7 @@ Boxlib2DPluginInfo.C
 Boxlib2DCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 Boxlib2DPluginInfo.C
 )
 
@@ -49,8 +49,6 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
@@ -60,7 +58,7 @@ IF(WIN32)
   ADD_DEFINITIONS(-DBL_FORT_USE_UPPERCASE)
 ENDIF(WIN32)
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${BOXLIB_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${BOXLIB_LIBRARY_DIR} )
 
 ADD_LIBRARY(IBoxlib2DDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IBoxlib2DDatabase visitcommon)

diff --git a/src/databases/Boxlib3D/CMakeLists.txt b/src/databases/Boxlib3D/CMakeLists.txt
@@ -8,7 +8,7 @@ Boxlib3DPluginInfo.C
 Boxlib3DCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 Boxlib3DPluginInfo.C
 )
 
@@ -49,8 +49,6 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
@@ -60,7 +58,7 @@ IF(WIN32)
   ADD_DEFINITIONS(-DBL_FORT_USE_UPPERCASE)
 ENDIF(WIN32)
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${BOXLIB_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${BOXLIB_LIBRARY_DIR} )
 
 ADD_LIBRARY(IBoxlib3DDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(IBoxlib3DDatabase visitcommon)

diff --git a/src/databases/CCM/CMakeLists.txt b/src/databases/CCM/CMakeLists.txt
@@ -8,7 +8,7 @@ CCMPluginInfo.C
 CCMCommonPluginInfo.C
 )
 
-SET(LIBI_SOURCES 
+SET(LIBI_SOURCES
 CCMPluginInfo.C
 )
 
@@ -47,12 +47,10 @@ ${VISIT_INCLUDE_DIR}/avt/Pipeline/Sources
 ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
 ${VISIT_INCLUDE_DIR}/visit_vtk/full
 ${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
-${EAVL_INCLUDE_DIR}
-${VTKM_INCLUDE_DIR}
 ${VTK_INCLUDE_DIRS}
 )
 
-LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${EAVL_LIBRARY_DIR} ${VTKM_LIBRARY_DIR} ${CCMIO_LIBRARY_DIR} )
+LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${CCMIO_LIBRARY_DIR} )
 
 ADD_LIBRARY(ICCMDatabase ${LIBI_SOURCES})
 TARGET_LINK_LIBRARIES(ICCMDatabase visitcommon)