Merge pull request #3750 from JanVogelsang/mpi-cpp-bindings-fix

Replace deprecated MPI C++ bindings by their C equivalent

Author: heplesser

doc/htmldoc/tutorials/music_tutorial/music_tutorial_3.rst

@@ -19,7 +19,7 @@ divided into a setup phase and a runtime phase. You can see the setup below.
 
 .. code-block:: cpp
 
-    MPI::Intracomm comm;
+    MPI_Comm comm;
 
     int main(int argc, char **argv)
     {
@@ -170,7 +170,7 @@ communications and clean up after itself before exiting.
 
 .. code-block:: cpp
 
-    MPI::Intracomm comm;
+    MPI_Comm comm;
     FILE *fout;
 
     struct eventtype  {

models/music_cont_in_proxy.cpp

@@ -147,7 +147,7 @@ nest::music_cont_in_proxy::pre_run_hook()
     S_.port_width_ = V_.MP_->width();
 
     B_.data_ = std::vector< double >( S_.port_width_ );
-    MUSIC::ArrayData data_map( static_cast< void* >( &( B_.data_[ 0 ] ) ), MPI::DOUBLE, 0, S_.port_width_ );
+    MUSIC::ArrayData data_map( static_cast< void* >( &( B_.data_[ 0 ] ) ), MPI_DOUBLE, 0, S_.port_width_ );
 
     V_.MP_->map( &data_map );
     S_.published_ = true;

models/music_cont_out_proxy.cpp

@@ -271,7 +271,7 @@ nest::music_cont_out_proxy::pre_run_hook()
       new MUSIC::PermutationIndex( &music_index_map.front(), music_index_map.size() );
 
     MUSIC::ArrayData* dmap =
-      new MUSIC::ArrayData( static_cast< void* >( &( B_.data_.front() ) ), MPI::DOUBLE, music_perm_ind );
+      new MUSIC::ArrayData( static_cast< void* >( &( B_.data_.front() ) ), MPI_DOUBLE, music_perm_ind );
 
     // Setup an array map
     MP->map( dmap );

models/music_rate_out_proxy.cpp

@@ -176,7 +176,7 @@ nest::music_rate_out_proxy::pre_run_hook()
 
 
     MUSIC::ArrayData* dmap =
-      new MUSIC::ArrayData( static_cast< void* >( &( B_.data_.front() ) ), MPI::DOUBLE, 0, S_.port_width_ );
+      new MUSIC::ArrayData( static_cast< void* >( &( B_.data_.front() ) ), MPI_DOUBLE, 0, S_.port_width_ );
 
 
     // Setup an array map

nestkernel/mpi_manager_impl.h

@@ -44,11 +44,7 @@ nest::MPIManager::get_process_id_of_vp( const size_t vp ) const
 #ifdef HAVE_MPI
 
 // Variable to hold the MPI communicator to use.
-#ifdef HAVE_MUSIC
-extern MPI::Intracomm comm;
-#else  /* #ifdef HAVE_MUSIC */
 extern MPI_Comm comm;
-#endif /* #ifdef HAVE_MUSIC */
 
 template < typename T >
 struct MPI_Type

nestkernel/music_manager.cpp

@@ -126,7 +126,7 @@ MUSICManager::music_finalize()
 
 #ifdef HAVE_MUSIC
 
-MPI::Intracomm
+MPI_Comm
 MUSICManager::communicator()
 {
   return music_setup->communicator();

nestkernel/music_manager.h

@@ -75,7 +75,7 @@ class MUSICManager : public ManagerInterface
   void music_finalize(); // called from MPIManager::mpi_finalize
 
 #ifdef HAVE_MUSIC
-  MPI::Intracomm communicator();
+  MPI_Comm communicator();
 
   MUSIC::Setup* get_music_setup();
   MUSIC::Runtime* get_music_runtime();

nestkernel/music_rate_in_handler.cpp

@@ -110,7 +110,7 @@ MusicRateInHandler::publish_port()
       *it = 0;
     }
 
-    MUSIC::ArrayData data_map( static_cast< void* >( &( data_[ 0 ] ) ), MPI::DOUBLE, 0, port_width_ );
+    MUSIC::ArrayData data_map( static_cast< void* >( &( data_[ 0 ] ) ), MPI_DOUBLE, 0, port_width_ );
 
     MP_->map( &data_map );
     published_ = true;