Changeset dfed1c for src/base/has_tempgrids.hpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

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

File:

• src/base/has_tempgrids.hpp (modified) (2 diffs)

src/base/has_tempgrids.hpp

@@ -3 +3 @@
  * @author Julian Iseringhausen <isering@ins.uni-bonn.de>
  * @date   Tue Apr  5 21:00:56 2011
- * 
+ *
  * @brief  Provides an arbitrary number of temporary grids,
  *         accessible by an integer key.
- * 
+ *
  */
 
@@ -25 +25 @@
   virtual ~HasTempGrids()
   {
-    for (std::map<int, VMG::TempGrid*>::iterator iter = grids.begin(); iter != grids.end(); ++iter)
+    for (std::map<int, TempGrid*>::iterator iter = grids_1.begin(); iter != grids_1.end(); ++iter)
+      delete iter->second;
+
+    for (std::map<const Grid*, TempGrid*>::iterator iter = grids_2.begin(); iter != grids_2.end(); ++iter)
       delete iter->second;
   }
 
 protected:
-  VMG::TempGrid* GetTempGrid(int key)
+  TempGrid* GetTempGrid(int key)
   {
-    std::map<int, VMG::TempGrid*>::iterator iter = grids.find(key);
+    std::map<int, TempGrid*>::iterator iter = grids_1.find(key);
 
-    if (iter != grids.end())
-      return iter->second;
-    else {
-      VMG::TempGrid* temp = new VMG::TempGrid();
-      grids.insert(std::pair<int,VMG::TempGrid*>(key, temp));
-      return temp;
-    }
+    if (iter == grids_1.end())
+      iter = grids_1.insert(std::pair<int, TempGrid*>(key, new TempGrid())).first;
+
+    return iter->second;
+  }
+
+  TempGrid* GetTempGrid(const Grid* key)
+  {
+    std::map<const Grid*, TempGrid*>::iterator iter = grids_2.find(key);
+
+    if (iter == grids_2.end())
+      iter = grids_2.insert(std::pair<const Grid*, TempGrid*>(key, new TempGrid())).first;
+
+    return iter->second;
   }
 
 private:
-  std::map<int,VMG::TempGrid*> grids;
+  std::map<int, TempGrid*> grids_1;
+  std::map<const Grid*, TempGrid*> grids_2;
 };