Commit 885878c8 authored by incardon's avatar incardon
Browse files

Latest changes for MP iterator

parent 8ba96371
......@@ -503,6 +503,8 @@ protected:
//! cell_shift
Point<dim,long int> cell_shift;
// temporal buffer
mutable size_t div_wp[dim];
/*! \brief Initialize all the structures
*
......@@ -1590,7 +1592,7 @@ Box "b" <-----------------+ | | | | | | Grid (7, 6)
return be;
}
/*! \brief Return the number of divisions of the Cell Decomposer
/*! \brief Return the number of divisions of the Cell Decomposer (including padding)
*
* \return the number of divisions
*
......@@ -1600,6 +1602,20 @@ Box "b" <-----------------+ | | | | | | Grid (7, 6)
return gr_cell.getSize();
}
/*! \brief Return the number of divisions of the Cell Decomposer (without padding)
*
* \return the number of divisions
*
*/
const size_t (& getDivWP() const)[dim]
{
for (size_t i = 0 ; i < dim ; i++)
{div_wp[i] = gr_cell.getSize()[i] - 2*getPadding(i);}
return div_wp;
}
/*! \brief Return the domain where the CellDecomposer is defined
*
* \return The domain of the remote machine
......
......@@ -979,6 +979,16 @@ public:
return CellDecomposer_sm<dim,T,transform>::getPadding(i);
}
/*! \brief Return the number of padding cells of the Cell decomposer as an array
*
*
* \return the number of padding cells
*
*/
size_t (& getPadding())[dim]
{
return CellDecomposer_sm<dim,T,transform>::getPadding();
}
/*! \brief Clear the cell list
*
......@@ -1109,7 +1119,12 @@ template<unsigned int dim, typename St> static inline void cl_param_calculate(Bo
*
* \return the processor bounding box
*/
template<unsigned int dim, typename St> static inline void cl_param_calculateSym(const Box<dim,St> & dom, CellDecomposer_sm<dim,St,shift<dim,St>> & cd_sm, Ghost<dim,St> g, St r_cut, size_t & pad)
template<unsigned int dim, typename St> static
inline void cl_param_calculateSym(const Box<dim,St> & dom,
CellDecomposer_sm<dim,St,shift<dim,St>> & cd_sm,
Ghost<dim,St> g,
St r_cut,
size_t & pad)
{
size_t div[dim];
......@@ -1141,7 +1156,11 @@ template<unsigned int dim, typename St> static inline void cl_param_calculateSym
*
* \return the processor bounding box
*/
template<unsigned int dim, typename St> static inline void cl_param_calculateSym(const Box<dim,St> & dom, CellDecomposer_sm<dim,St,shift<dim,St>> & cd_sm, Ghost<dim,St> g, size_t & pad)
template<unsigned int dim, typename St>
static inline void cl_param_calculateSym(const Box<dim,St> & dom,
CellDecomposer_sm<dim,St,shift<dim,St>> & cd_sm,
Ghost<dim,St> g,
size_t & pad)
{
size_t div[dim];
......
......@@ -17,9 +17,9 @@ typedef size_t local_index_;
typedef unsigned int local_index_;
#endif
#define VERLETLIST_FAST() VerletList<dim,St,Mem_fast<>,shift<dim,St> >
#define VERLETLIST_BAL VerletList<dim,St,Mem_bal,shift<dim,St> >
#define VERLETLIST_MEM VerletList<dim,St,Mem_mem<>,shift<dim,St> >
#define VERLETLIST_FAST(dim,St) VerletList<dim,St,Mem_fast<>,shift<dim,St> >
#define VERLETLIST_BAL(dim,St) VerletList<dim,St,Mem_bal<>,shift<dim,St> >
#define VERLETLIST_MEM(dim,St) VerletList<dim,St,Mem_mem<>,shift<dim,St> >
/*! \brief Cell list structure
*
......
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