Changeset 894a5f for src/comm/comm_mpi.hpp

Timestamp:

Feb 2, 2012, 1:58:12 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

32ff22

Parents:

01be70

Message:

Parallel performance update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1314 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/comm/comm_mpi.hpp (modified) (5 diffs)

src/comm/comm_mpi.hpp

@@ -23 +23 @@
 #include "base/has_tempgrids.hpp"
 #include "comm/comm.hpp"
-#include "comm/mpi/comm_info.hpp"
+#include "comm/mpi/settings.hpp"
 #include "comm/mpi/has_request_vec.hpp"
 
@@ -62 +62 @@
   void CommAddSubgrid(Grid& grid_old, Grid& grid_new);
 
+  void CommToGhostsAsyncStart(Grid& grid);
+  void CommToGhostsAsyncFinish();
+  void CommFromGhostsAsyncStart(Grid& grid);
+  void CommFromGhostsAsyncFinish(Grid& grid);
+
   vmg_float GlobalSum(const vmg_float& value);
   vmg_float GlobalSumRoot(const vmg_float& value);
@@ -85 +90 @@
   Index GlobalPos() const;
   Index GlobalProcs() const;
+
+  void PostInit(Multigrid& sol, Multigrid& rhs)
+  {
+    settings.ComputeSettings(sol, rhs, comm_global);
+  }
 
   virtual void DebugPrintError(const Grid& sol, const char* information) {}
@@ -111 +121 @@
   std::string CreateOutputDirectory();
 
-  std::vector<vmg_float> receive_buffer;
-
-  std::map<const Grid*, TempGrid*> finer_grids;
-  std::map<const Grid*, TempGrid*> coarser_grids;
-  TempGrid* global_coarse_grid;
-
-  VMG::MPI::CommInfo comm_info;
-
   MPI_Comm comm_global;
   bool win_created;
@@ -124 +126 @@
   MPI_Info info;
 
+  std::vector< std::vector<vmg_float> > receive_buffer;
+
 protected:
-  void ReceiveAndAddSubgrid(Grid& grid, const MPI_Comm& comm, MPI_Datatype& type,
-                            const int& rank, const int& tag);
+  void Isend(Grid& grid, VMG::MPI::Datatype& type, const MPI_Comm& comm, const int& tag);
+  void IsendAll(Grid& grid, std::vector<VMG::MPI::Datatype>& types, const MPI_Comm& comm, const int& tag_start);
+  void Irecv(Grid& grid, VMG::MPI::Datatype& type, const MPI_Comm& comm, const int& tag);
+  void IrecvAll(Grid& grid, std::vector<VMG::MPI::Datatype>& types, const MPI_Comm& comm, const int& tag_start);
+  void IrecvAllBuffered(std::vector<VMG::MPI::Datatype>& types, const MPI_Comm& comm, const int& tag_start);
+  void AddBufferAll(Grid& grid, std::vector<VMG::MPI::Datatype>& types);
+
+  VMG::MPI::Settings settings;
 };