Changeset f003a9 for src/comm/comm_serial.cpp

Timestamp:

May 8, 2012, 2:54:17 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

6f05224

Parents:

4e8206

Message:

Refactored vmg in order to separate the core library and the particle simulation part properly.

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

File:

• src/comm/comm_serial.cpp (modified) (2 diffs)

src/comm/comm_serial.cpp

@@ -24 +24 @@
 #include "base/helper.hpp"
 #include "base/index.hpp"
-#include "base/linked_cell_list.hpp"
 #include "base/stencil.hpp"
 #include "base/vector.hpp"
@@ -174 +173 @@
 {
 }
-
-void CommSerial::CommParticles(const Grid& grid, std::list<Particle::Particle>& particles)
-{
-  Factory& factory = MG::GetFactory();
-  const vmg_int& num_particles_local = factory.GetObjectStorageVal<vmg_int>("PARTICLE_NUM_LOCAL");
-  vmg_float* x = factory.GetObjectStorageArray<vmg_float>("PARTICLE_POS_ARRAY");
-  vmg_float* q = factory.GetObjectStorageArray<vmg_float>("PARTICLE_CHARGE_ARRAY");
-
-  particles.clear();
-
-  for (vmg_int i=0; i<num_particles_local; ++i)
-    particles.push_back(Particle::Particle(&x[3*i], q[i], 0.0, 0.0, 0, i));
-}
-
-void CommSerial::CommParticlesBack(std::list<Particle::Particle>& particles)
-{
-  std::list<Particle::Particle>::iterator iter;
-  vmg_float* p = MG::GetFactory().GetObjectStorageArray<vmg_float>("PARTICLE_POTENTIAL_ARRAY");
-  for (iter=particles.begin(); iter!=particles.end(); ++iter)
-    p[iter->Index()] = iter->Pot();
-}
-
-void CommSerial::CommLCListToGhosts(Particle::LinkedCellList& lc)
-{
-  // std::list<Particle::Particle*>::iterator p_iter;
-  // Grid::iterator g_iter;
-
-  // for (int i=2; i>=0; --i) {
-
-  //   if (BoundaryConditions()[i] == Periodic) {
-
-  //     for (g_iter=lc.Iterators().Halo1()[i].Begin(); g_iter!=lc.Iterators().Halo1()[i].End(); ++g_iter)
-  //    lc(*g_iter).clear();
-
-  //     for (g_iter=lc.Iterators().NearBoundary1()[i].Begin(); g_iter!=lc.Iterators().NearBoundary1()[i].End(); ++g_iter)
-  //    for (p_iter=lc(*g_iter).begin(); p_iter!=lc(*g_iter).end(); ++p_iter)
-  //      lc.AddParticleToComplete((*p_iter)->Pos() + grid.Extent().Size(), (*p_iter)->Charge(),
-  //                               (*p_iter)->Pot(), (*p_iter)->Force(),
-  //                               (*p_iter)->Rank(), (*p_iter)->Index());
-
-  //     for (g_iter=lc.Iterators().Halo2()[i].Begin(); g_iter!=lc.Iterators().Halo2()[i].End(); ++g_iter)
-  //    lc(*g_iter).clear();
-
-  //     for (g_iter=lc.Iterators().NearBoundary2()[i].Begin(); g_iter!=lc.Iterators().NearBoundary2()[i].End(); ++g_iter)
-  //    for (p_iter=lc(*g_iter).begin(); p_iter!=lc(*g_iter).end(); ++p_iter)
-  //      lc.AddParticleToComplete((*p_iter)->Pos() - grid.Extent().Size(), (*p_iter)->Charge(),
-  //                               (*p_iter)->Pot(), (*p_iter)->Force(),
-  //                               (*p_iter)->Rank(), (*p_iter)->Index());
-
-  //   }
-  // }
-}
-
-void CommSerial::CommLCListFromGhosts(const Grid& grid, Particle::LinkedCellList& lc)
-{
-
-}
-
-// void CommSerial::CommAddPotential(std::list<Particle::Particle>& particles)
-// {
-//   std::list<Particle::Particle>::iterator iter;
-//   vmg_float* p = MG::GetFactory().GetObjectStorageArray<vmg_float>("PARTICLE_POTENTIAL_ARRAY");
-
-//   for (iter=particles.begin(); iter!=particles.end(); ++iter)
-//     p[iter->Index()] += iter->Pot();
-// }
 
 void CommSerial::PrintString(const char* format, ...)