Changeset ac6d04 for src/base/linked_cell_list.hpp

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.hpp (modified) (1 diff)

src/base/linked_cell_list.hpp

@@ -24 +24 @@
 {
 
-class LinkedCellList : public IsGrid< std::list<Particle> >
+class LinkedCellList : public IsGrid< std::list<Particle*> >
 {
 public:
-  typedef std::list<Particle>::iterator iterator;
-  typedef std::list<Particle>::const_iterator const_iterator;
-  typedef std::list<Particle>::reverse_iterator reverse_iterator;
-  typedef std::list<Particle>::const_reverse_iterator const_reverse_iterator;
+  typedef std::list<Particle*>::iterator iterator;
+  typedef std::list<Particle*>::const_iterator const_iterator;
+  typedef std::list<Particle*>::reverse_iterator reverse_iterator;
+  typedef std::list<Particle*>::const_reverse_iterator const_reverse_iterator;
 
-  LinkedCellList(const std::list<Particle>& particles,
+  LinkedCellList(std::list<Particle>& particles,
                  const int& near_field_cells, const Grid& grid);
 
-  void AddParticle(const Particle& particle);
+  ~LinkedCellList();
 
-  void AddParticleToComplete(const vmg_float* pos, const vmg_float& charge,
-                             const vmg_float& pot, const vmg_float* force,
-                             const int& rank, const int& index);
+  void AddParticle(Particle* particle);
+  void AddParticleToHalo(const vmg_float* x, const vmg_float& q);
 
-  void AddParticleToComplete(const Vector& pos, const vmg_float& charge,
-                             const vmg_float& pot, const Vector& force,
-                             const int& rank, const int& index);
-
-  void AddParticleToComplete(const vmg_float* pos, const vmg_float& charge);
-
-  std::list<Particle>& NotMyParticles() {return not_my_particles;}
-  const std::list<Particle>& NotMyParticles() const {return not_my_particles;}
+  void ClearHalo();
 
   const Index& NearFieldCells() const {return near_field_cells_;}
-
 private:
-  std::list<Particle> not_my_particles;
   Index near_field_cells_;
 };