Issue #474 & #475

- Fixed bug in VTK exporter introduced by In-situ changes
feelpp · Dec 2, 2014 · 767a94f · 767a94f
1 parent 2506d36
commit 767a94f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/feel/feelfilters/exporterVTK.hpp b/feel/feelfilters/exporterVTK.hpp
@@ -281,6 +281,7 @@ public Exporter<MeshType,N>
 
     /* class members for in-situ visualization */
 #if VTK_MAJOR_VERSION >= 6 && defined(VTK_HAS_PARALLEL)
+    mutable MPI_Comm lComm;
     mutable vtkMPICommunicatorOpaqueComm * opaqueComm;
 #if defined(FEELPP_VTK_INSITU_ENABLED)
     mutable vtkSmartPointer<vtkCPProcessor> inSituProcessor;

diff --git a/feel/feelfilters/exporterVTK_impl.hpp b/feel/feelfilters/exporterVTK_impl.hpp
@@ -65,10 +65,15 @@ ExporterVTK<MeshType,N>::ExporterVTK( ExporterVTK const & __ex )
 template<typename MeshType, int N>
 ExporterVTK<MeshType,N>::~ExporterVTK()
 {
-#if VTK_MAJOR_VERSION >= 6 && defined(VTK_HAS_PARALLEL) && defined(FEELPP_VTK_INSITU_ENABLED)
+#if VTK_MAJOR_VERSION >= 6 && defined(VTK_HAS_PARALLEL)
+#if defined(FEELPP_VTK_INSITU_ENABLED)
     /* end up in situ simulation */
-    inSituProcessor->Finalize();
-    //inSituProcessor->Delete();
+    if(boption( _name="exporter.vtk.insitu.enable" ))
+    {
+        inSituProcessor->Finalize();
+        //inSituProcessor->Delete();
+    }
+#endif
 
     /* clean memory */
     delete this->opaqueComm;
@@ -114,9 +119,9 @@ ExporterVTK<MeshType,N>::init()
 
 #if VTK_MAJOR_VERSION >= 6 && defined(VTK_HAS_PARALLEL)
     /* before version 5.10, we cannot initialize a MPIController with an external MPI_Comm */
-    MPI_Comm comm = this->worldComm().comm();
+    this->lComm = this->worldComm().comm();
     /* initialize the VTK communicator from the current MPI communicator */
-    this->opaqueComm = new vtkMPICommunicatorOpaqueComm(&comm);
+    this->opaqueComm = new vtkMPICommunicatorOpaqueComm(&(this->lComm));
 
 #if defined(FEELPP_VTK_INSITU_ENABLED)
     /* initialize in-situ visualization if needed */
@@ -306,8 +311,6 @@ ExporterVTK<MeshType,N>::write( typename timeset_type::step_ptrtype step, std::s
 #if VTK_MAJOR_VERSION >= 6 && defined(VTK_HAS_PARALLEL)
     /* Build vtk objects while reusing the current mpi communicator */
     /* before version 5.10, we cannot initialize a MPIController with an external MPI_Comm */
-    MPI_Comm comm = this->worldComm().comm();
-
     vtkSmartPointer<vtkMPICommunicator> mpicomm = vtkSmartPointer<vtkMPICommunicator>::New();
         mpicomm->InitializeExternal(this->opaqueComm);
     vtkSmartPointer<vtkMPIController> mpictrl = vtkSmartPointer<vtkMPIController>::New();