From 0d928864361de88c54380e052e7ee03077bc79d2 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <i-bird@private-incardon-3.mpi-cbg.de>
Date: Fri, 11 Mar 2016 16:52:15 +0100
Subject: [PATCH] Fixing Cell list interface change
---
openfpm_devices | 2 +-
openfpm_io | 2 +-
openfpm_vcluster | 2 +-
src/Decomposition/CartDecomposition.hpp | 9 +--------
src/Decomposition/Distribution/MetisDistribution.hpp | 4 ++--
src/Decomposition/ie_ghost.hpp | 4 ++--
src/Vector/vector_dist.hpp | 11 +++++------
7 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/openfpm_devices b/openfpm_devices
index e79687e8..669b6006 160000
--- a/openfpm_devices
+++ b/openfpm_devices
@@ -1 +1 @@
-Subproject commit e79687e8594b0761330a34a0f3eecf514f9f9290
+Subproject commit 669b60068daa79b454b32b3db50158cff1b49bc4
diff --git a/openfpm_io b/openfpm_io
index 59f5019f..51f98fac 160000
--- a/openfpm_io
+++ b/openfpm_io
@@ -1 +1 @@
-Subproject commit 59f5019f8f3acc6401af7422f19d61dd225e1a21
+Subproject commit 51f98fac4345b24c96b13feb6aa30f9a34ac99c7
diff --git a/openfpm_vcluster b/openfpm_vcluster
index 104ee3d6..b9c14fad 160000
--- a/openfpm_vcluster
+++ b/openfpm_vcluster
@@ -1 +1 @@
-Subproject commit 104ee3d6f6992d8fad992f3405b5b2514a1cd25c
+Subproject commit b9c14fadf0d9f5c5f53b4a9e57f29499f50652d9
diff --git a/src/Decomposition/CartDecomposition.hpp b/src/Decomposition/CartDecomposition.hpp
index 81ae2848..19b4e6ba 100755
--- a/src/Decomposition/CartDecomposition.hpp
+++ b/src/Decomposition/CartDecomposition.hpp
@@ -314,15 +314,8 @@ public:
for (size_t i = 0; i < dim; i++)
div[i] = (size_t) ((bound.getHigh(i) - bound.getLow(i)) / unit.getHigh(i));
- // Create shift
- Point<dim, T> orig;
-
- // p1 point of the Processor bound box is the shift
- for (size_t i = 0; i < dim; i++)
- orig.get(i) = bound.getLow(i);
-
// Initialize the geo_cell structure
- ie_ghost<dim,T>::Initialize_geo_cell(bound,div,orig);
+ ie_ghost<dim,T>::Initialize_geo_cell(bound,div);
// Initialize shift vectors
ie_ghost<dim,T>::generateShiftVectors(domain);
diff --git a/src/Decomposition/Distribution/MetisDistribution.hpp b/src/Decomposition/Distribution/MetisDistribution.hpp
index 0c470d55..4e6d3de0 100644
--- a/src/Decomposition/Distribution/MetisDistribution.hpp
+++ b/src/Decomposition/Distribution/MetisDistribution.hpp
@@ -446,7 +446,7 @@ public:
MetisDistribution & operator=(const MetisDistribution & mt)
{
#ifdef SE_CLASS2
- check_valid(mt);
+ check_valid(&mt,8);
check_valid(this,8);
#endif
this->v_cl = mt.v_cl;
@@ -483,7 +483,7 @@ public:
inline bool operator==(const MetisDistribution & mt)
{
#ifdef SE_CLASS2
- check_valid(mt);
+ check_valid(&mt,8);
check_valid(this,8);
#endif
bool ret = true;
diff --git a/src/Decomposition/ie_ghost.hpp b/src/Decomposition/ie_ghost.hpp
index b7d5ffc6..bd329548 100755
--- a/src/Decomposition/ie_ghost.hpp
+++ b/src/Decomposition/ie_ghost.hpp
@@ -176,10 +176,10 @@ protected:
* internal ghost
*
*/
- void Initialize_geo_cell(const Box<dim,T> & domain, const size_t (&div)[dim] ,const Point<dim,T> & orig)
+ void Initialize_geo_cell(const Box<dim,T> & domain, const size_t (&div)[dim])
{
// Initialize the geo_cell structure
- geo_cell.Initialize(domain,div,orig);
+ geo_cell.Initialize(domain,div);
}
/*! \brief Create the box_nn_processor_int (bx part) structure
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index 2f4cfbab..6a42a87f 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -1035,7 +1035,7 @@ public:
// extend by the ghost
pbox.enlarge(enlarge);
- Box<dim, St> cell_box;
+// Box<dim, St> cell_box;
size_t div[dim];
@@ -1044,12 +1044,9 @@ public:
{
div[i] = static_cast<size_t>((pbox.getP2().get(i) - pbox.getP1().get(i)) / r_cut);
div[i]++;
-
- cell_box.setLow(i, 0.0);
- cell_box.setHigh(i, div[i] * r_cut);
}
- cell_list.Initialize(cell_box, div, pbox.getP1());
+ cell_list.Initialize(pbox, div);
// for each particle add the particle to the cell list
@@ -1238,6 +1235,8 @@ public:
{
v_pos.remove(keys, start);
v_prp.remove(keys, start);
+
+ g_m -= keys.size();
}
inline void addComputationCosts()
@@ -1246,7 +1245,7 @@ public:
cdsm.setDimensions(dec.getDomain(), dec.getGrid().getSize(), 0);
- auto it = getIterator();
+ auto it = getDomainIterator();
for (size_t i = 0; i < dec.getNSubSubDomains(); i++)
{
--
GitLab