diff --git a/example/Vector/7_SPH_dlb_opt/main_dbg.cpp b/example/Vector/7_SPH_dlb_opt/main_dbg.cpp index 74bf16d44573f744e9fb204a34bb340577cf38dd..1b34eb6d86a91186e7df2a322d397a0cd2976a44 100644 --- a/example/Vector/7_SPH_dlb_opt/main_dbg.cpp +++ b/example/Vector/7_SPH_dlb_opt/main_dbg.cpp @@ -684,26 +684,6 @@ template<typename VerletList> inline double calc_forces(particles & vd, VerletLi } } -// double sum1 = 0.0; -// double sum2 = 0.0; - -/* for (size_t i = 0 ; i < vd.getProp<8>(a).size() ; i++) - { - if (vd.getProp<8>(a).get(i).id != vd.getProp<9>(a).get(i).id) - { - std::cout << "CAZZO " << std::endl; - } - - - sum1 += vd.getProp<8>(a).get(i).fact; - sum2 += vd.getProp<9>(a).get(i).fact; - }*/ - -/* if (sum1 != sum2) - { - break; - }*/ - ++part3; } } diff --git a/openfpm_devices b/openfpm_devices index dbf554846c2917349da0f8fc524444767e998d93..162b8cabf2c0e91a7cb9a4d19e9d6784b26c4661 160000 --- a/openfpm_devices +++ b/openfpm_devices @@ -1 +1 @@ -Subproject commit dbf554846c2917349da0f8fc524444767e998d93 +Subproject commit 162b8cabf2c0e91a7cb9a4d19e9d6784b26c4661 diff --git a/src/Vector/vector_dist_kernel.hpp b/src/Vector/vector_dist_kernel.hpp index 9e49687b9a7ce2a5d426ca33de0bc5aabe61b244..36546d7727fd75dd40490dbd0ca2d5d7c48d46cc 100644 --- a/src/Vector/vector_dist_kernel.hpp +++ b/src/Vector/vector_dist_kernel.hpp @@ -85,6 +85,9 @@ public: //! Indicate this structure has a function to check the device pointer typedef int yes_has_check_device_pointer; + //! aggregate stored by the vector + typedef prop value_type; + vector_dist_ker() :g_m(0) {} diff --git a/src/Vector/vector_dist_key.hpp b/src/Vector/vector_dist_key.hpp index 1717ae6147933eb3817e45689ec7e6453a08a592..6c3961d1625f22a10e63c7dd4436b931443b026a 100644 --- a/src/Vector/vector_dist_key.hpp +++ b/src/Vector/vector_dist_key.hpp @@ -58,19 +58,12 @@ public: return ts.str(); } - //! constructor from a key -/* inline vect_dist_key_dx(size_t key) - :key(key) - { - }*/ - //! Default constructor __device__ __host__ inline vect_dist_key_dx() { /* coverity[uninit_member] */ } - //! Default constructor __device__ __host__ inline vect_dist_key_dx(size_t key) :key(key) {