From c66a0b34bcec794fb12ef331e25e753f99f3da77 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Fri, 17 Mar 2017 15:04:26 +0100
Subject: [PATCH] Symmetric fixed
---
openfpm_data | 2 +-
src/Decomposition/Domain_NN_calculator_cart.hpp | 8 +++-----
src/Grid/staggered_grid_dist_unit_test.hpp | 2 --
src/Vector/vector_dist.hpp | 12 ------------
src/Vector/vector_dist_NN_tests.hpp | 2 +-
src/Vector/vector_dist_cell_list_tests.hpp | 2 +-
6 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/openfpm_data b/openfpm_data
index 121d1dfc2..1a3871745 160000
--- a/openfpm_data
+++ b/openfpm_data
@@ -1 +1 @@
-Subproject commit 121d1dfc207414283bc16ab35a278b91422720be
+Subproject commit 1a387174540b03143ab5d3a2dc889875c9f10e03
diff --git a/src/Decomposition/Domain_NN_calculator_cart.hpp b/src/Decomposition/Domain_NN_calculator_cart.hpp
index e32d2215c..a17f34689 100644
--- a/src/Decomposition/Domain_NN_calculator_cart.hpp
+++ b/src/Decomposition/Domain_NN_calculator_cart.hpp
@@ -198,7 +198,7 @@ class domain_nn_calculator_cart
/*! \brief Linearize the sub-sub-domains
*
- * \param anon set of grid keys to linearize
+ * \param anom set of grid keys to linearize
* \param anom_lin linearized output
* \param shift shifting
*
@@ -256,8 +256,9 @@ public:
/*! \brief Set parameters to calculate the cell neighborhood
*
- * \param shift to apply in the linearization
* \param loc_box set of local sub-domains
+ * \param shift to apply in the linearization
+ * \param gs grid of cells (for the processor domain)
*
*/
void setNNParameters(openfpm::vector<::Box<dim, size_t>> & loc_box,
@@ -284,7 +285,6 @@ public:
/*! \brief Get the domain Cells
*
- * \param loc_box set of local sub-domains
*
* \return The set of domain cells
*
@@ -296,7 +296,6 @@ public:
/*! \brief Get the domain Cells
*
- * \param loc_box set of local sub-domains
*
* \return The set of domain cells
*
@@ -308,7 +307,6 @@ public:
/*! \brief Get the domain anomalous cells
*
- * \param loc_box set of local sub-domains
*
* \return The set of anomalous cells
*
diff --git a/src/Grid/staggered_grid_dist_unit_test.hpp b/src/Grid/staggered_grid_dist_unit_test.hpp
index bbda59d82..d160567f3 100644
--- a/src/Grid/staggered_grid_dist_unit_test.hpp
+++ b/src/Grid/staggered_grid_dist_unit_test.hpp
@@ -16,8 +16,6 @@ BOOST_AUTO_TEST_SUITE( staggered_grid_dist_id_test )
BOOST_AUTO_TEST_CASE( staggered_grid_dist_unit_test)
{
- typedef Point2D_test<float> p;
-
// Domain
Box<2,float> domain({0.0,0.0},{1.0,1.0});
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index d3ec1dc18..990af51fc 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -731,18 +731,6 @@ public:
return cell_list;
}
- /*! \brief return the neighborhood cells of a cells to do symmetric interactions
- *
- * \warning Used in in combination of getNNIteratorSym in a Cell-list
- *
- * \return the neighborhood cells of a cell
- *
- *
- */
-/* const openfpm::vector<subsub_lin<dim>> & getNNCells(size_t cell) const
- {
- return getDecomposition().getDomainCellNNSym();
- }*/
/*! \brief Construct a cell list symmetric based on a cut of radius
*
diff --git a/src/Vector/vector_dist_NN_tests.hpp b/src/Vector/vector_dist_NN_tests.hpp
index 06c0c3954..0a60300f7 100644
--- a/src/Vector/vector_dist_NN_tests.hpp
+++ b/src/Vector/vector_dist_NN_tests.hpp
@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_particle_iteration )
// Boundary conditions
size_t bc[3]={PERIODIC,PERIODIC,PERIODIC};
- float r_cut = 0.01;
+ float r_cut = 0.1;
// ghost
Ghost<3,float> ghost(r_cut);
diff --git a/src/Vector/vector_dist_cell_list_tests.hpp b/src/Vector/vector_dist_cell_list_tests.hpp
index b7a517f93..3c4167c7f 100644
--- a/src/Vector/vector_dist_cell_list_tests.hpp
+++ b/src/Vector/vector_dist_cell_list_tests.hpp
@@ -812,7 +812,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_symmetric_verlet_list )
typedef aggregate<size_t,size_t,size_t,openfpm::vector<point_and_gid>,openfpm::vector<point_and_gid>> part_prop;
// Distributed vector
- vector_dist<3,float, part_prop > vd(k,box,bc,ghost);
+ vector_dist<3,float, part_prop > vd(k,box,bc,ghost,BIND_DEC_TO_GHOST);
size_t start = vd.init_size_accum(k);
auto it = vd.getIterator();
--
GitLab