Changeset 894a5f for src/interface/interface_particles.cpp

Timestamp:

Feb 2, 2012, 1:58:12 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

32ff22

Parents:

01be70

Message:

Parallel performance update.

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

File:

• src/interface/interface_particles.cpp (modified) (14 diffs)

src/interface/interface_particles.cpp

@@ -22 +22 @@
 #include "base/index.hpp"
 #include "base/linked_cell_list.hpp"
-#include "base/timer.hpp"
 #include "base/vector.hpp"
 #include "comm/comm.hpp"
@@ -35 +34 @@
 void InterfaceParticles::ImportRightHandSide(Multigrid& multigrid)
 {
-  Timer::Start("Particle/Grid Interpolation");
-
   Index index_global, index_local, index;
   Vector pos_rel, pos_abs, grid_val;
 
   Factory& factory = MG::GetFactory();
+  Comm& comm = *MG::GetComm();
 
   const int& near_field_cells = factory.GetObjectStorageVal<int>("PARTICLE_NEAR_FIELD_CELLS");
 
-  TempGrid* temp_grid = GetTempGrid(0);
   Grid& grid = multigrid(multigrid.GlobalMaxLevel());
-  LocalIndices local = grid.Local();
-
-  // We don't need a boundary on this grid
-  local.End() -= local.Begin();
-  local.Begin() = 0;
-  local.BoundaryBegin1() = local.BoundaryEnd1() = 0;
-  local.BoundaryBegin2() = local.BoundaryEnd2() = 0;
-
-  // Set grid size of intermediate temporary grid
-  for (int i=0; i<3; ++i) {
-
-    if (local.HasHalo1()[i]) {
-      local.HaloBegin1()[i] = 0;
-      local.HaloEnd1()[i] = local.Begin()[i] = near_field_cells+1;
-      local.End()[i] = local.Begin()[i] + local.Size()[i];
-    }
-
-    if (local.HasHalo2()[i]) {
-      local.HaloBegin2()[i] = local.End()[i];
-      local.HaloEnd2()[i] = local.HaloBegin2()[i] + near_field_cells+1;
-    }
-
-  }
-
-  local.SizeTotal() = local.Size() +
-                      local.HaloEnd1() - local.HaloBegin1() +
-                      local.HaloEnd2() - local.HaloBegin2();
-
-  temp_grid->SetProperties(grid.Global(), local, grid.Extent());
-  temp_grid->Clear();
+  Grid& particle_grid = comm.GetParticleGrid();
+
+  particle_grid.Clear();
 
   /*
@@ -81 +51 @@
    */
   particles.clear();
-  MG::GetComm()->CommParticles(grid, particles);
+  comm.CommParticles(grid, particles);
 
   /*
@@ -93 +63 @@
     particle_charges += iter->Charge();
   particle_charges = MG::GetComm()->GlobalSumRoot(particle_charges);
-  MG::GetComm()->PrintStringOnce("Particle list charge sum: %e", particle_charges);
+  comm.PrintStringOnce("Particle list charge sum: %e", particle_charges);
 #endif
 
   for (iter=particles.begin(); iter!=particles.end(); ++iter)
-    spl.SetSpline(*temp_grid, *iter, near_field_cells);
+    spl.SetSpline(particle_grid, *iter, near_field_cells);
 
   // Communicate charges over halo
-  MG::GetComm()->CommFromGhosts(*temp_grid);
+  comm.CommFromGhosts(particle_grid);
 
   // Assign charge values to the right hand side
@@ -106 +76 @@
     for (index.Y()=0; index.Y()<grid.Local().Size().Y(); ++index.Y())
       for (index.Z()=0; index.Z()<grid.Local().Size().Z(); ++index.Z())
-        grid(index + grid.Local().Begin()) = temp_grid->GetVal(index + temp_grid->Local().Begin());
-
-  Timer::Stop("Particle/Grid Interpolation");
+        grid(index + grid.Local().Begin()) = particle_grid.GetVal(index + particle_grid.Local().Begin());
 
 #ifdef DEBUG_OUTPUT
@@ -116 +84 @@
     charge_sum += grid.GetVal(*grid_iter);
   charge_sum = MG::GetComm()->GlobalSum(charge_sum);
-  MG::GetComm()->PrintStringOnce("Grid charge sum: %e", charge_sum);
+  comm.PrintStringOnce("Grid charge sum: %e", charge_sum);
 #endif
 }
@@ -122 +90 @@
 void InterfaceParticles::ExportSolution(Grid& grid)
 {
-  Timer::Start("Grid/Particle Interpolation");
-
   Index index;
   vmg_float length;
@@ -135 +101 @@
 
   Factory& factory = MG::GetFactory();
-  Comm* comm = MG::GetComm();
+  Comm& comm = *MG::GetComm();
 
   /*
@@ -161 +127 @@
    * The parameters of this grid have been set in the import step.
    */
-  TempGrid* temp_grid = GetTempGrid(0);
+  Grid& particle_grid = comm.GetParticleGrid();
 
   for (index.X()=0; index.X()<grid.Local().Size().X(); ++index.X())
     for (index.Y()=0; index.Y()<grid.Local().Size().Y(); ++index.Y())
       for (index.Z()=0; index.Z()<grid.Local().Size().Z(); ++index.Z())
-        (*temp_grid)(index + temp_grid->Local().Begin()) = grid.GetVal(index + grid.Local().Begin());
-
-  comm->CommToGhosts(*temp_grid);
+        particle_grid(index + particle_grid.Local().Begin()) = grid.GetVal(index + grid.Local().Begin());
+
+  comm.CommToGhosts(particle_grid);
 
   /*
@@ -177 +143 @@
 
     // Interpolate long range part of potential
-    p_iter->Pot() = 0.5 * (Helper::InterpolateTrilinear(p_iter->Pos(), *temp_grid) - p_iter->Charge() * spl.GetAntiDerivativeZero());
-
-#ifdef DEBUG_OUTPUT
-    e_long += 0.5 * p_iter->Charge() * Helper::InterpolateTrilinear(p_iter->Pos(), *temp_grid);
+    p_iter->Pot() = 0.5 * (Helper::InterpolateTrilinear(p_iter->Pos(), particle_grid) - p_iter->Charge() * spl.GetAntiDerivativeZero());
+
+#ifdef DEBUG_OUTPUT
+    e_long += 0.5 * p_iter->Charge() * Helper::InterpolateTrilinear(p_iter->Pos(), particle_grid);
     e_self += 0.5 * p_iter->Charge() * p_iter->Charge() * spl.GetAntiDerivativeZero();
 #endif
@@ -186 +152 @@
   }
 
-  comm->CommAddPotential(particles);
+  comm.CommAddPotential(particles);
 
   /*
@@ -195 +161 @@
   Grid::iterator iter;
 
-  comm->CommLCListGhosts(grid, lc);
+  comm.CommLCListGhosts(grid, lc);
 
   for (iter=lc.Iterators().Local().Begin(); iter!=lc.Iterators().Local().End(); ++iter)
@@ -213 +179 @@
               }
 
-  comm->CommAddPotential(lc);
-
-  Timer::Stop("Grid/Particle Interpolation");
+  comm.CommAddPotential(lc);
 
 #ifdef DEBUG_OUTPUT
@@ -223 +187 @@
     e += p[i] * q[i];
 
-  e = comm->GlobalSumRoot(e);
-  e_long = comm->GlobalSumRoot(e_long);
-  e_self = comm->GlobalSumRoot(e_self);
-
-  comm->PrintStringOnce("E_long:  %e", e_long);
-  comm->PrintStringOnce("E_short: %e", e - e_long + e_self);
-  comm->PrintStringOnce("E_self:  %e", e_self);
-  comm->PrintStringOnce("E_total: %e", e);
+  e = comm.GlobalSumRoot(e);
+  e_long = comm.GlobalSumRoot(e_long);
+  e_self = comm.GlobalSumRoot(e_self);
+
+  comm.PrintStringOnce("E_long:  %e", e_long);
+  comm.PrintStringOnce("E_short: %e", e - e_long + e_self);
+  comm.PrintStringOnce("E_self:  %e", e_self);
+  comm.PrintStringOnce("E_total: %e", e);
 
 #endif /* DEBUG_OUTPUT */