Commit 4b7da208 authored by incardon's avatar incardon

Fixing ghost get

parent ee1da940
...@@ -845,16 +845,16 @@ public: ...@@ -845,16 +845,16 @@ public:
// if there are no properties skip // if there are no properties skip
// SSendRecvP send everything when we do not give properties // SSendRecvP send everything when we do not give properties
if (sizeof...(prp) != 0) if (sizeof...(prp) != 0)
{ {
if (opt & SKIP_LABELLING) if (opt & SKIP_LABELLING)
{ {
op_ssend_gg_recv_merge opm(g_m); op_ssend_gg_recv_merge opm(g_m);
v_cl.SSendRecvP_op<op_ssend_gg_recv_merge,send_vector,decltype(v_prp),prp...>(g_send_prp,v_prp,prc_g_opart,opm,prc_recv_get,recv_sz_get); v_cl.SSendRecvP_op<op_ssend_gg_recv_merge,send_vector,decltype(v_prp),prp...>(g_send_prp,v_prp,prc_g_opart,opm,prc_recv_get,recv_sz_get);
} }
else else
v_cl.SSendRecvP<send_vector,decltype(v_prp),prp...>(g_send_prp,v_prp,prc_g_opart,prc_recv_get,recv_sz_get); v_cl.SSendRecvP<send_vector,decltype(v_prp),prp...>(g_send_prp,v_prp,prc_g_opart,prc_recv_get,recv_sz_get);
} }
if (!(opt & NO_POSITION)) if (!(opt & NO_POSITION))
{ {
...@@ -863,10 +863,13 @@ public: ...@@ -863,10 +863,13 @@ public:
v_cl.SSendRecv(g_pos_send,v_pos,prc_g_opart,prc_recv_get,recv_sz_get); v_cl.SSendRecv(g_pos_send,v_pos,prc_g_opart,prc_recv_get,recv_sz_get);
} }
// Important to ensure that the number of particles in v_prp must be equal to v_pos // Important to ensure that the number of particles in v_prp must be equal to v_pos
// Note that if we do not give properties sizeof...(prp) == 0 in general at this point // Note that if we do not give properties sizeof...(prp) == 0 in general at this point
// v_prp.size() != v_pos.size() // v_prp.size() != v_pos.size()
v_prp.resize(v_pos.size()); if (!(opt & SKIP_LABELLING))
{
v_prp.resize(v_pos.size());
}
add_loc_particles_bc(v_pos,v_prp,g_m,opt); add_loc_particles_bc(v_pos,v_prp,g_m,opt);
} }
......
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