Changeset ac6d04 for src/comm/mpi/settings.hpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:

• src/comm/mpi/settings.hpp (modified) (3 diffs)

src/comm/mpi/settings.hpp

@@ -20 +20 @@
 namespace MPI
 {
+
+class DatatypesGlobal;
+
 class Settings
 {
@@ -30 +33 @@
   Grid& FinerGrid(const Grid& grid);
   Grid& CoarserGrid(const Grid& grid);
-  Grid& GlobalCoarseGrid();
 
-  MPI_Comm CommunicatorGlobal(const Grid& grid);
-  MPI_Comm CommunicatorLocal(const Grid& grid);
+  MPI_Comm CommunicatorGlobal(const Grid& grid) const;
+  MPI_Comm CommunicatorLocal(const Grid& grid) const;
 
-  MPI_Datatype& Datatype(const Index& begin, const Index& end, const Index& size_local, const Index& size_global);
-  VMG::MPI::DatatypesGlobal& DatatypesGlobal(const Grid& grid_old, const Grid& grid_new);
+  MPI_Datatype& Datatype(const Index& begin, const Index& end,
+                         const Index& size_local, const Index& size_global,
+                         const int& level);
+  VMG::MPI::DatatypesGlobal& DatatypesGlobal(const Grid& grid_old, const Grid& grid_new, const int& direction);
   VMG::MPI::DatatypesLocal& DatatypesLocal(const Grid& grid);
 
 private:
   Index GlobalDims(MPI_Comm comm, Index pos);
-  void AddDatatypeGlobal(const Grid& grid_old, const Grid& grid_new);
+  void AddDatatypeGlobal(const Grid& grid_old, const Grid& grid_new, const int& direction);
 
   void CreateGlobalCommunicator(MPI_Comm& comm_global, const Grid* grid_1, const Grid* grid_2=NULL, const Grid* grid_3=NULL);
@@ -53 +57 @@
   std::map<KeyUnsorted, VMG::MPI::DatatypesGlobal> datatypes_global;
   std::map<KeyUnsorted, VMG::MPI::DatatypesLocal> datatypes_local;
-  TempGrid* global_coarse_grid;
 };