Changeset 4a709e for src

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

Files:

• grid/grid_iterator_suite.cpp (modified) (1 diff)
• grid/grid_iterator_suite.hpp (modified) (3 diffs)
• level/level_operator_fas.cpp (modified) (2 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;

src/level/level_operator_fas.cpp

@@ -59 +59 @@
   Grid& sol_c_undist = comm.GetCoarserGrid(sol);
   Grid& rhs_c_undist = comm.GetCoarserGrid(rhs);
-
-  Index begin_c = rhs_c_undist.Local().FinerBegin();
-  Index end_c = rhs_c_undist.Local().FinerEnd();
-
-  Index begin_f = rhs_f.Local().Begin();
-  Index end_f = rhs_f.Local().End();
-
-  if (rhs_c_undist.Global().BoundaryType() == GlobalCoarsened) {
-    begin_c += rhs_c_undist.Local().BoundarySize1();
-    end_c -= rhs_c_undist.Local().BoundarySize2();
-    begin_f += rhs_f.Local().BoundarySize1();
-    end_f -= rhs_f.Local().BoundarySize2();
-  }
 
   GridIteratorSet bounds_c, bounds_f;
@@ -135 +122 @@
   Grid& rhs_f_dist = rhs(rhs.Level()+1);
   Grid& sol_f_undist = comm.GetFinerGrid(sol);
-  Grid& rhs_f_undist = comm.GetFinerGrid(rhs);
 
   const Stencil& op = OperatorProlongate();
 
   TempGrid *sol_old = this->GetTempGrid(sol_c.Level());
-
-  Index begin_c = sol_c.Local().FinerBegin();
-  Index end_c = sol_c.Local().FinerEnd();
-
-  Index begin_f = sol_f_undist.Local().Begin();
-  Index end_f = sol_f_undist.Local().End();
-
-  if (sol_c.Global().BoundaryType() == GlobalCoarsened) {
-    begin_c += sol_c.Local().BoundarySize1();
-    end_c -= sol_c.Local().BoundarySize2();
-    begin_f += sol_f_undist.Local().BoundarySize1();
-    end_f -= sol_f_undist.Local().BoundarySize2();
-  }
 
   GridIteratorSet bounds_c, bounds_f;