Commit 701cf33e authored by Quentin Khan's avatar Quentin Khan

Clean the local_exp_t/symb_data_t mess up

All the local_exp_t and symb_data_t occurences have beeb replaced by
local_expansion_t and symbolic_data_t.
parent 95392698
......@@ -31,9 +31,9 @@ public:
using node_t = typename tree_t::node_t;
private:
using symb_data_t = typename tree_t::node_t::symbolic_data_t;
using symbolic_data_t = typename tree_t::node_t::symbolic_data_t;
using multipole_t = typename tree_t::node_t::data_t::multipole_t;
using local_exp_t = typename tree_t::node_t::data_t::local_expansion_t;
using local_expansion_t = typename tree_t::node_t::data_t::local_expansion_t;
using container_t = typename tree_t::node_t::particle_container_t;
tree_t& _tree;
......@@ -389,8 +389,8 @@ private:
multipole_t* leaf_multipole =
(multipole_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
symb_data_t* leaf_symb_data =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
symbolic_data_t* leaf_symb_data =
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
container_t* particle_container =
(container_t*) STARPU_VARIABLE_GET_PTR(buffers[2]);
......@@ -457,13 +457,13 @@ private:
const starpu_task* const current_task = starpu_task_get_current();
std::size_t buffer_count = current_task->nbuffers;
const symb_data_t* node_symbolic =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
const symbolic_data_t* node_symbolic =
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
multipole_t* node_multipole =
(multipole_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
multipole_t* child_multipoles[node_t::child_count] = {};
symb_data_t* child_symbolics[node_t::child_count] = {};
symbolic_data_t* child_symbolics[node_t::child_count] = {};
// Children buffer indices start at 2
for(std::size_t i = 0, j = 2, k = 3;
......@@ -471,7 +471,7 @@ private:
++i, j += 2, k += 2)
{
child_symbolics[i] =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[j]);
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[j]);
child_multipoles[i] =
(multipole_t*) STARPU_VARIABLE_GET_PTR(buffers[k]);
}
......@@ -545,14 +545,14 @@ private:
const starpu_task* const current_task = starpu_task_get_current();
std::size_t buffer_count = current_task->nbuffers;
const symb_data_t* node_symbolic =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
local_exp_t* node_local_exp =
(local_exp_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
const symbolic_data_t* node_symbolic =
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
local_expansion_t* node_local_exp =
(local_expansion_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
std::vector<const multipole_t*> multipoles;
std::vector<const symb_data_t*> symbolics;
std::vector<const symbolic_data_t*> symbolics;
std::vector<int> offset_indices;
// two buffers per V item, first is for the local exp
const std::size_t vec_init_size = (buffer_count-2) / 2;
......@@ -561,7 +561,7 @@ private:
offset_indices.reserve(vec_init_size);
for(std::size_t i = 2; i < buffer_count; i += 2) {
const symb_data_t* v_item_symb = (symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[i]);
const symbolic_data_t* v_item_symb = (symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[i]);
symbolics.emplace_back(v_item_symb);
multipoles.emplace_back((multipole_t*) STARPU_VARIABLE_GET_PTR(buffers[i+1]));
offset_indices.emplace_back(compute_box_offset_index(*node_symbolic, *v_item_symb, 3));
......@@ -619,14 +619,14 @@ private:
}
static void P2L_cpu(void** buffers, void* cl_arg) {
symb_data_t* node_symb_data =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
symbolic_data_t* node_symb_data =
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
local_exp_t* node_local_exp =
(local_exp_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
local_expansion_t* node_local_exp =
(local_expansion_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
symb_data_t* leaf_symb_data =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[2]);
symbolic_data_t* leaf_symb_data =
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[2]);
container_t* leaf_particles =
(container_t*) STARPU_VARIABLE_GET_PTR(buffers[3]);
......@@ -695,13 +695,13 @@ private:
const starpu_task* const current_task = starpu_task_get_current();
std::size_t buffer_count = current_task->nbuffers;
const symb_data_t* parent_symbolic =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
local_exp_t* parent_local_exp =
(local_exp_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
const symbolic_data_t* parent_symbolic =
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
local_expansion_t* parent_local_exp =
(local_expansion_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
const symb_data_t* child_symbolics[node_t::child_count] = {};
local_exp_t* child_local_exps[node_t::child_count] = {};
const symbolic_data_t* child_symbolics[node_t::child_count] = {};
local_expansion_t* child_local_exps[node_t::child_count] = {};
// Children buffer indices start at 2
for(std::size_t i = 0, j = 2, k = 3;
......@@ -709,9 +709,9 @@ private:
++i, j += 2, k += 2)
{
child_symbolics[i] =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[j]);
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[j]);
child_local_exps[i] =
(local_exp_t*) STARPU_VARIABLE_GET_PTR(buffers[k]);
(local_expansion_t*) STARPU_VARIABLE_GET_PTR(buffers[k]);
}
auto algo = (FAdaptiveStarPU<tree_t, kernel_t>*) cl_arg;
......@@ -759,14 +759,14 @@ private:
}
static void M2P_cpu(void** buffers, void* cl_arg) {
symb_data_t* node_symb_data =
(symb_data_t*)STARPU_VARIABLE_GET_PTR(buffers[0]);
symbolic_data_t* node_symb_data =
(symbolic_data_t*)STARPU_VARIABLE_GET_PTR(buffers[0]);
multipole_t* node_multipole =
(multipole_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
symb_data_t* leaf_symb_data =
(symb_data_t*)STARPU_VARIABLE_GET_PTR(buffers[2]);
symbolic_data_t* leaf_symb_data =
(symbolic_data_t*)STARPU_VARIABLE_GET_PTR(buffers[2]);
container_t* leaf_particles =
(container_t*) STARPU_VARIABLE_GET_PTR(buffers[3]);
......@@ -811,11 +811,11 @@ private:
}
static void L2P_cpu(void** buffers, void* cl_arg) {
local_exp_t* leaf_local_exp =
(local_exp_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
local_expansion_t* leaf_local_exp =
(local_expansion_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
symb_data_t* leaf_symb_data =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
symbolic_data_t* leaf_symb_data =
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
container_t* particle_container =
(container_t*) STARPU_VARIABLE_GET_PTR(buffers[2]);
......@@ -924,8 +924,8 @@ private:
const starpu_task* const current_task = starpu_task_get_current();
std::size_t buffer_count = current_task->nbuffers;
const symb_data_t* node_symbolic =
(symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
const symbolic_data_t* node_symbolic =
(symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[0]);
container_t* node_target_particles =
(container_t*) STARPU_VARIABLE_GET_PTR(buffers[1]);
container_t* node_source_particles =
......@@ -938,7 +938,7 @@ private:
offset_indices.reserve((buffer_count-3) / 2);
for(std::size_t i = 3; i < buffer_count; i += 2) {
const symb_data_t* u_item_symb = (symb_data_t*) STARPU_VARIABLE_GET_PTR(buffers[i]);
const symbolic_data_t* u_item_symb = (symbolic_data_t*) STARPU_VARIABLE_GET_PTR(buffers[i]);
offset_indices.emplace_back(compute_box_offset_index(*node_symbolic, *u_item_symb, 1));
u_source_particles.emplace_back((container_t*) STARPU_VARIABLE_GET_PTR(buffers[i+1]));
}
......
......@@ -80,8 +80,8 @@ template<class OctreeClass, class CellClass, class ContainerClass, class KernelC
class FFmmAlgorithmThreadBalanced : public FAbstractAlgorithm, public FAlgorithmTimers{
using multipole_t = typename CellClass::multipole_t;
using local_exp_t = typename CellClass::local_expansion_t;
using symb_data_t = CellClass;
using local_expansion_t = typename CellClass::local_expansion_t;
using symbolic_data_t = CellClass;
/// Shortened tree iterator class.
using TreeIterator = typename OctreeClass::Iterator;
......@@ -279,7 +279,7 @@ protected:
// child is an array (of 8 child) that may be null
multipole_t* const parent_multipole
= &(zoneIterator.getCurrentCell()->getMultipoleData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= zoneIterator.getCurrentCell();
CellClass** children = zoneIterator.getCurrentChildren();
......@@ -289,7 +289,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 8> child_symbolics;
std::array<const symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {
return c;
......@@ -360,9 +360,9 @@ protected:
zoneIterator.getCurrentGlobalCoordinate(),
level);
if(counter) {
local_exp_t* const target_local_exp
local_expansion_t* const target_local_exp
= &(zoneIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const target_symbolic
const symbolic_data_t* const target_symbolic
= zoneIterator.getCurrentCell();
std::array<const multipole_t*, 342> neighbor_multipoles;
......@@ -372,7 +372,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 342> neighbor_symbolics;
std::array<const symbolic_data_t*, 342> neighbor_symbolics;
std::transform(neighbors, neighbors+counter,
neighbor_symbolics.begin(),
[](const CellClass* c) {return c;});
......@@ -436,19 +436,19 @@ protected:
// Call L2L kernel on cells
while( zoneCellCount-- > 0 ) {
local_exp_t* const parent_local_exp
local_expansion_t* const parent_local_exp
= &(zoneIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= zoneIterator.getCurrentCell();
std::array<local_exp_t*, 8> child_expansions;
std::array<local_expansion_t*, 8> child_expansions;
CellClass** children = zoneIterator.getCurrentChildren();
std::transform(children, children+8, child_expansions.begin(),
[](CellClass* c) {
return (c == nullptr ? nullptr
: &(c->getLocalExpansionData()));
});
std::array<symb_data_t*, 8> child_symbolics;
std::array<symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
......
......@@ -73,7 +73,7 @@ namespace FTestCell_impl {
};
using multipole_t = scalfmm::detail::FTestCell_impl::exp_impl<class MultipoleTag>;
using local_exp_t = scalfmm::detail::FTestCell_impl::exp_impl<class LocalExpansionTag>;
using local_expansion_t = scalfmm::detail::FTestCell_impl::exp_impl<class LocalExpansionTag>;
}
}
......@@ -82,7 +82,7 @@ namespace FTestCell_impl {
using FTestCell = FGenericData<
scalfmm::detail::FTestCell_impl::multipole_t,
scalfmm::detail::FTestCell_impl::local_exp_t
scalfmm::detail::FTestCell_impl::local_expansion_t
>;
#endif //FTESTCELL_HPP
......@@ -45,8 +45,8 @@ template<class OctreeClass, class CellClass, class ContainerClass, class KernelC
class FFmmAlgorithm : public FAbstractAlgorithm, public FAlgorithmTimers {
using multipole_t = typename CellClass::multipole_t;
using local_exp_t = typename CellClass::local_expansion_t;
using symb_data_t = CellClass;
using local_expansion_t = typename CellClass::local_expansion_t;
using symbolic_data_t = CellClass;
OctreeClass* const tree; ///< The octree to work on.
KernelClass* const kernels; ///< The kernels.
......@@ -134,7 +134,7 @@ protected:
// and the list of particles
multipole_t* const leaf_multipole
= &(octreeIterator.getCurrentCell()->getMultipoleData());
const symb_data_t* const leaf_symbolic
const symbolic_data_t* const leaf_symbolic
= octreeIterator.getCurrentCell();
FLOG(computationCounter.tic());
kernels->P2M(leaf_multipole,
......@@ -178,7 +178,7 @@ protected:
// child is an array (of 8 child) that may be null
multipole_t* const parent_multipole
= &(octreeIterator.getCurrentCell()->getMultipoleData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= octreeIterator.getCurrentCell();
CellClass** children = octreeIterator.getCurrentChildren();
......@@ -188,7 +188,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 8> child_symbolics;
std::array<const symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
FLOG(computationCounter.tic());
......@@ -246,12 +246,12 @@ protected:
continue;
}
local_exp_t* const target_local_exp
local_expansion_t* const target_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const target_symbolic
const symbolic_data_t* const target_symbolic
= octreeIterator.getCurrentCell();
std::array<const multipole_t*, 342> neighbor_multipoles;
std::array<const symb_data_t*, 342> neighbor_symbolics;
std::array<const symbolic_data_t*, 342> neighbor_symbolics;
std::transform(neighbors, neighbors+counter, neighbor_multipoles.begin(),
[](const CellClass* c) {
return (c == nullptr ? nullptr
......@@ -311,17 +311,17 @@ protected:
// for each cells
do{
local_exp_t* const parent_local_exp
local_expansion_t* const parent_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= octreeIterator.getCurrentCell();
CellClass** children = octreeIterator.getCurrentChildren();
std::array<local_exp_t*, 8> child_local_expansions;
std::array<local_expansion_t*, 8> child_local_expansions;
std::transform(children, children+8, child_local_expansions.begin(),
[](CellClass* c) {return (c == nullptr ? nullptr
: &(c->getLocalExpansionData()));
});
std::array<symb_data_t*, 8> child_symbolics;
std::array<symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
FLOG(computationCounter.tic());
......
This diff is collapsed.
This diff is collapsed.
......@@ -56,8 +56,8 @@ template<class OctreeClass, class CellClass, class ContainerClass, class KernelC
class FFmmAlgorithmSectionTask : public FAbstractAlgorithm, public FAlgorithmTimers {
using multipole_t = typename CellClass::multipole_t;
using local_exp_t = typename CellClass::local_expansion_t;
using symb_data_t = CellClass;
using local_expansion_t = typename CellClass::local_expansion_t;
using symbolic_data_t = CellClass;
OctreeClass* const tree; ///< The octree to work on
KernelClass** kernels; ///< The kernels
......@@ -223,7 +223,7 @@ protected:
{
multipole_t* const parent_multipole
= &(octreeIterator.getCurrentCell()->getMultipoleData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= octreeIterator.getCurrentCell();
CellClass** children = octreeIterator.getCurrentChildren();
......@@ -233,7 +233,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 8> child_symbolics;
std::array<const symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
kernels[omp_get_thread_num()]->M2M(parent_multipole,
......@@ -301,9 +301,9 @@ protected:
if(counter){
#pragma omp task firstprivate(octreeIterator, neighbors, neighborPositions, counter,idxLevel)
{
local_exp_t* const target_local_exp
local_expansion_t* const target_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const target_symbolic
const symbolic_data_t* const target_symbolic
= octreeIterator.getCurrentCell();
std::array<const multipole_t*, 342> neighbor_multipoles;
std::transform(neighbors, neighbors+counter, neighbor_multipoles.begin(),
......@@ -311,7 +311,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 342> neighbor_symbolics;
std::array<const symbolic_data_t*, 342> neighbor_symbolics;
std::transform(neighbors, neighbors+counter, neighbor_symbolics.begin(),
[](const CellClass* c) {return c;});
......@@ -372,9 +372,9 @@ protected:
if(counter){
#pragma omp task firstprivate(octreeIterator, neighbors, neighborPositions, counter,idxLevel)
{
local_exp_t* const target_local_exp
local_expansion_t* const target_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const target_symbolic
const symbolic_data_t* const target_symbolic
= octreeIterator.getCurrentCell();
std::array<const multipole_t*, 342> neighbor_multipoles;
std::transform(neighbors, neighbors+counter, neighbor_multipoles.begin(),
......@@ -382,7 +382,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 342> neighbor_symbolics;
std::array<const symbolic_data_t*, 342> neighbor_symbolics;
std::transform(neighbors, neighbors+counter, neighbor_symbolics.begin(),
[](const CellClass* c) {return c;});
......@@ -433,17 +433,17 @@ protected:
do{
#pragma omp task firstprivate(octreeIterator,idxLevel)
{
local_exp_t* const parent_local_exp
local_expansion_t* const parent_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= octreeIterator.getCurrentCell();
CellClass** children = octreeIterator.getCurrentChildren();
std::array<local_exp_t*, 8> child_local_expansions;
std::array<local_expansion_t*, 8> child_local_expansions;
std::transform(children, children+8, child_local_expansions.begin(),
[](CellClass* c) {return (c == nullptr ? nullptr
: &(c->getLocalExpansionData()));
});
std::array<symb_data_t*, 8> child_symbolics;
std::array<symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
kernels[omp_get_thread_num()]->L2L(
......
......@@ -50,8 +50,8 @@ template<class OctreeClass, class CellClass, class ContainerClass, class KernelC
class FFmmAlgorithmTask : public FAbstractAlgorithm, public FAlgorithmTimers {
using multipole_t = typename CellClass::multipole_t;
using local_exp_t = typename CellClass::local_expansion_t;
using symb_data_t = CellClass;
using local_expansion_t = typename CellClass::local_expansion_t;
using symbolic_data_t = CellClass;
OctreeClass* const tree; //< The octree to work on
KernelClass** kernels; //< The kernels
......@@ -218,7 +218,7 @@ protected:
{
multipole_t* const parent_multipole
= &(octreeIterator.getCurrentCell()->getMultipoleData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= octreeIterator.getCurrentCell();
CellClass** children = octreeIterator.getCurrentChildren();
......@@ -228,7 +228,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 8> child_symbolics;
std::array<const symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
kernels[omp_get_thread_num()]->M2M(parent_multipole,
......@@ -305,9 +305,9 @@ protected:
idxLevel, separationCriteria);
if(counter) {
local_exp_t* const target_local_exp
local_expansion_t* const target_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const target_symbolic
const symbolic_data_t* const target_symbolic
= octreeIterator.getCurrentCell();
std::array<const multipole_t*, 342> neighbor_multipoles;
std::transform(neighbors, neighbors+counter, neighbor_multipoles.begin(),
......@@ -315,7 +315,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 342> neighbor_symbolics;
std::array<const symbolic_data_t*, 342> neighbor_symbolics;
std::transform(neighbors, neighbors+counter, neighbor_symbolics.begin(),
[](const CellClass* c) {return c;});
......@@ -379,9 +379,9 @@ protected:
if(counter) {
local_exp_t* const target_local_exp
local_expansion_t* const target_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const target_symbolic
const symbolic_data_t* const target_symbolic
= octreeIterator.getCurrentCell();
std::array<const multipole_t*, 342> neighbor_multipoles;
std::transform(neighbors, neighbors+counter, neighbor_multipoles.begin(),
......@@ -389,7 +389,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 342> neighbor_symbolics;
std::array<const symbolic_data_t*, 342> neighbor_symbolics;
std::transform(neighbors, neighbors+counter, neighbor_symbolics.begin(),
[](const CellClass* c) {return c;});
......@@ -453,17 +453,17 @@ protected:
do{
#pragma omp task firstprivate(octreeIterator,idxLevel)
{
local_exp_t* const parent_local_exp
local_expansion_t* const parent_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= octreeIterator.getCurrentCell();
CellClass** children = octreeIterator.getCurrentChildren();
std::array<local_exp_t*, 8> child_local_expansions;
std::array<local_expansion_t*, 8> child_local_expansions;
std::transform(children, children+8, child_local_expansions.begin(),
[](CellClass* c) {return (c == nullptr ? nullptr
: &(c->getLocalExpansionData()));
});
std::array<symb_data_t*, 8> child_symbolics;
std::array<symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
kernels[omp_get_thread_num()]->L2L(
......
......@@ -53,8 +53,8 @@ template<class OctreeClass, class CellClass, class ContainerClass, class KernelC
class FFmmAlgorithmThread : public FAbstractAlgorithm, public FAlgorithmTimers{
using multipole_t = typename CellClass::multipole_t;
using local_exp_t = typename CellClass::local_expansion_t;
using symb_data_t = CellClass;
using local_expansion_t = typename CellClass::local_expansion_t;
using symbolic_data_t = CellClass;
OctreeClass* const tree; ///< The octree to work on.
KernelClass** kernels; ///< The kernels.
......@@ -282,7 +282,7 @@ protected:
multipole_t* const parent_multipole
= &(iterArray[idxCell].getCurrentCell()->getMultipoleData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= iterArray[idxCell].getCurrentCell();
CellClass** children = iterArray[idxCell].getCurrentChildren();
......@@ -292,7 +292,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 8> child_symbolics;
std::array<const symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {
return c;
......@@ -375,9 +375,9 @@ protected:
const int counter = tree->getInteractionNeighbors(neighbors, neighborPositions, iterArray[idxCell].getCurrentGlobalCoordinate(), idxLevel, separationCriteria);
if(counter) {
local_exp_t* const target_local_exp
local_expansion_t* const target_local_exp
= &(iterArray[idxCell].getCurrentCell()->getLocalExpansionData());
const symb_data_t* const target_symbolic
const symbolic_data_t* const target_symbolic
= iterArray[idxCell].getCurrentCell();
std::array<const multipole_t*, 342> neighbor_multipoles;
......@@ -387,7 +387,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 342> neighbor_symbolics;
std::array<const symbolic_data_t*, 342> neighbor_symbolics;
std::transform(neighbors, neighbors+counter,
neighbor_symbolics.begin(),
[](const CellClass* c) {return c;});
......@@ -455,19 +455,19 @@ protected:
#pragma omp for nowait schedule(dynamic, chunkSize)
for(int idxCell = 0 ; idxCell < numberOfCells ; ++idxCell){
local_exp_t* const parent_local_exp
local_expansion_t* const parent_local_exp
= &(iterArray[idxCell].getCurrentCell()->getLocalExpansionData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= iterArray[idxCell].getCurrentCell();
std::array<local_exp_t*, 8> child_expansions;
std::array<local_expansion_t*, 8> child_expansions;
CellClass** children = iterArray[idxCell].getCurrentChildren();
std::transform(children, children+8, child_expansions.begin(),
[](CellClass* c) {
return (c == nullptr ? nullptr
: &(c->getLocalExpansionData()));
});
std::array<symb_data_t*, 8> child_symbolics;
std::array<symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
......
......@@ -38,8 +38,8 @@ template<class OctreeClass, class CellClass, class ContainerClass, class KernelC
class FFmmAlgorithmThreadBalance : public FAbstractAlgorithm, public FAlgorithmTimers{
using multipole_t = typename CellClass::multipole_t;
using local_exp_t = typename CellClass::local_expansion_t;
using symb_data_t = CellClass;
using local_expansion_t = typename CellClass::local_expansion_t;
using symbolic_data_t = CellClass;
OctreeClass* const tree; ///< The octree to work on.
KernelClass** kernels; ///< The kernels.
......@@ -515,7 +515,7 @@ protected:
// child is an array (of 8 child) that may be null
multipole_t* const parent_multipole
= &(octreeIterator.getCurrentCell()->getMultipoleData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= octreeIterator.getCurrentCell();
CellClass** children = octreeIterator.getCurrentChildren();
......@@ -525,7 +525,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 8> child_symbolics;
std::array<const symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
myThreadkernels->M2M(parent_multipole,
......@@ -594,9 +594,9 @@ protected:
idxLevel, separationCriteria);
if(counter) {
local_exp_t* const target_local_exp
local_expansion_t* const target_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const target_symbolic
const symbolic_data_t* const target_symbolic
= octreeIterator.getCurrentCell();
std::array<const multipole_t*, 342> neighbor_multipoles;
std::transform(neighbors, neighbors+counter, neighbor_multipoles.begin(),
......@@ -604,7 +604,7 @@ protected:
return (c == nullptr ? nullptr
: &(c->getMultipoleData()));
});
std::array<const symb_data_t*, 342> neighbor_symbolics;
std::array<const symbolic_data_t*, 342> neighbor_symbolics;
std::transform(neighbors, neighbors+counter, neighbor_symbolics.begin(),
[](const CellClass* c) {return c;});
......@@ -660,17 +660,17 @@ protected:
typename OctreeClass::Iterator octreeIterator( workloadL2L[idxLevel][omp_get_thread_num()].iterator);
for(int idxCell = 0 ; idxCell < nbCellsToCompute ; ++idxCell){
local_exp_t* const parent_local_exp
local_expansion_t* const parent_local_exp
= &(octreeIterator.getCurrentCell()->getLocalExpansionData());
const symb_data_t* const parent_symbolic
const symbolic_data_t* const parent_symbolic
= octreeIterator.getCurrentCell();
CellClass** children = octreeIterator.getCurrentChildren();
std::array<local_exp_t*, 8> child_local_expansions;
std::array<local_expansion_t*, 8> child_local_expansions;
std::transform(children, children+8, child_local_expansions.begin(),
[](CellClass* c) {return (c == nullptr ? nullptr
: &(c->getLocalExpansionData()));
});
std::array<symb_data_t*, 8> child_symbolics;
std::array<symbolic_data_t*, 8> child_symbolics;
std::transform(children, children+8, child_symbolics.begin(),
[](CellClass* c) {return c;});
myThreadkernels->L2L(
......
......@@ -70,8 +70,8 @@ template<class OctreeClass, class CellClass, class ContainerClass, class KernelC
class FFmmAlgorithmThreadProc : public FAbstractAlgorithm, public FAlgorithmTimers {
using multipole_t = typename CellClass::multipole_t;
using local_exp_t = typename CellClass::local_expansion_t;
using symb_data_t = CellClass;
using local_expansion_t = typename CellClass::local_expansion_t;
using symbolic_data_t = CellClass;
private:
OctreeClass* const tree; ///< The octree to work on
......@@ -393,7 +393,7 @@ protected:
for(int idxLeafs = 0 ; idxLeafs < leafs ; ++idxLeafs){
multipole_t* leaf_multipole = &(iterArray[idxLeafs].getCurrentCell()->getMultipoleData());
symb_data_t* leaf_symbolic = iterArray[idxLeafs].getCurrentCell();
symbolic_data_t* leaf_symbolic = iterArray[idxLeafs].getCurrentCell();
auto particles = iterArray[idxLeafs].getCurrentListSrc();
......@@ -627,7 +627,7 @@ protected:
multipole_t* parent_multipole