Changeset b57b9b for test/unit_test/library/dirichlet_fas_lr.cpp

Timestamp:

Sep 20, 2012, 1:54:01 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

c3acbb

Parents:

2d3854

Message:

vmg: Simplified API.

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

File:

• test/unit_test/library/dirichlet_fas_lr.cpp (modified) (2 diffs)

test/unit_test/library/dirichlet_fas_lr.cpp

@@ -35 +35 @@
 #include "base/vector.hpp"
 #include "comm/comm_serial.hpp"
+#include "cycles/cycle_fas_dirichlet.hpp"
 #include "level/level_operator_fas.hpp"
 #include "level/level_operator.hpp"
 #include "samples/discretization_poisson_fv.hpp"
-#include "samples/techniques.hpp"
 #include "smoother/gsrb.hpp"
-#ifdef HAVE_LAPACK
-#include "solver/dgesv.hpp"
-#endif
 #include "solver/givens.hpp"
 #include "solver/solver_regular.hpp"
@@ -57 +54 @@
   LibraryDirichletFASLRFixture()
   {
-    Factory& factory = MG::GetFactory();
+    Boundary boundary(Dirichlet, Dirichlet, Dirichlet);
 
-    Comm *comm = new CommSerial(Boundary(Dirichlet, Dirichlet, Dirichlet));
-    comm->Register("COMM");
+    new CommSerial(boundary);
+    new VMGInterfaces::InterfaceSinus(sine_factor, boundary, 2, 6, 0.0, 1.0, 2, 1.6);
+    new DiscretizationPoissonFV(2);
+    new LevelOperatorFAS(Stencils::RestrictionFullWeight, Stencils::Injection, Stencils::InterpolationTrilinear);
+    new GaussSeidelRB();
+    new Givens<SolverRegular>();
+    new CycleFASDirichlet(2);
 
-    Interface* interface = new VMGInterfaces::InterfaceSinus(sine_factor, comm->BoundaryConditions(), 2, 6, 0.0, 1.0, 2, 1.6);
-    interface->Register("INTERFACE");
-
-    Discretization* discretization = new DiscretizationPoissonFV(2);
-    discretization->Register("DISCRETIZATION");
-
-    LevelOperator* lop = new LevelOperatorFAS(Stencils::RestrictionFullWeight, Stencils::Injection, Stencils::InterpolationTrilinear);
-    lop->Register("LEVEL_OPERATOR");
-
-    Smoother* smoother = new GaussSeidelRB();
-    smoother->Register("SMOOTHER");
-
-#ifdef HAVE_LAPACK
-    Solver* solver = new DGESV<SolverRegular>();
-#else
-    Solver* solver = new Givens<SolverRegular>();
-#endif
-
-    solver->Register("SOLVER");
-
-    Techniques::SetFullApproximationSchemeDirichlet(interface->MinLevel(), interface->MaxLevel(), 2);
-
-    factory.RegisterObjectStorage("PRESMOOTHSTEPS", 3);
-    factory.RegisterObjectStorage("POSTSMOOTHSTEPS", 3);
-    factory.RegisterObjectStorage("PRECISION", 1e-10);
-    factory.RegisterObjectStorage("MAX_ITERATION", 8);
+    new ObjectStorage<int>("PRESMOOTHSTEPS", 3);
+    new ObjectStorage<int>("POSTSMOOTHSTEPS", 3);
+    new ObjectStorage<int>("MAX_ITERATION", 8);
+    new ObjectStorage<vmg_float>("PRECISION", 1.0e-10);
 
     MG::PostInit();