From bf1a5025601363ed3e7ec2593f0cd50b2ae14735 Mon Sep 17 00:00:00 2001 From: Serhii Yaskovets <yaskovet@mpi-cbg.de> Date: Mon, 26 Jun 2023 18:33:07 +0200 Subject: [PATCH] Get rid of redundant DCPSE_Solver.cuh; Move to DCPSE_Solver.hpp for GPU [openfpm_numerics] --- openfpm_numerics | 2 +- src/Vector/vector_dist.hpp | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/openfpm_numerics b/openfpm_numerics index 25f4c7709..27f84e912 160000 --- a/openfpm_numerics +++ b/openfpm_numerics @@ -1 +1 @@ -Subproject commit 25f4c77091709c2fac16c02788fe88ec5e392631 +Subproject commit 27f84e9125b147dd5552595c47b228ca4251a34c diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp index 41b58d379..2026f0ed2 100644 --- a/src/Vector/vector_dist.hpp +++ b/src/Vector/vector_dist.hpp @@ -276,6 +276,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 @@ -421,22 +428,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; @@ -444,7 +439,6 @@ public: typedef std::integral_constant<bool,false> is_it_a_subset; - /*! \brief Operator= for distributed vector * * \param v vector to copy -- GitLab