Merge topic 'fix-parallel-mpi' into master

a88dbeb4 Update export header after vtkPNrrdReader move
801917cb Move MPI specific classes from IO/Parallel to IO/ParallelMPI
070ffffa Update export header after vtkVPICReader move
21b397d5 Move vtkVPICReader into vtkIOVPIC module
209167af Update export headers after vtkDistributedDataFilter move
699e70fe Create new module vtkFiltersParallelMPI
aa8bda15 Update export headers after Cosmo move
414d65f2 Move Cosmo classes into vtkFiltersCosmo module

Filters/Cosmo/CMakeLists.txt

+if(VTK_COSMOS_USE_MPI)
+  find_package(MPI REQUIRED)
+  include_directories(${MPI_INCLUDE_PATH})
+else()
+  add_definitions(-DUSE_SERIAL_COSMO)
+endif()
+
+set(Module_SRCS
+  vtkPCosmoReader.cxx
+  vtkPCosmoHaloFinder.cxx
+  )
+
+vtk_module_library(vtkFiltersCosmo ${Module_SRCS})

Filters/Cosmo/module.cmake

+vtk_module(vtkFiltersCosmo
+  DEPENDS
+    vtkCommonExecutionModel
+    vtkParallelCore
+    vtkCosmo
+  )

Filters/Parallel/vtkPCosmoHaloFinder.h → Filters/Cosmo/vtkPCosmoHaloFinder.h

@@ -67,12 +67,12 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __vtkPCosmoHaloFinder_h
 #define __vtkPCosmoHaloFinder_h
 
-#include "vtkFiltersParallelModule.h" // For export macro
+#include "vtkFiltersCosmoModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
 
 class vtkMultiProcessController;
 
-class VTKFILTERSPARALLEL_EXPORT vtkPCosmoHaloFinder : public vtkUnstructuredGridAlgorithm
+class VTKFILTERSCOSMO_EXPORT vtkPCosmoHaloFinder : public vtkUnstructuredGridAlgorithm
 {
  public:
   static vtkPCosmoHaloFinder *New();

IO/Parallel/vtkPCosmoReader.h → Filters/Cosmo/vtkPCosmoReader.h

@@ -83,13 +83,13 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __vtkPCosmoReader_h
 #define __vtkPCosmoReader_h
 
-#include "vtkIOParallelModule.h" // For export macro
+#include "vtkFiltersCosmoModule.h" // For export macro
 #include "vtkUnstructuredGridAlgorithm.h"
 
 class vtkMultiProcessController;
 class vtkStdString;
 
-class VTKIOPARALLEL_EXPORT vtkPCosmoReader : public vtkUnstructuredGridAlgorithm
+class VTKFILTERSCOSMO_EXPORT vtkPCosmoReader : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkPCosmoReader *New();
@@ -153,4 +153,3 @@ private:
 };
 
 #endif
-

Filters/Parallel/CMakeLists.txt

@@ -6,7 +6,6 @@ set(Module_SRCS
   vtkCollectPolyData.cxx
   vtkCollectTable.cxx
   vtkCutMaterial.cxx
-  vtkDistributedDataFilter.cxx
   vtkDuplicatePolyData.cxx
   vtkExtractCTHPart.cxx
   vtkExtractPolyDataPiece.cxx
@@ -14,7 +13,6 @@ set(Module_SRCS
   vtkExtractUserDefinedPiece.cxx
   vtkPassThroughFilter.cxx
   vtkPCellDataToPointData.cxx
-  vtkPCosmoHaloFinder.cxx
   vtkPExtractArraysOverTime.cxx
   vtkPieceRequestFilter.cxx
   vtkPieceScalars.cxx

Filters/Parallel/module.cmake

 vtk_module(vtkFiltersParallel
-  GROUPS
-    MPI
   DEPENDS
-    vtkParallelMPI
-    vtkCosmo
+    vtkParallelCore
     vtkFiltersExtraction
     vtkRenderingCore
     vtkFiltersModeling

Filters/ParallelMPI/CMakeLists.txt

+set(Module_SRCS
+  vtkDistributedDataFilter.cxx
+  )
+
+vtk_module_library(vtkFiltersParallelMPI ${Module_SRCS})

Filters/ParallelMPI/module.cmake

+vtk_module(vtkFiltersParallelMPI
+  GROUPS
+    MPI
+  DEPENDS
+    vtkFiltersParallel
+    vtkFiltersGeneral
+    vtkFiltersExtraction
+    vtkParallelMPI
+  )

Filters/Parallel/vtkDistributedDataFilter.cxx → Filters/ParallelMPI/vtkDistributedDataFilter.cxx

@@ -4712,4 +4712,3 @@ void vtkDistributedDataFilter::PrintSelf(ostream& os, vtkIndent indent)
   os << indent << "Timing: " << this->Timing << endl;
   os << indent << "UseMinimalMemory: " << this->UseMinimalMemory << endl;
 }
-

Filters/Parallel/vtkDistributedDataFilter.h → Filters/ParallelMPI/vtkDistributedDataFilter.h

@@ -86,7 +86,7 @@
 #ifndef __vtkDistributedDataFilter_h
 #define __vtkDistributedDataFilter_h
 
-#include "vtkFiltersParallelModule.h" // For export macro
+#include "vtkFiltersParallelMPIModule.h" // For export macro
 #include "vtkDataObjectAlgorithm.h"
 
 class vtkBSPCuts;
@@ -101,7 +101,7 @@ class vtkMultiProcessController;
 class vtkPKdTree;
 class vtkUnstructuredGrid;
 
-class VTKFILTERSPARALLEL_EXPORT vtkDistributedDataFilter: public vtkDataObjectAlgorithm
+class VTKFILTERSPARALLELMPI_EXPORT vtkDistributedDataFilter: public vtkDataObjectAlgorithm
 {
   vtkTypeMacro(vtkDistributedDataFilter,
     vtkDataObjectAlgorithm);

IO/Parallel/CMakeLists.txt

@@ -5,14 +5,11 @@ set(Module_SRCS
   vtkEnSightWriter.cxx
   # vtkExodusIIWriter.cxx needs vtkMultiProcessController
   vtkPChacoReader.cxx
-  vtkPCosmoReader.cxx
   vtkPDataSetReader.cxx
   vtkPDataSetWriter.cxx
   vtkPImageWriter.cxx
-  vtkPNrrdReader.cxx
   vtkPOpenFOAMReader.cxx
   vtkPSLACReader.cxx
-  vtkVPICReader.cxx
   vtkWindBladeReader.cxx
   vtkXMLPHierarchicalBoxDataWriter.cxx
   vtkXMLPMultiBlockDataWriter.cxx

IO/Parallel/module.cmake

@@ -4,10 +4,8 @@ vtk_module(vtkIOParallel
   DEPENDS
     vtkParallelCore
     vtkFiltersParallel
-    vtkIOParallelMPI
     vtkIONetCDF
     vtkexodusII
-    vtkVPIC
   TEST_DEPENDS
     vtkTestingCore
   )

IO/ParallelMPI/CMakeLists.txt

@@ -3,6 +3,7 @@ include_directories(${MPI_INCLUDE_PATH})
 
 set(Module_SRCS
   vtkMPIImageReader.cxx
+  vtkPNrrdReader.cxx
   )
 
 vtk_module_library(vtkIOParallelMPI ${Module_SRCS})

IO/Parallel/vtkPNrrdReader.h → IO/ParallelMPI/vtkPNrrdReader.h

@@ -37,12 +37,12 @@
 #ifndef __vtkPNrrdReader_h
 #define __vtkPNrrdReader_h
 
-#include "vtkIOParallelModule.h" // For export macro
+#include "vtkIOParallelMPIModule.h" // For export macro
 #include "vtkMPIImageReader.h"
 
 class vtkCharArray;
 
-class VTKIOPARALLEL_EXPORT vtkPNrrdReader : public vtkMPIImageReader
+class VTKIOPARALLELMPI_EXPORT vtkPNrrdReader : public vtkMPIImageReader
 {
 public:
   vtkTypeMacro(vtkPNrrdReader, vtkMPIImageReader);

IO/VPIC/CMakeLists.txt

+if(VTK_VPIC_USE_MPI)
+  find_package(MPI REQUIRED)
+  include_directories(${MPI_INCLUDE_PATH})
+endif()
+
+set(Module_SRCS
+  vtkVPICReader.cxx
+  )
+
+vtk_module_library(vtkIOVPIC ${Module_SRCS})

IO/VPIC/module.cmake

+vtk_module(vtkIOVPIC
+  DEPENDS
+    vtkVPIC
+    vtkCommonExecutionModel
+    vtkParallelCore
+  )