Changeset 4a709e for src/grid

Timestamp:

Apr 5, 2013, 12:45:32 PM (13 years ago)

Author:

Julian Iseringhausen <julian.iseringhausen@…>

Children:

e85cfd

Parents:

8180d8

Message:

Fixed merging errors.

Location:

src/grid

Files:

• grid_iterator_suite.cpp (modified) (1 diff)
• grid_iterator_suite.hpp (modified) (3 diffs)

src/grid/grid_iterator_suite.cpp

@@ -38 +38 @@
 {
   local.SetBounds(local_.Begin(), local_.End());
-  local_finer.SetBounds(local_.FinerBegin(), local_.FinerEnd());
   complete_grid.SetBounds(0, local_.SizeTotal());
   inner_local_grid.SetBounds(local_.Begin()+local_.HaloSize1(), local_.End()-local_.HaloSize2());

src/grid/grid_iterator_suite.hpp

@@ -52 +52 @@
   GridIteratorSuite(const GridIteratorSuite& other) :
     local(other.local),
-    local_finer(other.local_finer),
     complete_grid(other.complete_grid),
     inner_local_grid(other.inner_local_grid),
@@ -69 +68 @@
 
   const GridIteratorSet& Local() const {return local;}
-  const GridIteratorSet& LocalFiner() const {return local_finer;}
   const GridIteratorSet& CompleteGrid() const {return complete_grid;}
   const GridIteratorSet& InnerLocalGrid() const {return inner_local_grid;}
@@ -84 +82 @@
 private:
   GridIteratorSet local;
-  GridIteratorSet local_finer;
   GridIteratorSet complete_grid;
   GridIteratorSet inner_local_grid;