From da090505a3ebd59c86285ce5c796c2570be76092 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Mon, 3 Oct 2016 01:41:48 +0200
Subject: [PATCH] Cleaning
---
openfpm_data | 2 +-
openfpm_devices | 2 +-
src/Vector/vector_dist.hpp | 1 -
src/Vector/vector_dist_comm.hpp | 27 ---------------------------
4 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/openfpm_data b/openfpm_data
index a7cce1930..21a5f6ee7 160000
--- a/openfpm_data
+++ b/openfpm_data
@@ -1 +1 @@
-Subproject commit a7cce19305d224ab9195683295a42a509fac0787
+Subproject commit 21a5f6ee7bf426ad13106a26f581b788b8c7c95d
diff --git a/openfpm_devices b/openfpm_devices
index f46e31235..0973c0934 160000
--- a/openfpm_devices
+++ b/openfpm_devices
@@ -1 +1 @@
-Subproject commit f46e31235688bd15c2a808ba7aa1bd413908bb8a
+Subproject commit 0973c09344b9c814bb6efa30938e3608dd55feb3
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index 2b8bb26a3..6606fdf33 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -14,7 +14,6 @@
#include "Vector/vector_dist_iterator.hpp"
#include "Space/Shape/Box.hpp"
#include "Vector/vector_dist_key.hpp"
-#include "memory/PreAllocHeapMemory.hpp"
#include "memory/PtrMemory.hpp"
#include "NN/CellList/CellList.hpp"
#include "NN/CellList/CellListFast_hilb.hpp"
diff --git a/src/Vector/vector_dist_comm.hpp b/src/Vector/vector_dist_comm.hpp
index 94fc33068..0aae55388 100644
--- a/src/Vector/vector_dist_comm.hpp
+++ b/src/Vector/vector_dist_comm.hpp
@@ -166,33 +166,6 @@ class vector_dist_comm
return end_id;
}
- /*! \brief It store for each processor the position and properties vector of the particles
- *
- * This structure is used in the map function
- *
- */
- struct pos_prop
- {
- //! position vector
- openfpm::vector<Point<dim, St>, PreAllocHeapMemory<2>, typename memory_traits_lin<Point<dim, St>>::type, memory_traits_lin, openfpm::grow_policy_identity> pos;
- //! properties vector
- openfpm::vector<prop, PreAllocHeapMemory<2>, typename memory_traits_lin<prop>::type, memory_traits_lin, openfpm::grow_policy_identity> prp;
- };
-
- /*! \brief for each processor store 2 vector containing the sending buffers
- *
- * This structure is used in the map_list function
- *
- */
- template <typename sel_prop>
- struct pos_prop_sel
- {
- //! position vector
- openfpm::vector<Point<dim, St>, PreAllocHeapMemory<2>, typename memory_traits_lin<Point<dim, St>>::type, memory_traits_lin, openfpm::grow_policy_identity> pos;
- //! properties vector
- openfpm::vector<sel_prop, PreAllocHeapMemory<2>, typename memory_traits_lin<sel_prop>::type, memory_traits_lin, openfpm::grow_policy_identity> prp;
- };
-
//! Flags that indicate that the function createShiftBox() has been called
bool is_shift_box_created = false;
--
GitLab