Changeset 4571da for src/grid/grid.cpp

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

File:

• src/grid/grid.cpp (modified) (5 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));
 }