Changeset dfed1c for src/samples/discretization_poisson_fd_collatz.hpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

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

File:

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

src/samples/discretization_poisson_fd_collatz.hpp

@@ -10 +10 @@
  */
 
-
 #ifndef DISCRETIZATION_POISSON_FD_COLLATZ_HPP_
 #define DISCRETIZATION_POISSON_FD_COLLATZ_HPP_
@@ -19 +18 @@
 {
 
-static inline vmg_float sqr(const vmg_float& val) {return val*val;}
-
 class DiscretizationPoissonFDCollatz : public Discretization
 {
@@ -28 +25 @@
     stencil.SetDiag(24.0/6.0);
 
-    stencil.push_back(Displacement(-1,  0,  0, -2.0/6.0));
-    stencil.push_back(Displacement( 1,  0,  0, -2.0/6.0));
-    stencil.push_back(Displacement( 0, -1,  0, -2.0/6.0));
-    stencil.push_back(Displacement( 0,  1,  0, -2.0/6.0));
-    stencil.push_back(Displacement( 0,  0, -1, -2.0/6.0));
-    stencil.push_back(Displacement( 0,  0,  1, -2.0/6.0));
+    stencil.push_back(-1,  0,  0, -2.0/6.0);
+    stencil.push_back( 1,  0,  0, -2.0/6.0);
+    stencil.push_back( 0, -1,  0, -2.0/6.0);
+    stencil.push_back( 0,  1,  0, -2.0/6.0);
+    stencil.push_back( 0,  0, -1, -2.0/6.0);
+    stencil.push_back( 0,  0,  1, -2.0/6.0);
 
-    stencil.push_back(Displacement(-1, -1,  0, -1.0/6.0));
-    stencil.push_back(Displacement(-1,  1,  0, -1.0/6.0));
-    stencil.push_back(Displacement( 1, -1,  0, -1.0/6.0));
-    stencil.push_back(Displacement( 1,  1,  0, -1.0/6.0));
-    stencil.push_back(Displacement(-1,  0, -1, -1.0/6.0));
-    stencil.push_back(Displacement(-1,  0,  1, -1.0/6.0));
-    stencil.push_back(Displacement( 1,  0, -1, -1.0/6.0));
-    stencil.push_back(Displacement( 1,  0,  1, -1.0/6.0));
-    stencil.push_back(Displacement( 0, -1, -1, -1.0/6.0));
-    stencil.push_back(Displacement( 0, -1,  1, -1.0/6.0));
-    stencil.push_back(Displacement( 0,  1, -1, -1.0/6.0));
-    stencil.push_back(Displacement( 0,  1,  1, -1.0/6.0));
+    stencil.push_back(-1, -1,  0, -1.0/6.0);
+    stencil.push_back(-1,  1,  0, -1.0/6.0);
+    stencil.push_back( 1, -1,  0, -1.0/6.0);
+    stencil.push_back( 1,  1,  0, -1.0/6.0);
+    stencil.push_back(-1,  0, -1, -1.0/6.0);
+    stencil.push_back(-1,  0,  1, -1.0/6.0);
+    stencil.push_back( 1,  0, -1, -1.0/6.0);
+    stencil.push_back( 1,  0,  1, -1.0/6.0);
+    stencil.push_back( 0, -1, -1, -1.0/6.0);
+    stencil.push_back( 0, -1,  1, -1.0/6.0);
+    stencil.push_back( 0,  1, -1, -1.0/6.0);
+    stencil.push_back( 0,  1,  1, -1.0/6.0);
   }