From 844f8a32814f4abdcce49bc3c286be13772671b1 Mon Sep 17 00:00:00 2001
From: Yaroslav <beorn.90@gmail.com>
Date: Wed, 5 Oct 2016 15:40:50 +0200
Subject: [PATCH] CellList_hilb reworked
---
openfpm_devices | 2 +-
openfpm_io | 2 +-
openfpm_numerics | 2 +-
openfpm_vcluster | 2 +-
src/Vector/vector_dist.hpp | 5 +++--
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/openfpm_devices b/openfpm_devices
index ddece6ce2..aef59d58f 160000
--- a/openfpm_devices
+++ b/openfpm_devices
@@ -1 +1 @@
-Subproject commit ddece6ce2584fcc3fe0883cfbe89a28fd21fcecb
+Subproject commit aef59d58fe1e8958dd09da9672fa673063ab970e
diff --git a/openfpm_io b/openfpm_io
index 62b831640..ca2becb04 160000
--- a/openfpm_io
+++ b/openfpm_io
@@ -1 +1 @@
-Subproject commit 62b8316404bf98c5cc5ad299563425656cfd3003
+Subproject commit ca2becb045ef96fcf6287f8ef5da2314248bcb66
diff --git a/openfpm_numerics b/openfpm_numerics
index a384941b4..4059a8314 160000
--- a/openfpm_numerics
+++ b/openfpm_numerics
@@ -1 +1 @@
-Subproject commit a384941b412db3d3aa280caae3cb3eaa874a86c2
+Subproject commit 4059a8314fe1974c4713f514567124ac4f640d9b
diff --git a/openfpm_vcluster b/openfpm_vcluster
index b84c798cc..09a83aea1 160000
--- a/openfpm_vcluster
+++ b/openfpm_vcluster
@@ -1 +1 @@
-Subproject commit b84c798cc25b8dbcc02c7642948aca3eacba9a4c
+Subproject commit 09a83aea1eb6af23477060fde84798d131ee2a69
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index ef47a83d3..480b8cabb 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -31,6 +31,7 @@
#include "data_type/aggregate.hpp"
#include "NN/VerletList/VerletList.hpp"
#include "vector_dist_comm.hpp"
+#include "NN/CellList/CellListFast_hilb.hpp"
#define NO_ID false
#define ID true
@@ -374,7 +375,7 @@ public:
* \return the Cell list
*
*/
- template<typename CellL = CellList_hilb<dim, St, FAST, shift<dim, St> > > CellL getCellList_hilb(St r_cut)
+ template<typename CellL = CellList_hilb<dim, St, Process_keys_hilb<dim>, FAST, shift<dim, St> > > CellL getCellList_hilb(St r_cut)
{
// Get ghost and anlarge by 1%
Ghost<dim,St> g = getDecomposition().getGhost();
@@ -461,7 +462,7 @@ public:
* \return The Cell-list
*
*/
- template<typename CellL = CellList_hilb<dim, St, FAST, shift<dim, St> > > CellL getCellList_hilb(St r_cut, const Ghost<dim, St> & enlarge)
+ template<typename CellL = CellList_hilb<dim, St, Process_keys_hilb<dim>, FAST, shift<dim, St> > > CellL getCellList_hilb(St r_cut, const Ghost<dim, St> & enlarge)
{
CellL cell_list;
--
GitLab