Commit 0d928864 authored by Pietro Incardona's avatar Pietro Incardona

Fixing Cell list interface change

parent 4f96f06c
openfpm_devices @ 669b6006
Subproject commit e79687e8594b0761330a34a0f3eecf514f9f9290
Subproject commit 669b60068daa79b454b32b3db50158cff1b49bc4
openfpm_io @ 51f98fac
Subproject commit 59f5019f8f3acc6401af7422f19d61dd225e1a21
Subproject commit 51f98fac4345b24c96b13feb6aa30f9a34ac99c7
openfpm_vcluster @ b9c14fad
Subproject commit 104ee3d6f6992d8fad992f3405b5b2514a1cd25c
Subproject commit b9c14fadf0d9f5c5f53b4a9e57f29499f50652d9
......@@ -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);
......
......@@ -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;
......
......@@ -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
......
......@@ -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++)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment