Changeset ac6d04 for src/samples/discretization_poisson_fd_collatz.hpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:

• src/samples/discretization_poisson_fd_collatz.hpp (modified) (2 diffs)

src/samples/discretization_poisson_fd_collatz.hpp

@@ -46 +46 @@
   }
 
-  vmg_float OperatorPrefactor(const Multigrid& grid) const
+  vmg_float OperatorPrefactor(const Grid& grid) const
   {
-    return 1.0 / (sqr(grid.MeshWidth()));
+    return 1.0 / Helper::pow_2(grid.Extent().MeshWidth().Max());
   }
 
 private:
-  void SetInnerBoundaryCompute(Multigrid& grid) const {}
+  void SetInnerBoundaryCompute(Grid& sol_fine, Grid& rhs_fine, Grid& sol_coarse) const {}
 };
 
@@ -58 +58 @@
 {
 public:
-  StencilPoissonCollatzRhs() : Stencil(0.5)
+  StencilPoissonCollatzRhs() :
+    Stencil(0.5)
   {
-    this->push_back(Displacement(-1,  0,  0, 1.0/12.0));
-    this->push_back(Displacement( 1,  0,  0, 1.0/12.0));
-    this->push_back(Displacement( 0, -1,  0, 1.0/12.0));
-    this->push_back(Displacement( 0,  1,  0, 1.0/12.0));
-    this->push_back(Displacement( 0,  0, -1, 1.0/12.0));
-    this->push_back(Displacement( 0,  0,  1, 1.0/12.0));
+    this->push_back(-1,  0,  0, 1.0/12.0);
+    this->push_back( 1,  0,  0, 1.0/12.0);
+    this->push_back( 0, -1,  0, 1.0/12.0);
+    this->push_back( 0,  1,  0, 1.0/12.0);
+    this->push_back( 0,  0, -1, 1.0/12.0);
+    this->push_back( 0,  0,  1, 1.0/12.0);
   }
 };