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
5eccb5e5
Commit
5eccb5e5
authored
Feb 14, 2018
by
COULAUD Olivier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Intel flag to compile - Check error with TSM and task-based adaptive algorithm
parent
ea5f1b4d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
Examples/ChebyshevInterpolationAdaptiveFMM.cpp
Examples/ChebyshevInterpolationAdaptiveFMM.cpp
+3
-4
Examples/LagrangeInterpolationAdaptiveFMM.cpp
Examples/LagrangeInterpolationAdaptiveFMM.cpp
+2
-0
Src/Components/FTypedLeaf.hpp
Src/Components/FTypedLeaf.hpp
+9
-3
No files found.
Examples/ChebyshevInterpolationAdaptiveFMM.cpp
View file @
5eccb5e5
...
@@ -172,16 +172,16 @@ int main(int argc, char* argv[]) {
...
@@ -172,16 +172,16 @@ int main(int argc, char* argv[]) {
loader
.
getBoxWidth
(),
loader
.
getBoxWidth
(),
loader
.
getCenterOfBox
(),
loader
.
getCenterOfBox
(),
&
MatrixKernel
);
&
MatrixKernel
);
if
(
FParameters
::
existParameter
(
argc
,
argv
,
FPD
::
UseSequential
.
options
))
{
if
(
FParameters
::
existParameter
(
argc
,
argv
,
FPD
::
UseSequential
.
options
))
{
FmmClassSeq
algo
(
&
tree
,
&
kernel
);
FmmClassSeq
algo
(
&
tree
,
&
kernel
);
algo
.
execute
();
// FMM algorithm call
algo
.
execute
();
// FMM algorithm call
}
else
{
}
else
{
#ifndef __INTEL_COMPILER
FmmClass
algo
(
&
tree
,
&
kernel
);
FmmClass
algo
(
&
tree
,
&
kernel
);
algo
.
execute
();
// FMM algorithm call
algo
.
execute
();
// FMM algorithm call
#endif
}
}
//
//
//
//
time
.
tac
();
time
.
tac
();
...
@@ -273,7 +273,6 @@ int main(int argc, char* argv[]) {
...
@@ -273,7 +273,6 @@ int main(int argc, char* argv[]) {
writer
.
writeArrayOfReal
(
particles
,
8
,
NbPoints
);
writer
.
writeArrayOfReal
(
particles
,
8
,
NbPoints
);
delete
[]
particles
;
delete
[]
particles
;
//
//
// std::string name1( "output.fma");
// std::string name1( "output.fma");
//
//
...
...
Examples/LagrangeInterpolationAdaptiveFMM.cpp
View file @
5eccb5e5
...
@@ -199,8 +199,10 @@ int main(int argc, char* argv[]) {
...
@@ -199,8 +199,10 @@ int main(int argc, char* argv[]) {
algo
.
execute
(
operations
);
// FMM algorithm call
algo
.
execute
(
operations
);
// FMM algorithm call
#endif
#endif
}
else
{
}
else
{
#ifndef __INTEL_COMPILER
FmmClass
algo
(
&
tree
,
&
kernel
);
FmmClass
algo
(
&
tree
,
&
kernel
);
algo
.
execute
(
operations
);
// FMM algorithm call
algo
.
execute
(
operations
);
// FMM algorithm call
#endif
}
}
...
...
Src/Components/FTypedLeaf.hpp
View file @
5eccb5e5
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
#define FTYPEDLEAF_HPP
#define FTYPEDLEAF_HPP
#include "
../
Utils/FAssert.hpp"
#include "Utils/FAssert.hpp"
#include "FAbstractLeaf.hpp"
#include "FAbstractLeaf.hpp"
#include "FParticleType.hpp"
#include "FParticleType.hpp"
...
@@ -37,8 +37,14 @@ public:
...
@@ -37,8 +37,14 @@ public:
*/
*/
template
<
typename
...
Args
>
template
<
typename
...
Args
>
void
push
(
const
FPoint
<
FReal
>&
inParticlePosition
,
const
FParticleType
type
,
Args
...
args
){
void
push
(
const
FPoint
<
FReal
>&
inParticlePosition
,
const
FParticleType
type
,
Args
...
args
){
if
(
type
==
FParticleType
::
FParticleTypeTarget
)
targets
.
push
(
inParticlePosition
,
FParticleType
::
FParticleTypeTarget
,
args
...);
if
(
type
==
FParticleType
::
FParticleTypeTarget
)
{
else
sources
.
push
(
inParticlePosition
,
FParticleType
::
FParticleTypeSource
,
args
...);
targets
.
push
(
inParticlePosition
,
args
...);
// targets.push(inParticlePosition, FParticleType::FParticleTypeTarget, args...);
}
else
{
//sources.push(inParticlePosition, FParticleType::FParticleTypeSource, args...);
sources
.
push
(
inParticlePosition
,
args
...);
}
}
}
/**
/**
...
...
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