Changeset a24b80 for src/units/particle/interface_fcs.cpp

Timestamp:

Jun 11, 2012, 3:01:12 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

290aa3

Parents:

2d4211

Message:

Simplified API.

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

File:

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

src/units/particle/interface_fcs.cpp

@@ -54 +54 @@
 #include "smoother/gsrb_poisson_2.hpp"
 #include "smoother/gsrb_poisson_4.hpp"
-#ifdef HAVE_LAPACK
-#include "solver/dgesv.hpp"
-#include "solver/dsysv.hpp"
-#else
 #include "solver/givens.hpp"
-#endif
 #include "solver/solver_regular.hpp"
 #include "solver/solver_singular.hpp"
@@ -116 +111 @@
   const bool singular = periodic[0] * periodic[1] * periodic[2];
 
-  /*
-   * Register communication class.
-   */
-  Comm* comm = new Particle::CommMPI(boundary, new DomainDecompositionMPI(), mpi_comm);
+  Comm* comm;
+  Discretization* discretization;
+  Interface* interface;
+  LevelOperator* lop;
+  Smoother* smoother;
+  Solver* solver;
+
+  /*
+   * Choose multigrid components
+   */
+  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);
+
+  }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);
+
+  }
+
+  /*
+   * Use Gauss-Seidel Red-Black ordering
+   */
+  if (discretization_order == 2)
+    smoother = new GaussSeidelRBPoisson2();
+  else
+    smoother = new GaussSeidelRBPoisson4();
+
+  /*
+   * Register multigrid components
+   */
   comm->Register("COMM");
-
-  /*
-   * Register particle interface.
-   */
-  Interface* interface;
-  if (singular)
-    interface = new InterfaceParticles(boundary, 2, level, Vector(box_offset), box_size, near_field_cells, 0, 1.0);
-  else
-    interface = new InterfaceParticles(boundary, 2, level, Vector(box_offset), box_size, near_field_cells, 2, 1.6);
-  MG::SetInterface(interface, comm);
-
-  /*
-   * Define discretization of the Poisson equation.
-   * Finite volumes for locally refined grids and
-   * finite differences otherwise.
-   */
-  Discretization* discretization;
-  if (singular)
-    discretization = new DiscretizationPoissonFD(discretization_order);
-  else
-    discretization = new DiscretizationPoissonFV(discretization_order);
   discretization->Register("DISCRETIZATION");
-
-  /*
-   * Use a correction scheme multigrid algorithm with full weight stencils.
-   * Since we use the Gauss-Seidel RB smoother here, this may be replaced
-   * with a half-weight version once debugging is finished.
-   */
-  LevelOperator* lop;
-  if (singular)
-    lop = new LevelOperatorCS(Stencils::RestrictionFullWeight, Stencils::InterpolationTrilinear);
-  else
-    lop = new LevelOperatorFAS(Stencils::RestrictionFullWeight, Stencils::Injection, Stencils::InterpolationTrilinear);
+  interface->Register("INTERFACE");
   lop->Register("LEVEL_OPERATOR");
-
-  /*
-   * Use Gauss-Seidel Red-Black ordering
-   */
-  if (discretization_order == 2) {
-    Smoother* smoother = new GaussSeidelRBPoisson2();
-    smoother->Register("SMOOTHER");
-  }else {
-    Smoother* smoother = new GaussSeidelRBPoisson4();
-    smoother->Register("SMOOTHER");
-  }
-
-  /*
-   * Use LAPACK solver when available, otherwise use Givens rotations.
-   */
-#ifdef HAVE_LAPACK
-  Solver* solver = (singular ?
-                    static_cast<Solver*>(new DSYSV<SolverSingular>()) :
-                    static_cast<Solver*>(new DGESV<SolverRegular>()));
-#else
-  Solver* solver = (singular ?
-                    static_cast<Solver*>(new Givens<SolverSingular>()) :
-                    static_cast<Solver*>(new Givens<SolverRegular>()));
-#endif
+  smoother->Register("SMOOTHER");
   solver->Register("SOLVER");
-
-  /*
-   * Set commands for the actual multigrid cycle
-   */
-  if (singular)
-    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), cycle_type);
-  else
-    Techniques::SetFullApproximationSchemeDirichlet(interface->MinLevel(), interface->MaxLevel(), cycle_type);
 
   /*
@@ -200 +172 @@
 
   /*
+   * Post init
+   */
+  MG::PostInit();
+
+  /*
    * Check whether the library is correctly initialized now.
    */
   MG::IsInitialized();
-
-  /*
-   * Post init communication class
-   */
-  MG::PostInit();
 }