Changeset ac6d04 for test/interfaces

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

Location:

test/interfaces

Files:

• Makefile.am (modified) (1 diff)
• interface_sinus.cpp (modified) (2 diffs)
• interface_sinus.hpp (modified) (1 diff)

test/interfaces/Makefile.am

@@ -1 @@
-check_LIBRARIES = libinterfaces.a
+check_LIBRARIES += libinterfaces.a
 
 libinterfaces_a_SOURCES = \
-        interface_sinus.cpp \
-        interface_sinus.hpp
+        interfaces/interface_sinus.cpp \
+        interfaces/interface_sinus.hpp
 
 libinterfaces_a_CPPFLAGS = -I $(top_srcdir)/src

test/interfaces/interface_sinus.cpp

@@ -8 +8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifndef _USE_MATH_DEFINES
-#define _USE_MATH_DEFINES
 #endif
 
@@ -25 +21 @@
 using VMGInterfaces::InterfaceSinus;
 
-void InterfaceSinus::ImportRightHandSide(Multigrid& grid)
+void InterfaceSinus::ImportRightHandSide(Multigrid& multigrid)
 {
   Index i;
   Vector pos;
 
-  Grid& grid_l = grid(grid.GlobalMaxLevel());
+  Grid& grid = multigrid(multigrid.MaxLevel());
+  grid.ClearBoundary();
 
-  const double& sp = grid_l.MeshWidth();
-  const double factor = 2.0 * M_PI * grid_l.Extent().Size().Max();
+  const Index begin_local = grid.Global().LocalBegin() - grid.Local().HaloSize1();
 
-  Index begin, end, begin_local;
-
-  for (int j=0; j<3; ++j) {
-
-    begin[j] = (grid_l.Local().HaloEnd1()[j] - grid_l.Local().HaloBegin1()[j] > 0 ? grid_l.Local().Begin()[j] : 0);
-    end[j] = (grid_l.Local().HaloEnd2()[j] - grid_l.Local().HaloBegin2()[j] > 0 ? grid_l.Local().End()[j] : grid_l.Local().SizeTotal()[j]);
-    begin_local[j] = grid_l.Global().BeginLocal()[j] - (grid_l.Local().HaloEnd1()[j] - grid_l.Local().HaloBegin1()[j] > 0 ? 1 : 0);
-  }
-
-  grid_l.ClearBoundary();
-
-  for (i.X()=begin.X(); i.X()<end.X(); ++i.X())
-    for (i.Y()=begin.Y(); i.Y()<end.Y(); ++i.Y())
-      for (i.Z()=begin.Z(); i.Z()<end.Z(); ++i.Z()) {
-
-        pos = grid_l.Extent().Begin() + sp * static_cast<Vector>(begin_local + i);
-
-        grid_l(i) = 3.0 * factor * factor * sin(factor * pos.X()) * sin(factor * pos.Y()) * sin(factor * pos.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());
       }
 }

test/interfaces/interface_sinus.hpp

@@ -23 +23 @@
 {
 public:
-  InterfaceSinus(VMG::Boundary boundary, int levelMin, int levelMax, vmg_float box_begin, vmg_float box_end, int coarseningSteps=0, double alpha=1.6) :
-    VMG::Interface(boundary, levelMin, levelMax, box_begin, box_end, coarseningSteps, alpha)
+  InterfaceSinus(vmg_float sine_factor,
+                 VMG::Boundary boundary, int levelMin, int levelMax,
+                 vmg_float box_begin, vmg_float box_end,
+                 int coarseningSteps=0, double alpha=1.6) :
+    VMG::Interface(boundary, levelMin, levelMax,
+                   box_begin, box_end, coarseningSteps, alpha),
+    sine_factor(sine_factor)
   {}
 
   virtual ~InterfaceSinus() {}
 
-  void ImportRightHandSide(VMG::Multigrid& grid);
+  void ImportRightHandSide(VMG::Multigrid& multigrid);
   void ExportSolution(VMG::Grid& grid);
+
+private:
+  vmg_float sine_factor;
 };