Changeset ac6d04 for src/base/linked_cell_list.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/base/linked_cell_list.cpp (modified) (3 diffs)

src/base/linked_cell_list.cpp

@@ -18 +18 @@
 using namespace VMG;
 
-Particle::LinkedCellList::LinkedCellList(const std::list<Particle>& particles,
+Particle::LinkedCellList::LinkedCellList(std::list<Particle>& particles,
                                          const int& near_field_cells, const Grid& grid)
 {
-  std::list<Particle>::const_iterator iter;
+  std::list<Particle>::iterator iter;
   Index index_global, index_local;
   LocalIndices local = grid.Local();
 
-  local.BoundaryBegin1() = local.BoundaryEnd1() = 0;
-  local.BoundaryBegin2() = local.BoundaryEnd2() = 0;
+  local.BoundaryBegin1() = 0;
+  local.BoundaryEnd1() = 0;
+  local.BoundarySize1() = 0;
+
+  local.BoundaryBegin2() = 0;
+  local.BoundaryEnd2() = 0;
+  local.BoundarySize2() = 0;
+
+  local.FinerBeginFoo() = 0;
+  local.FinerEndFoo() = 0;
+  local.FinerSizeFoo() = 0;
 
   for (int i=0; i<3; ++i) {
 
-    if (local.HasHalo1()[i]) {
+    if (local.HaloSize1()[i] > 0) {
       local.HaloBegin1()[i] = 0;
       local.HaloEnd1()[i] = near_field_cells+1;
+      local.HaloSize1()[i] = near_field_cells+1;
       local.Begin()[i] = near_field_cells+1;
       local.End()[i] = local.Begin()[i] + local.Size()[i];
@@ -38 +48 @@
                              local.HaloEnd1()[i] - local.HaloBegin1()[i] +
                              local.HaloEnd2()[i] - local.HaloBegin2()[i];
+    }else {
+      local.Begin()[i] = 0;
+      local.End()[i] = local.Size()[i];
     }
 
-    if (local.HasHalo2()[i]) {
+    if (local.HaloSize2()[i] > 0) {
       local.HaloBegin2()[i] = local.End()[i];
       local.HaloEnd2()[i] = local.HaloBegin2()[i] + near_field_cells+1;
+      local.HaloSize2()[i] = near_field_cells+1;
       local.SizeTotal()[i] = local.Size()[i] +
                              local.HaloEnd1()[i] - local.HaloBegin1()[i] +
@@ -52 +66 @@
 
   for (iter=particles.begin(); iter!=particles.end(); ++iter)
-    AddParticle(*iter);
+    AddParticle(&(*iter));
 }
 
-void Particle::LinkedCellList::AddParticle(const Particle& p)
+Particle::LinkedCellList::~LinkedCellList()
 {
-  const Index global_index = (p.Pos() - Extent().Begin()) / Extent().MeshWidth();
-  const Index local_index = global_index - Global().BeginLocal() + Local().Begin();
-
-  if (local_index.IsInBounds(Local().Begin(), Local().End()))
-    (*this)(local_index).push_back(Particle(p.Pos(), p.Charge(), 0.0, 0.0, p.Rank(), p.Index()));
-  else
-    not_my_particles.push_back(Particle(p.Pos(), p.Charge(), 0.0, 0.0, p.Rank(), p.Index()));
+  ClearHalo();
 }
 
-void Particle::LinkedCellList::AddParticleToComplete(const vmg_float* pos, const vmg_float& charge,
-                                                     const vmg_float& pot, const vmg_float* force,
-                                                     const int& rank, const int& index)
+void Particle::LinkedCellList::AddParticle(Particle* p)
 {
-  const Index global_index = (Vector(pos) - Extent().Begin()) / Extent().MeshWidth();
-  const Index local_index = global_index - Global().BeginLocal() + Local().Begin();
+  const Index global_index = (p->Pos() - Extent().Begin()) / Extent().MeshWidth();
+  const Index local_index = global_index - Global().LocalBegin() + Local().Begin();
 
-  if (local_index.IsInBounds(0, Local().SizeTotal()))
-    (*this)(local_index).push_back(Particle(pos, charge, pot, force, rank, index));
-  else
-    not_my_particles.push_back(Particle(pos, charge, pot, force, rank, index));
+  assert(local_index.IsInBounds(Local().Begin(), Local().End()));
+  (*this)(local_index).push_back(p);
 }
 
-void Particle::LinkedCellList::AddParticleToComplete(const Vector& pos, const vmg_float& charge,
-                                                     const vmg_float& pot, const Vector& force,
-                                                     const int& rank, const int& index)
+void Particle::LinkedCellList::AddParticleToHalo(const vmg_float* x, const vmg_float& q)
 {
-  const Index global_index = (pos - Extent().Begin()) / Extent().MeshWidth();
-  const Index local_index = global_index - Global().BeginLocal() + Local().Begin();
+  const Index global_index = (Vector(x) - Extent().Begin()) / Extent().MeshWidth();
+  const Index local_index = global_index - Global().LocalBegin() + Local().Begin();
 
-  if (local_index.IsInBounds(0, Local().SizeTotal()))
-    (*this)(local_index).push_back(Particle(pos, charge, pot, force, rank, index));
-  else
-    not_my_particles.push_back(Particle(pos, charge, pot, force, rank, index));
+  assert(local_index.IsInBounds(0, Local().SizeTotal()));
+  assert((local_index[0] >= Local().HaloBegin1()[0] && local_index[0] < Local().HaloEnd1()[0]) ||
+         (local_index[1] >= Local().HaloBegin1()[1] && local_index[1] < Local().HaloEnd1()[1]) ||
+         (local_index[2] >= Local().HaloBegin1()[2] && local_index[2] < Local().HaloEnd1()[2]) ||
+         (local_index[0] >= Local().HaloBegin2()[0] && local_index[0] < Local().HaloEnd2()[0]) ||
+         (local_index[1] >= Local().HaloBegin2()[1] && local_index[1] < Local().HaloEnd2()[1]) ||
+         (local_index[2] >= Local().HaloBegin2()[2] && local_index[2] < Local().HaloEnd2()[2]));
+
+  (*this)(local_index).push_back(new Particle(x, q));
 }
 
-void Particle::LinkedCellList::AddParticleToComplete(const vmg_float* pos, const vmg_float& charge)
+void Particle::LinkedCellList::ClearHalo()
 {
-  const Index global_index = (Vector(pos) - Extent().Begin()) / Extent().MeshWidth();
-  const Index local_index = global_index - Global().BeginLocal() + Local().Begin();
+  Grid::iterator g_iter;
+  std::list<Particle*>::iterator p_iter;
 
-  if (local_index.IsInBounds(0, Local().SizeTotal()))
-    (*this)(local_index).push_back(Particle(pos, charge));
-  else
-    not_my_particles.push_back(Particle(pos, charge));
+  for (int i=0; i<3; ++i) {
+
+    for (g_iter = Iterators().Halo1()[i].Begin(); g_iter != Iterators().Halo1()[i].End(); ++g_iter)
+      for (p_iter = (*this)(*g_iter).begin(); p_iter!=(*this)(*g_iter).end(); ++p_iter)
+        delete *p_iter;
+
+    for (g_iter = Iterators().Halo2()[i].Begin(); g_iter != Iterators().Halo2()[i].End(); ++g_iter)
+      for (p_iter = (*this)(*g_iter).begin(); p_iter!=(*this)(*g_iter).end(); ++p_iter)
+        delete *p_iter;
+
+  }
 }