Changeset dfed1c for test/unit_test/smoother_test.cpp

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:

• test/unit_test/smoother_test.cpp (modified) (4 diffs)

test/unit_test/smoother_test.cpp

@@ -27 +27 @@
 void SmootherTestSuite::setUp()
 {
-  Comm* comm = new CommSerial(Dirichlet);
+  Boundary boundary(Dirichlet, Dirichlet, Dirichlet);
+
+  Comm* comm = new CommSerial(boundary);
   comm->Register("COMM");
 
@@ -33 +35 @@
   discretization->Register("DISCRETIZATION");
 
-  Interface* interface = new VMGInterfaces::InterfaceSinus(Dirichlet, 4, 4, 0.0, 1.0);
+  Interface* interface = new VMGInterfaces::InterfaceSinus(boundary, 4, 4, 0.0, 1.0);
   MG::SetInterface(interface, comm);
 
@@ -44 +46 @@
 void SmootherTestSuite::tearDown()
 {
+  MG::Destroy();
+
   delete gs;
   delete gsrb;
@@ -51 +55 @@
 {
   double norm;
+  Multigrid& sol = *MG::GetSol();
+  Multigrid& rhs = *MG::GetRhs();
+  Comm& comm = *MG::GetComm();
 
-  MG::GetSol()->ClearAll();
+  sol.ClearAll();
 
   for (int i=0; i<20; ++i) {
 
-    gs->Run(*MG::GetSol(), *MG::GetRhs(), 50);
-    norm = MG::GetComm()->ComputeResidualNorm(*MG::GetSol(), *MG::GetRhs());
+    gs->Run(sol, rhs, 50);
+    norm = comm.ComputeResidualNorm(sol, rhs);
 
     if (norm < 1e-10)