Changeset dfed1c for test/unit_test/dirichlet_cs.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/dirichlet_cs.cpp (modified) (4 diffs)

test/unit_test/dirichlet_cs.cpp

@@ -23 +23 @@
 #endif
 #include "solver/givens.hpp"
-#include "solver/solver_dirichlet.hpp"
+#include "solver/solver_regular.hpp"
 #include "mg.hpp"
 
@@ -38 +38 @@
   Factory& factory = MG::GetFactory();
 
-  Comm *comm = new CommSerial(Dirichlet);
+  Comm *comm = new CommSerial(Boundary(Dirichlet, Dirichlet, Dirichlet));
   comm->Register("COMM");
 
-  Interface* interface = new VMGInterfaces::InterfaceSinus(Dirichlet, 2, 6, 0.0, 1.0);
+  Interface* interface = new VMGInterfaces::InterfaceSinus(comm->BoundaryConditions(), 2, 6, 0.0, 1.0);
   MG::SetInterface(interface, comm);
 
@@ -54 +54 @@
 
 #ifdef HAVE_LAPACK
-  Solver* solver = new DGESV<SolverDirichlet>();
+  Solver* solver = new DGESV<SolverRegular>();
 #else
-  Solver* solver = new Givens<SolverDirichlet>();
+  Solver* solver = new Givens<SolverRegular>();
 #endif
   solver->Register("SOLVER");
@@ -79 +79 @@
   MG::Solve();
 
-  double res_init = MG::GetFactory().GetObject("INITIAL_RESIDUAL")->Cast< ObjectStorage<double> >()->Val();
+  double res_init = MG::GetFactory().Get("INITIAL_RESIDUAL")->Cast< ObjectStorage<double> >()->Val();
   double res = MG::GetComm()->ComputeResidualNorm(*MG::GetSol(), *MG::GetRhs());