Changeset ac6d04 for src/comm/mpi/key.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/key.hpp (modified) (9 diffs)

src/comm/mpi/key.hpp

@@ -33 +33 @@
 public:
   KeyStorage(const Grid& grid) :
-    begin(grid.Global().BeginLocal()),
-    end(grid.Global().EndLocal()),
+    begin(grid.Global().LocalBegin()),
+    end(grid.Global().LocalEnd()),
     size_local(grid.Local().SizeTotal()),
-    size_global(grid.Global().SizeGlobal())
+    size_global(grid.Global().GlobalSize()),
+    level(grid.Level())
   {}
 
-  KeyStorage(const Index& begin, const Index& end, const Index& size_local, const Index& size_global) :
+  KeyStorage(const Index& begin, const Index& end,
+             const Index& size_local, const Index& size_global,
+             const int& level) :
     begin(begin),
     end(end),
     size_local(size_local),
-    size_global(size_global)
+    size_global(size_global),
+    level(level)
   {}
 
@@ -50 +54 @@
     end(other.end),
     size_local(other.size_local),
-    size_global(other.size_global)
+    size_global(other.size_global),
+    level(other.level)
   {}
 
@@ -60 +65 @@
            this->end == other.end &&
            this->size_local == other.size_local &&
-           this->size_global == other.size_global;
+           this->size_global == other.size_global &&
+           this->level == other.level;
   }
 
@@ -71 +77 @@
   {
     if (this->begin < other.begin) return true;
-    else if (this->begin != other.begin) return false;
-    else if (this->end < other.end) return true;
-    else if (this->end != other.end) return false;
-    else if (this->size_local < other.size_local) return true;
-    else if (this->size_local != other.size_local) return false;
-    else if (this->size_global < other.size_global) return true;
-    else return false;
+    if (this->begin != other.begin) return false;
+    if (this->end < other.end) return true;
+    if (this->end != other.end) return false;
+    if (this->size_local < other.size_local) return true;
+    if (this->size_local != other.size_local) return false;
+    if (this->size_global < other.size_global) return true;
+    if (this->size_global != other.size_global) return false;
+    if (this->level < other.level) return true;
+    return false;
   }
 
 private:
   const Index begin, end, size_local, size_global;
-  const void* ptr;
+  const int level;
 };
 
@@ -107 +115 @@
   }
 
-  KeySorted(const Index& begin, const Index& end, const Index& size_local, const Index& size_global)
-  {
-    keys.push_back(KeyStorage(begin, end, size_local, size_global));
+  KeySorted(const Index& begin, const Index& end,
+            const Index& size_local, const Index& size_global,
+            const int& level)
+  {
+    keys.push_back(KeyStorage(begin, end, size_local, size_global, level));
   }
 
@@ -134 +144 @@
 };
 
+
+  /*
+   * direction: 0 - from multigrid to temporary grid
+   *            1 - from temporary grid to multigrid
+   *            for single grid datatypes always 0
+   */
 class KeyUnsorted {
 public:
@@ -142 +158 @@
     for (i=other.keys.begin(); i!=other.keys.end(); ++i)
       this->keys.push_back(*i);
-  }
-
-  KeyUnsorted(const Grid& grid)
+    this->direction = other.direction;
+  }
+
+  KeyUnsorted(const Grid& grid, const int& direction)
   {
     keys.push_back(KeyStorage(grid));
-  }
-
-  KeyUnsorted(const Grid& grid_1, const Grid& grid_2)
+    this->direction = direction;
+  }
+
+  KeyUnsorted(const Grid& grid_1, const Grid& grid_2, const int& direction)
   {
     keys.push_back(KeyStorage(grid_1));
     keys.push_back(KeyStorage(grid_2));
-  }
-
-  KeyUnsorted(const Index& begin, const Index& end, const Index& size_local, const Index& size_global)
-  {
-    keys.push_back(KeyStorage(begin, end, size_local, size_global));
+    this->direction = direction;
+  }
+
+  KeyUnsorted(const Index& begin, const Index& end,
+              const Index& size_local, const Index& size_global,
+              const int& level, const int& direction)
+  {
+    keys.push_back(KeyStorage(begin, end, size_local, size_global, level));
+    this->direction = direction;
   }
 
@@ -175 +197 @@
     }
 
+    if (this->direction < other.direction) return true;
+
     return false;
   }
@@ -180 +204 @@
 private:
   std::list<KeyStorage> keys;
+  int direction;
 };