Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
6c4cedd5
Commit
6c4cedd5
authored
Jun 09, 2016
by
Quentin Khan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adaptive algorithms: do not call L2P on empty leaves
parent
186d0ffa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
Src/Adaptive/new/FAdaptiveSequential.hpp
Src/Adaptive/new/FAdaptiveSequential.hpp
+3
-1
Src/Adaptive/new/FAdaptiveTask.hpp
Src/Adaptive/new/FAdaptiveTask.hpp
+8
-6
No files found.
Src/Adaptive/new/FAdaptiveSequential.hpp
View file @
6c4cedd5
...
...
@@ -264,7 +264,9 @@ public:
// L2P
void
down_to_target
()
{
for
(
node_t
*
leaf
:
_tree
.
leaves
())
{
_kernel
.
L2P
(
leaf
->
getData
(),
leaf
->
getParticleContainer
());
if
(
leaf
->
getParticleContainer
()
->
size
()
!=
0
)
{
_kernel
.
L2P
(
leaf
->
getData
(),
leaf
->
getParticleContainer
());
}
}
}
...
...
Src/Adaptive/new/FAdaptiveTask.hpp
View file @
6c4cedd5
...
...
@@ -846,12 +846,14 @@ public:
// L2P
void
down_to_target
()
{
for
(
node_t
*
leaf
:
_tree
.
leaves
())
{
const
char
*
data_dep
=
get_dependency
<
dep_t
::
L
>
(
leaf
);
(
void
)
data_dep
;
const
char
*
pt_dep
=
get_dependency
<
dep_t
::
P_t
>
(
leaf
);
(
void
)
pt_dep
;
#pragma omp task depend(inout: pt_dep[:1]) depend(in: data_dep[:1])
{
const
int
thread_num
=
omp_get_thread_num
();
this
->
_kernels
[
thread_num
]
->
L2P
(
leaf
->
getData
(),
leaf
->
getParticleContainer
());
if
(
leaf
->
getParticleContainer
()
->
size
()
!=
0
)
{
const
char
*
data_dep
=
get_dependency
<
dep_t
::
L
>
(
leaf
);
(
void
)
data_dep
;
const
char
*
pt_dep
=
get_dependency
<
dep_t
::
P_t
>
(
leaf
);
(
void
)
pt_dep
;
#pragma omp task depend(inout: pt_dep[:1]) depend(in: data_dep[:1])
{
const
int
thread_num
=
omp_get_thread_num
();
this
->
_kernels
[
thread_num
]
->
L2P
(
leaf
->
getData
(),
leaf
->
getParticleContainer
());
}
}
}
// #pragma omp taskwait
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment