Commit 1c600ab1 authored by BRAMAS Berenger's avatar BRAMAS Berenger

make the level private in the task fmm

parent 72e759ba
...@@ -185,7 +185,7 @@ protected: ...@@ -185,7 +185,7 @@ protected:
do{ do{
// We need the current cell and the child // We need the current cell and the child
// child is an array (of 8 child) that may be null // child is an array (of 8 child) that may be null
#pragma omp task firstprivate(octreeIterator) shared(idxLevel) #pragma omp task firstprivate(octreeIterator,idxLevel)
{ {
kernels[omp_get_thread_num()]->M2M( octreeIterator.getCurrentCell() , octreeIterator.getCurrentChild(), idxLevel); kernels[omp_get_thread_num()]->M2M( octreeIterator.getCurrentCell() , octreeIterator.getCurrentChild(), idxLevel);
} }
...@@ -243,7 +243,7 @@ protected: ...@@ -243,7 +243,7 @@ protected:
const int separationCriteria = (idxLevel != FAbstractAlgorithm::lowerWorkingLevel-1 ? 1 : leafLevelSeparationCriteria); const int separationCriteria = (idxLevel != FAbstractAlgorithm::lowerWorkingLevel-1 ? 1 : leafLevelSeparationCriteria);
// for each cell we apply the M2L with all cells in the implicit interaction list // for each cell we apply the M2L with all cells in the implicit interaction list
do{ do{
#pragma omp task firstprivate(octreeIterator) shared(idxLevel) #pragma omp task firstprivate(octreeIterator,idxLevel)
{ {
const CellClass* neighbors[343]; const CellClass* neighbors[343];
const int counter = tree->getInteractionNeighbors(neighbors, octreeIterator.getCurrentGlobalCoordinate(), idxLevel, separationCriteria); const int counter = tree->getInteractionNeighbors(neighbors, octreeIterator.getCurrentGlobalCoordinate(), idxLevel, separationCriteria);
...@@ -290,7 +290,7 @@ protected: ...@@ -290,7 +290,7 @@ protected:
const int separationCriteria = (idxLevel != FAbstractAlgorithm::lowerWorkingLevel-1 ? 1 : leafLevelSeparationCriteria); const int separationCriteria = (idxLevel != FAbstractAlgorithm::lowerWorkingLevel-1 ? 1 : leafLevelSeparationCriteria);
// for each cells // for each cells
do{ do{
#pragma omp task default(none) firstprivate(octreeIterator,separationCriteria) shared(idxLevel) #pragma omp task default(none) firstprivate(octreeIterator,separationCriteria,idxLevel)
{ {
const CellClass* neighbors[343]; const CellClass* neighbors[343];
const int counter = tree->getInteractionNeighbors(neighbors, octreeIterator.getCurrentGlobalCoordinate(), idxLevel, separationCriteria); const int counter = tree->getInteractionNeighbors(neighbors, octreeIterator.getCurrentGlobalCoordinate(), idxLevel, separationCriteria);
...@@ -347,7 +347,7 @@ protected: ...@@ -347,7 +347,7 @@ protected:
FLOG(FTic counterTimeLevel); FLOG(FTic counterTimeLevel);
// for each cells // for each cells
do{ do{
#pragma omp task firstprivate(octreeIterator) shared(idxLevel) #pragma omp task firstprivate(octreeIterator,idxLevel)
{ {
kernels[omp_get_thread_num()]->L2L( octreeIterator.getCurrentCell() , octreeIterator.getCurrentChild(), idxLevel); kernels[omp_get_thread_num()]->L2L( octreeIterator.getCurrentCell() , octreeIterator.getCurrentChild(), idxLevel);
} }
......
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