Changeset b57b9b for src/units/particle/interface_fcs.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:

• src/units/particle/interface_fcs.cpp (modified) (5 diffs)

src/units/particle/interface_fcs.cpp

@@ -46 +46 @@
 #include "comm/mpi/error_handler.hpp"
 #endif
+#include "cycles/cycle_cs_periodic.hpp"
+#include "cycles/cycle_fas_dirichlet.hpp"
 #include "level/level_operator_cs.hpp"
 #include "level/level_operator_fas.hpp"
@@ -51 +53 @@
 #include "samples/discretization_poisson_fd.hpp"
 #include "samples/discretization_poisson_fv.hpp"
-#include "samples/techniques.hpp"
 #include "smoother/gsrb_poisson_2.hpp"
 #include "smoother/gsrb_poisson_4.hpp"
@@ -111 +112 @@
   const bool singular = periodic[0] * periodic[1] * periodic[2];
 
-  Comm* comm;
-  Discretization* discretization;
-  Interface* interface;
-  LevelOperator* lop;
-  Smoother* smoother;
-  Solver* solver;
-
   /*
    * Choose multigrid components
@@ -123 +117 @@
   if (singular) {
 
-    comm = new Particle::CommMPI(boundary, new DomainDecompositionMPI(), mpi_comm);
-    discretization = new DiscretizationPoissonFD(discretization_order);
-    interface = new InterfaceParticles(boundary, 2, level, Vector(box_offset), box_size, near_field_cells, 0, 1.0);
-    lop = new LevelOperatorCS(Stencils::RestrictionFullWeight, Stencils::InterpolationTrilinear);
-    solver = new Givens<SolverSingular>();
-
-    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), cycle_type);
+    new Particle::CommMPI(boundary, new DomainDecompositionMPI(), mpi_comm);
+    new DiscretizationPoissonFD(discretization_order);
+    new InterfaceParticles(boundary, 2, level, Vector(box_offset), box_size, near_field_cells, 0, 1.0);
+    new LevelOperatorCS(Stencils::RestrictionFullWeight, Stencils::InterpolationTrilinear);
+    new Givens<SolverSingular>();
+    new CycleCSPeriodic(cycle_type);
 
   }else {
 
-    comm = new Particle::CommMPI(boundary, new DomainDecompositionMPI(), mpi_comm);
-    discretization = new DiscretizationPoissonFV(discretization_order);
-    interface = new InterfaceParticles(boundary, 2, level, Vector(box_offset), box_size, near_field_cells, 2, 1.6);
-    lop = new LevelOperatorFAS(Stencils::RestrictionFullWeight, Stencils::Injection, Stencils::InterpolationTrilinear);
-    solver = new Givens<SolverRegular>();
-
-    Techniques::SetFullApproximationSchemeDirichlet(interface->MinLevel(), interface->MaxLevel(), cycle_type);
+    new Particle::CommMPI(boundary, new DomainDecompositionMPI(), mpi_comm);
+    new DiscretizationPoissonFV(discretization_order);
+    new InterfaceParticles(boundary, 2, level, Vector(box_offset), box_size, near_field_cells, 2, 1.6);
+    new LevelOperatorFAS(Stencils::RestrictionFullWeight, Stencils::Injection, Stencils::InterpolationTrilinear);
+    new Givens<SolverRegular>();
+    new CycleFASDirichlet(cycle_type);
 
   }
@@ -147 +139 @@
    */
   if (discretization_order == 2)
-    smoother = new GaussSeidelRBPoisson2();
+    new GaussSeidelRBPoisson2();
   else
-    smoother = new GaussSeidelRBPoisson4();
-
-  /*
-   * Register multigrid components
-   */
-  comm->Register("COMM");
-  discretization->Register("DISCRETIZATION");
-  interface->Register("INTERFACE");
-  lop->Register("LEVEL_OPERATOR");
-  smoother->Register("SMOOTHER");
-  solver->Register("SOLVER");
+    new GaussSeidelRBPoisson4();
 
   /*