Changeset 4a709e for test/interfaces/interface_sinus.cpp

Timestamp:

Apr 5, 2013, 12:45:32 PM (13 years ago)

Author:

Julian Iseringhausen <julian.iseringhausen@…>

Children:

e85cfd

Parents:

8180d8

Message:

Fixed merging errors.

File:

• test/interfaces/interface_sinus.cpp (modified) (1 diff)

test/interfaces/interface_sinus.cpp

@@ -49 +49 @@
   const Index begin_local = grid.Global().LocalBegin() - grid.Local().HaloSize1();
 
-  for (i.X()=grid.Local().FinerBegin().X(); i.X()<grid.Local().FinerEnd().X(); ++i.X())
-    for (i.Y()=grid.Local().FinerBegin().Y(); i.Y()<grid.Local().FinerEnd().Y(); ++i.Y())
-      for (i.Z()=grid.Local().FinerBegin().Z(); i.Z()<grid.Local().FinerEnd().Z(); ++i.Z()) {
+  for (i.X()=grid.Local().Begin().X(); i.X()<grid.Local().End().X(); ++i.X())
+    for (i.Y()=grid.Local().Begin().Y(); i.Y()<grid.Local().End().Y(); ++i.Y())
+      for (i.Z()=grid.Local().Begin().Z(); i.Z()<grid.Local().End().Z(); ++i.Z()) {
         pos = grid.Extent().MeshWidth() * static_cast<Vector>(begin_local + i);
         grid(i) = 3.0 * sine_factor * sine_factor * std::sin(sine_factor * pos.X()) * std::sin(sine_factor * pos.Y()) * std::sin(sine_factor * pos.Z());