Changeset dfed1c for src/interface/interface_fcs.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:

• src/interface/interface_fcs.cpp (modified) (8 diffs)

src/interface/interface_fcs.cpp

@@ -19 +19 @@
 
 #include "base/object.hpp"
-#include "comm/comm_serial.hpp"
+#include "base/timer.hpp"
+#include "comm/comm_mpi.hpp"
+#include "comm/domain_decomposition_mpi.hpp"
 #include "interface/interface_fcs.h"
 #include "interface/interface_particles.hpp"
@@ -33 +35 @@
 #include "solver/givens.hpp"
 #endif
-#include "solver/solver_dirichlet.hpp"
-#include "solver/solver_periodic.hpp"
+#include "solver/solver_regular.hpp"
+#include "solver/solver_singular.hpp"
 
 using namespace VMG;
 
-void VMGInterfaceFCSInit(vmg_int level, vmg_int periodic, vmg_int spline_degree,
-                         vmg_int max_iter, vmg_int smoothing_steps, vmg_int gamma,
-                         vmg_float precision, vmg_float box_begin, vmg_float box_end,
-                         MPI_Comm mpi_comm)
-{
-  const BC bc = (periodic ? Periodic : Dirichlet);
-
-  /*
-   * Register all the parameters for later use.
-   */
-  new ObjectStorage<int>("LEVEL_FCS", level);
-  new ObjectStorage<int>("PERIODIC_FCS", periodic);
-  new ObjectStorage<int>("SPLINE_DEGREE_FCS", spline_degree);
-  new ObjectStorage<int>("MAX_ITER_FCS", max_iter);
-  new ObjectStorage<int>("SMOOTHING_STEPS_FCS", smoothing_steps);
-  new ObjectStorage<int>("GAMMA_FCS", gamma);
-  new ObjectStorage<vmg_float>("PRECISION_FCS", precision);
-  new ObjectStorage<vmg_float>("BOX_BEGIN_FCS", box_begin);
-  new ObjectStorage<vmg_float>("BOX_END_FCS", box_end);
-  new ObjectStorage<MPI_Comm>("MPI_COMM_FCS", mpi_comm);
+namespace VMGBackupSettings
+{
+  static vmg_int level = -1;
+  static vmg_int periodic[3] = {-1, -1, -1};
+  static vmg_int max_iter = -1;
+  static vmg_int smoothing_steps = -1;
+  static vmg_int gamma = -1;
+  static vmg_float precision = -1;
+  static vmg_float box_offset[3];
+  static vmg_float box_size = -1.0;
+  static vmg_int near_field_cells = -1;
+  static MPI_Comm mpi_comm;
+}
+
+static void VMG_fcs_init(vmg_int level, vmg_int* periodic,vmg_int max_iter,
+                         vmg_int smoothing_steps, vmg_int gamma, vmg_float precision,
+                         vmg_float* box_offset, vmg_float box_size,
+                         vmg_int near_field_cells, MPI_Comm mpi_comm)
+{
+  VMGBackupSettings::level = level;
+  std::memcpy(VMGBackupSettings::periodic, periodic, 3*sizeof(vmg_int));
+  VMGBackupSettings::max_iter = max_iter;
+  VMGBackupSettings::smoothing_steps = smoothing_steps;
+  VMGBackupSettings::gamma = gamma;
+  VMGBackupSettings::precision = precision;
+  std::memcpy(VMGBackupSettings::box_offset, box_offset, 3*sizeof(vmg_float));
+  VMGBackupSettings::box_size = box_size;
+  VMGBackupSettings::near_field_cells = near_field_cells;
+  VMGBackupSettings::mpi_comm = mpi_comm;
+
+  const Boundary boundary(periodic[0] ? Periodic : Open,
+                          periodic[1] ? Periodic : Open,
+                          periodic[2] ? Periodic : Open);
+
+  const bool singular = periodic[0] * periodic[1] * periodic[2];
 
   /*
    * Register communication class.
-   * For now, parallel version is not yet released.
-   */
-  Comm* comm = new CommSerial(bc);
+   */
+  Comm* comm = new CommMPI(boundary, new DomainDecompositionMPI());
   comm->Register("COMM");
 
@@ -69 +85 @@
    * Register particle interface.
    */
-  Interface* interface = new VMG::InterfaceParticles(bc, 2, level, box_begin, box_end);
+  Interface* interface = new VMG::InterfaceParticles(boundary, 2, level, Vector(box_offset), box_size, near_field_cells);
   MG::SetInterface(interface, comm);
 
@@ -96 +112 @@
    */
 #ifdef HAVE_LAPACK
-  Solver* solver = (periodic ?
-                    static_cast<Solver*>(new DSYSV<SolverPeriodic>()) :
-                    static_cast<Solver*>(new DGESV<SolverDirichlet>()));
+  Solver* solver = (singular ?
+                    static_cast<Solver*>(new DSYSV<SolverSingular>()) :
+                    static_cast<Solver*>(new DGESV<SolverRegular>()));
 #else
-  Solver* solver = (periodic ?
-                    static_cast<Solver*>(new Givens<SolverPeriodic>()) :
-                    static_cast<Solver*>(new Givens<SolverDirichlet>()));
+  Solver* solver = (singular ?
+                    static_cast<Solver*>(new Givens<SolverSingular>()) :
+                    static_cast<Solver*>(new Givens<SolverRegular>()));
 #endif
   solver->Register("SOLVER");
@@ -109 +125 @@
    * Set commands for the actual multigrid cycle
    */
-  if (periodic)
+  if (singular)
     Techniques::SetCorrectionSchemePeriodic(2, level, gamma);
   else
@@ -122 +138 @@
   new ObjectStorage<int>("MAX_ITERATION", max_iter);
 
+  new ObjectStorage<int>("PARTICLE_NEAR_FIELD_CELLS", near_field_cells);
+
   /*
    * Check whether the library is correctly initialized now.
@@ -128 +146 @@
 }
 
-void VMGInterfaceFCSRun(vmg_float* x, vmg_float* q, vmg_float* p, vmg_float* f, vmg_int num_particles_local)
+void VMG_fcs_setup(vmg_int level, vmg_int* periodic, vmg_int max_iter,
+                   vmg_int smoothing_steps, vmg_int gamma, vmg_float precision,
+                   vmg_float* box_offset, vmg_float box_size,
+                   vmg_int near_field_cells, MPI_Comm mpi_comm)
+{
+  if (VMGBackupSettings::level != level ||
+      VMGBackupSettings::periodic[0] != periodic[0] ||
+      VMGBackupSettings::periodic[1] != periodic[1] ||
+      VMGBackupSettings::periodic[2] != periodic[2] ||
+      VMGBackupSettings::max_iter != max_iter ||
+      VMGBackupSettings::smoothing_steps != smoothing_steps ||
+      VMGBackupSettings::gamma != gamma ||
+      VMGBackupSettings::precision != precision ||
+      VMGBackupSettings::box_offset[0] != box_offset[0] ||
+      VMGBackupSettings::box_offset[1] != box_offset[1] ||
+      VMGBackupSettings::box_offset[2] != box_offset[2] ||
+      VMGBackupSettings::box_size != box_size ||
+      VMGBackupSettings::near_field_cells != near_field_cells ||
+      VMGBackupSettings::mpi_comm != mpi_comm) {
+
+    VMG_fcs_destroy();
+    VMG_fcs_init(level, periodic, max_iter,
+                 smoothing_steps, gamma, precision,
+                 box_offset, box_size, near_field_cells,
+                 mpi_comm);
+
+  }
+}
+
+void VMG_fcs_run(vmg_float* x, vmg_float* q, vmg_float* p, vmg_float* f, vmg_int num_particles_local)
 {
   /*
    * Register parameters for later use.
    */
-  new ObjectStorage<vmg_float*>("X_FCS", x);
-  new ObjectStorage<vmg_float*>("Q_FCS", q);
-  new ObjectStorage<vmg_float*>("P_FCS", p);
-  new ObjectStorage<vmg_float*>("F_FCS", f);
-  new ObjectStorage<vmg_int>("NUM_PARTICLES_LOCAL_FCS", num_particles_local);
+  new ObjectStorage<vmg_float*>("PARTICLE_POS_ARRAY", x);
+  new ObjectStorage<vmg_float*>("PARTICLE_CHARGE_ARRAY", q);
+  new ObjectStorage<vmg_float*>("PARTICLE_POTENTIAL_ARRAY", p);
+  new ObjectStorage<vmg_float*>("PARTICLE_FORCE_ARRAY", f);
+  new ObjectStorage<vmg_int>("PARTICLE_NUM_LOCAL", num_particles_local);
 
   /*
@@ -145 +192 @@
 }
 
-void VMGInterfaceFCSDestroy(void)
+void VMG_fcs_print_timer()
+{
+  Timer::Print();
+}
+
+void VMG_fcs_destroy(void)
 {
   /*