Changeset ac6d04 for src/interface/interface_fcs.cpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:

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

src/interface/interface_fcs.cpp

@@ -17 +17 @@
 
 #include <mpi.h>
+#ifdef HAVE_MARMOT
+#include <enhancempicalls.h>
+#include <sourceinfompicalls.h>
+#endif
 
 #include "base/object.hpp"
@@ -22 +26 @@
 #include "comm/comm_mpi.hpp"
 #include "comm/domain_decomposition_mpi.hpp"
+#include "comm/mpi/error_handler.hpp"
 #include "interface/interface_fcs.h"
 #include "interface/interface_particles.hpp"
 #include "level/level_operator_cs.hpp"
+#include "level/level_operator_fas.hpp"
 #include "samples/discretization_poisson_fd.hpp"
+#include "samples/discretization_poisson_fv.hpp"
 #include "samples/stencils.hpp"
 #include "samples/techniques.hpp"
@@ -70 +77 @@
   VMGBackupSettings::mpi_comm = mpi_comm;
 
+  MPI_Errhandler mpiErrorHandler;
+  MPI_Comm_create_errhandler(VMG::MPI::ConvertToException, &mpiErrorHandler);
+  MPI_Comm_set_errhandler(MPI_COMM_WORLD, mpiErrorHandler);
+
   const Boundary boundary(periodic[0] ? Periodic : Open,
                           periodic[1] ? Periodic : Open,
@@ -85 +96 @@
    * Register particle interface.
    */
-  Interface* interface = new VMG::InterfaceParticles(boundary, 2, level, Vector(box_offset), box_size, near_field_cells);
+  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);
 
   /*
-   * Use a finite difference discretization of the Poisson equation
-   */
-  Discretization* discretization = new DiscretizationPoissonFD();
+   * Define discretization of the Poisson equation.
+   * Finite volumes for locally refined grids and
+   * finite differences otherwise.
+   */
+  Discretization* discretization;
+  if (singular)
+    discretization = new DiscretizationPoissonFD();
+  else
+    discretization = new DiscretizationPoissonFV();
   discretization->Register("DISCRETIZATION");
 
@@ -99 +120 @@
    * with a half-weight version once debugging is finished.
    */
-  LevelOperator* lop = new LevelOperatorCS(Stencils::RestrictionFullWeight, Stencils::InterpolationTrilinear);
+  LevelOperator* lop;
+  if (singular)
+    lop = new LevelOperatorCS(Stencils::RestrictionFullWeight, Stencils::InterpolationTrilinear);
+  else
+    lop = new LevelOperatorFAS(Stencils::RestrictionFullWeight, Stencils::Injection, Stencils::InterpolationTrilinear);
   lop->Register("LEVEL_OPERATOR");
 
@@ -126 +151 @@
    */
   if (singular)
-    Techniques::SetCorrectionSchemePeriodic(2, level, gamma);
-  else
-    Techniques::SetCorrectionSchemeDirichlet(2, level, gamma);
+    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), gamma);
+  else
+    Techniques::SetFullApproximationSchemeDirichlet(interface->MinLevel(), interface->MaxLevel(), gamma);
 
   /*
@@ -137 +162 @@
   new ObjectStorage<vmg_float>("PRECISION", precision);
   new ObjectStorage<int>("MAX_ITERATION", max_iter);
-
   new ObjectStorage<int>("PARTICLE_NEAR_FIELD_CELLS", near_field_cells);
 
@@ -180 +204 @@
 }
 
+int VMG_fcs_check()
+{
+  const int& near_field_cells = MG::GetFactory().GetObjectStorageVal<int>("PARTICLE_NEAR_FIELD_CELLS");
+  const Multigrid& multigrid = *MG::GetRhs();
+  const Grid& grid = multigrid(multigrid.MaxLevel());
+
+  if (!grid.Global().LocalSize().IsComponentwiseGreater(near_field_cells))
+    return 1;
+
+  return 0;
+}
+
 void VMG_fcs_run(vmg_float* x, vmg_float* q, vmg_float* p, vmg_float* f, vmg_int num_particles_local)
 {