Commit edc99c58 authored by Pietro Incardona's avatar Pietro Incardona

Small fixes + update new modules

parent eebfa923
openfpm_numerics @ 834b07c4
Subproject commit aaa2cab12452445faa160d2b2a2ccdee85a93011 Subproject commit 834b07c439b8cb308f535fcf43bddf9cc9ac7823
...@@ -812,16 +812,15 @@ public: ...@@ -812,16 +812,15 @@ public:
domain = cart.domain; domain = cart.domain;
std::copy(cart.spacing,cart.spacing+3,spacing); std::copy(cart.spacing,cart.spacing+3,spacing);
//! Runtime virtual cluster
v_cl = cart.v_cl;
ghost = cart.ghost; ghost = cart.ghost;
cart.bbox = bbox; bbox = cart.bbox;
cart.ss_box = ss_box; ss_box = cart.ss_box;
for (size_t i = 0 ; i < dim ; i++) for (size_t i = 0 ; i < dim ; i++)
cart.bc[i] = bc[i]; bc[i] = cart.bc[i];
return *this;
return *this; return *this;
} }
......
...@@ -663,7 +663,7 @@ public: ...@@ -663,7 +663,7 @@ public:
* *
*/ */
grid_dist_id(const Decomposition & dec, const size_t (& g_sz)[dim],const Box<dim,St> & domain, const Ghost<dim,long int> & g) grid_dist_id(const Decomposition & dec, const size_t (& g_sz)[dim],const Box<dim,St> & domain, const Ghost<dim,long int> & g)
:domain(domain),dec(dec),v_cl(*global_v_cluster),ginfo(g_sz),ginfo_v(g_sz) :domain(domain),dec(*global_v_cluster),v_cl(*global_v_cluster),ginfo(g_sz),ginfo_v(g_sz)
{ {
#ifdef SE_CLASS2 #ifdef SE_CLASS2
check_new(this,8,GRID_DIST_EVENT,4); check_new(this,8,GRID_DIST_EVENT,4);
...@@ -672,6 +672,7 @@ public: ...@@ -672,6 +672,7 @@ public:
InitializeCellDecomposer(g_sz); InitializeCellDecomposer(g_sz);
ghost = convert_ghost(g,cd_sm); ghost = convert_ghost(g,cd_sm);
this->dec = dec.duplicate(ghost);
// Initialize structures // Initialize structures
InitializeStructures(g_sz); InitializeStructures(g_sz);
......
...@@ -129,7 +129,7 @@ class grid_dist_iterator_sub ...@@ -129,7 +129,7 @@ class grid_dist_iterator_sub
* *
*/ */
grid_dist_iterator_sub(const grid_dist_iterator_sub<dim,device_grid> & tmp) grid_dist_iterator_sub(const grid_dist_iterator_sub<dim,device_grid> & tmp)
:g_c(tmp.g_c),gList(tmp.gList),gdb_ext(gdb_ext),start(tmp.start),stop(tmp.stop) :g_c(tmp.g_c),gList(tmp.gList),gdb_ext(tmp.gdb_ext),start(tmp.start),stop(tmp.stop)
{ {
// get the next grid iterator // get the next grid iterator
if (g_c < gList.size()) if (g_c < gList.size())
......
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