Changeset 01be70 for src

Timestamp:

Feb 1, 2012, 11:08:03 AM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

894a5f

Parents:

64ba929

Message:

Merge remote branch 'heber/Bugfixes_Tremolo_implementation'

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

Location:

src

Files:

• base/factory.hpp (modified) (2 diffs)
• base/object.cpp (modified) (1 diff)
• comm/comm_mpi.cpp (modified) (1 diff)
• interface/interface_particles.cpp (modified) (1 diff)

src/base/factory.hpp

@@ -20 +20 @@
 {
 
+class MG;
+
 class Factory
 {
 public:
-  Factory();
   virtual ~Factory();
 
@@ -39 +40 @@
 
 private:
+  friend class MG;
+
+  Factory();
   std::map<std::string, Object*> object_map;
 };

src/base/object.cpp

@@ -22 +22 @@
     name = name_;
     MG::GetFactory().Register(this);
+    registered = true;
   }else
     assert(0 == "This object has already been registered.");

src/comm/comm_mpi.cpp

@@ -684 +684 @@
   std::vector<vmg_int> buffer_ind;
 
-  std::memcpy(&global_extent[6*rank], grid.Global().BeginLocal().vec(), 3*sizeof(vmg_float));
-  std::memcpy(&global_extent[6*rank+3], grid.Global().EndLocal().vec(), 3*sizeof(vmg_float));
+  std::memcpy(&global_extent[6*rank], grid.Global().BeginLocal().vec(), 3*sizeof(int));
+  std::memcpy(&global_extent[6*rank+3], grid.Global().EndLocal().vec(), 3*sizeof(int));
 
   MPI_Allgather(MPI_IN_PLACE, 6, MPI_INT, global_extent, 6, MPI_INT, MPI_COMM_WORLD);

src/interface/interface_particles.cpp

@@ -143 +143 @@
   const int& near_field_cells = factory.GetObjectStorageVal<int>("PARTICLE_NEAR_FIELD_CELLS");
   vmg_float* p = factory.GetObjectStorageArray<vmg_float>("PARTICLE_POTENTIAL_ARRAY");
+  vmg_float* f = factory.GetObjectStorageArray<vmg_float>("PARTICLE_FORCE_ARRAY");
 
   const vmg_float r_cut = (near_field_cells+0.5) * grid.Extent().MeshWidth().Max();
 
   /*
-   * Initialze potential
-   */
-  for (vmg_int i=0; i<num_particles_local; ++i)
+   * Initialize potential
+   */
+  for (vmg_int i=0; i<num_particles_local; ++i) {
     p[i] = 0.0;
+    for (vmg_int j=0;j<3;++j)
+      f[3*i+j] = 0.;
+  }
 
   /*