Commit 121d28a9 authored by incardon's avatar incardon

Latest changes in progress

parent 9ea8975f
# Change Log # Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [0.5.1] - Mid september ## [0.5.1] - 27 September 2016
### Added ### Added
- ghost_put support for particles - ghost_put support for particles
......
...@@ -363,13 +363,13 @@ public: ...@@ -363,13 +363,13 @@ public:
size_t div[dim]; size_t div[dim];
// Calculate the Cell list division for this CellList // Calculate the Cell list division for this CellList
CellDecomposer<dim,St,shift<dim,St>> cd_sm; CellDecomposer_sm<dim,St,shift<dim,St>> cd_sm;
for (size_t i = 0 ; i < dim ; i++) for (size_t i = 0 ; i < dim ; i++)
div[i] = (domain.getHigh(i) - domain.getLow(i)) / r_cut; div[i] = (getDecomposition().getDomain().getHigh(i) - getDecomposition().getDomain().getLow(i)) / r_cut;
size_t pad = 0; size_t pad = 0;
Ghost g = getDecomposition().getGhost(); Ghost<dim,St> g = getDecomposition().getGhost();
g.magnify(1.013); g.magnify(1.013);
// Calculate the maximum padding // Calculate the maximum padding
...@@ -379,14 +379,16 @@ public: ...@@ -379,14 +379,16 @@ public:
pad = (pad > tmp)?pad:tmp; pad = (pad > tmp)?pad:tmp;
} }
cd_sm.Initialize(domain,div,pad); cd_sm.setDimensions(getDecomposition().getDomain(),div,pad);
// get the processor bounding box // get the processor bounding box
Box<dim, St> pbox = getDecomposition().getProcessorBounds(); Box<dim, St> pbox = getDecomposition().getProcessorBounds();
cell_list.Initialize(cd_sm, pbox); cell_list.setDimensions(cd_sm, pbox);
updateCellList(cell_list); updateCellList(cell_list);
return cell_list;
} }
/*! \brief Construct a cell list starting from the stored particles /*! \brief Construct a cell list starting from the stored particles
......
...@@ -846,7 +846,8 @@ public: ...@@ -846,7 +846,8 @@ public:
typedef openfpm::vector<prp_object> send_vector; typedef openfpm::vector<prp_object> send_vector;
// reset the ghost part // reset the ghost part
v_pos.resize(g_m); if (opt != NO_POSITION)
v_pos.resize(g_m);
v_prp.resize(g_m); v_prp.resize(g_m);
// Label all the particles // Label all the particles
......
...@@ -1948,7 +1948,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_symmetric_cell_list ) ...@@ -1948,7 +1948,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_symmetric_cell_list )
++p_it; ++p_it;
} }
vd.ghost_put<add,1>(); vd.ghost_put<add_,1>();
} }
#include "vector_dist_cell_list_tests.hpp" #include "vector_dist_cell_list_tests.hpp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment