Changeset 4571da for src/grid

Timestamp:

Apr 27, 2012, 11:34:57 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

1a92cf

Parents:

b2154a3

Message:

vmg: Implement fourth-order discretization of the Poisson equation.

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

Location:

src/grid

Files:

• grid.cpp (modified) (5 diffs)
• grid.hpp (modified) (3 diffs)
• grid_iterator_suite.cpp (modified) (6 diffs)

src/grid/grid.cpp

@@ -25 +25 @@
 using namespace VMG;
 
-vmg_float Grid::correction;
-
 void Grid::InitGrid()
 {
@@ -112 +110 @@
     avg += GetVal(*iter);
 
-  avg /= Local().Size().Product();
+  avg = MG::GetComm()->GlobalSum(avg);
+  avg /= Global().GlobalSize().Product();
+
+#ifdef DEBUG_OUTPUT
+  MG::GetComm()->PrintStringOnce("Global constraint enforcement: %e", avg);
+#endif
 
   for (iter = Iterators().Local().Begin(); iter != Iterators().Local().End(); ++iter)
@@ -126 +129 @@
     val += GetVal(*iter);
 
-  val = MG::GetComm()->GlobalSum(val);
-
-  if (fabs(val) > Global().GlobalSize().Product() * std::numeric_limits<vmg_float>::epsilon()) {
+  val = MG::GetComm()->GlobalSum(val) / Global().GlobalSize().Product();
+
+  if (std::abs(val) > std::numeric_limits<vmg_float>::epsilon()) {
 
 #ifdef DEBUG_OUTPUT
@@ -134 +137 @@
 #endif
 
-    val *= Helper::pow_2(this->Extent().MeshWidth().Max());
     for (iter = Iterators().Local().Begin(); iter != Iterators().Local().End(); ++iter)
       (*this)(*iter) -= val;
@@ -155 +157 @@
 #endif
 
-  for (Grid::iterator iter = Iterators().CompleteGrid().Begin(); iter != Iterators().CompleteGrid().End(); ++iter)
-    (*this)(*iter) = rhs.GetVal(*iter);
+  std::memcpy(grid, rhs.grid, local.SizeTotal().Product()*sizeof(vmg_float));
 }
 

src/grid/grid.hpp

@@ -81 +81 @@
   const GridIteratorSuite& Iterators() const {return iterators;}
 
-  static vmg_float& Correction() {return Grid::correction;}
-
   void Clear();         ///< Overwrites all grid points on current level with zeros
   void ClearInner();
@@ -93 +91 @@
   const vmg_float& GetVal(int x, int y, int z) const; ///< Returns the value of a requested gridpoint.
   const vmg_float& GetVal(const Index& index) const;
-
-  vmg_float GetCorrectedVal(int x, int y, int z) const {return this->GetVal(x, y, z) - correction;} ///< Return grid
-  vmg_float GetCorrectedVal(const Index& index) const {return this->GetVal(index) - correction;}
 
   void ForceDiscreteCompatibilityCondition();
@@ -142 +137 @@
 
   Multigrid* father;
-
-  static vmg_float correction;
 };
 

src/grid/grid_iterator_suite.cpp

@@ -21 +21 @@
   local.SetBounds(local_.Begin(), local_.End());
   complete_grid.SetBounds(0, local_.SizeTotal());
-  inner_local_grid.SetBounds(local_.Begin()+1, local_.End()-1);
+  inner_local_grid.SetBounds(local_.Begin()+local_.HaloSize1(), local_.End()-local_.HaloSize2());
 
   halo_1.X().SetBounds(Index(local_.HaloBegin1().X(), 0, 0),
@@ -61 +61 @@
 
   near_boundary_1.X().SetBounds(Index(local_.Begin().X(), 0, 0),
-                                Index(local_.Begin().X()+local_.HaloEnd1().X()-local_.HaloBegin1().X(),
+                                Index(local_.Begin().X()+local_.HaloSize1().X(),
                                       local_.SizeTotal().Y(),
                                       local_.SizeTotal().Z()));
@@ -67 +67 @@
   near_boundary_1.Y().SetBounds(Index(local_.Begin().X(), local_.Begin().Y(), 0),
                                 Index(local_.End().X(),
-                                      local_.Begin().Y()+local_.HaloEnd1().Y()-local_.HaloBegin1().Y(),
+                                      local_.Begin().Y()+local_.HaloSize1().Y(),
                                       local_.SizeTotal().Z()));
 
@@ -73 +73 @@
                                 Index(local_.End().X(),
                                       local_.End().Y(),
-                                      local_.Begin().Z()+local_.HaloEnd1().Z()-local_.HaloBegin1().Z()));
+                                      local_.Begin().Z()+local_.HaloSize1().Z()));
 
-  near_boundary_2.X().SetBounds(Index(local_.End().X()-local_.HaloEnd2().X()+local_.HaloBegin2().X(),
+  near_boundary_2.X().SetBounds(Index(local_.End().X()-local_.HaloSize2().X(),
                                       0,
                                       0),
@@ -81 +81 @@
 
   near_boundary_2.Y().SetBounds(Index(local_.Begin().X(),
-                                      local_.End().Y()-local_.HaloEnd2().Y()+local_.HaloBegin2().Y(),
+                                      local_.End().Y()-local_.HaloSize2().Y(),
                                       0),
                                 Index(local_.End().X(), local_.End().Y(), local_.SizeTotal().Z()));
@@ -87 +87 @@
   near_boundary_2.Z().SetBounds(Index(local_.Begin().X(),
                                       local_.Begin().Y(),
-                                      local_.End().Z()-local_.HaloEnd2().Z()+local_.HaloBegin2().Z()),
+                                      local_.End().Z()-local_.HaloSize2().Z()),
                                 local_.End());
 }