Commit 26461cc0 authored by incardon's avatar incardon

Merge branch 'master' of git.mpi-cbg.de:openfpm/openfpm_data

parents f27fe8c1 b2db24e3
......@@ -134,8 +134,6 @@ public:
}
/*! \brief create a grid of size sz on each direction
*
* \tparam S memory type for allocation
*
* \param sz size if the grid on each directions
*
......@@ -145,7 +143,11 @@ public:
{
}
//! Constructor allocate memory and give them a representation
/*! \brief Constructor allocate memory
*
* \param sz size of the grid in each dimension
*
*/
inline grid_cpu(const size_t (& sz)[dim]) THROW
:grid_base_impl<dim,T,S,layout,memory_traits_lin>(sz)
{
......
......@@ -641,7 +641,7 @@ class CellDecomposer_sm
ACTION_ON_ERROR(CELL_DECOMPOSER);
}
if (pos[0] < box.getLow(s) - off[s]*box_unit.getP2()[s] || pos[s] > box.getHigh(s) + off[s]*box_unit.getP2()[s])
if (pos[s] < box.getLow(s) - off[s]*box_unit.getP2()[s] || pos[s] > box.getHigh(s) + off[s]*box_unit.getP2()[s])
{
std::cerr << "Error: " << __FILE__ << ":" << __LINE__ << " point " << Point<dim,T>(pos).toString() << " is not inside the cell space";
ACTION_ON_ERROR(CELL_DECOMPOSER);
......
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