diff --git a/openfpm_numerics b/openfpm_numerics index 37a39c223136e1d8b2e8a943380e025507bcdd35..37bff8d64c1dd44ce64802b6c108adcec9e29ad4 160000 --- a/openfpm_numerics +++ b/openfpm_numerics @@ -1 +1 @@ -Subproject commit 37a39c223136e1d8b2e8a943380e025507bcdd35 +Subproject commit 37bff8d64c1dd44ce64802b6c108adcec9e29ad4 diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp index 162b1bccbd181199886fb614ab7d481a8918c560..94dc25a7ea6e2921fb5e2ba5c25225d3dc91e016 100644 --- a/src/Vector/vector_dist.hpp +++ b/src/Vector/vector_dist.hpp @@ -307,6 +307,13 @@ public: //! Self type typedef vector_dist<dim,St,prop,Decomposition,Memory,layout_base> self; + //! template parameters typedefs + static const unsigned int dims = dim; + typedef St stype; + typedef prop value_type; + typedef Decomposition Decomposition_type; + typedef Memory Memory_type; + private: //! Ghost marker, all the particle with id > g_m are ghost all with g_m < are real particle @@ -452,22 +459,10 @@ private: } public: - - //! property object - typedef prop value_type; - - typedef Decomposition Decomposition_type; - typedef decltype(v_pos) internal_position_vector_type; typedef CellList<dim, St, Mem_fast<>, shift<dim, St>, internal_position_vector_type > CellList_type; - //! space type - typedef St stype; - - //! dimensions of space - static const unsigned int dims = dim; - //! yes I am vector dist typedef int yes_i_am_vector_dist; @@ -475,7 +470,6 @@ public: typedef std::integral_constant<bool,false> is_it_a_subset; - /*! \brief Operator= for distributed vector * * \param v vector to copy