Commit 63330286 authored by Quentin Khan's avatar Quentin Khan

FAdaptiveTask: fix timer output, reorder M2P before M2L

parent 0daa92f4
......@@ -143,6 +143,13 @@ public:
std::cout << " M2L: " << timer.last().count() << "s" << '\n';
}
if(operations & FFmmM2P) {
// 5a W-list, M2P
auto WLS = std::bind(&FAdaptiveTask::w_list_step, this);
timer.time(WLS);
std::cout << " M2P: " << timer.last().count() << "s" << '\n';
}
if(operations & FFmmP2L) {
// 3b X-list, P2L
auto XLS = std::bind(&FAdaptiveTask::x_list_step, this);
......@@ -157,13 +164,6 @@ public:
std::cout << " L2L: " << timer.last().count() << "s" << '\n';
}
if(operations & FFmmM2P) {
// 5a W-list, M2P
auto WLS = std::bind(&FAdaptiveTask::w_list_step, this);
timer.time(WLS);
std::cout << " M2P: " << timer.last().count() << "s" << '\n';
}
if(operations & FFmmL2P) {
// 5b down to target, L2P
auto D2T = std::bind(&FAdaptiveTask::down_to_target, this);
......@@ -174,7 +174,7 @@ public:
std::cout << " task created: "
<< std::accumulate(this->timer.measures().begin(),
this->timer.measures().end(),
std::chrono::seconds(0)).count()
std::chrono::duration<double>(0)).count()
<< '\n';
}
}
......@@ -647,7 +647,7 @@ public:
for(node_t* leaf : _tree.leaves()) {
if(leaf->getParticleContainer()->size() > 0) {
for(node_t* w_item : leaf->W) {
#pragma omp task depend(in: leaf[:1]) depend(out: w_item[:1])
#pragma omp task depend(in: leaf[:1]) depend(inout: w_item[:1])
{
const int thread_num = omp_get_thread_num();
this->_kernels[thread_num]->P2L(w_item->getData(), leaf->getParticleContainer());
......
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