Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
5
Issues
5
List
Boards
Labels
Milestones
Packages
Packages
Container Registry
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
a50a6eaf
Commit
a50a6eaf
authored
Sep 03, 2012
by
BRAMAS Berenger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clen the periodic code and refactorize names
parent
3e6b978c
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
209 additions
and
105 deletions
+209
-105
Src/Core/FFmmAlgorithmPeriodic.hpp
Src/Core/FFmmAlgorithmPeriodic.hpp
+199
-91
Tests/Kernels/testSphericalEwalAlgorithm.cpp
Tests/Kernels/testSphericalEwalAlgorithm.cpp
+1
-2
Tests/Utils/testFmmAlgorithmPeriodic.cpp
Tests/Utils/testFmmAlgorithmPeriodic.cpp
+1
-1
Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
+1
-1
UTests/utestChebyshevDirectPeriodic.cpp
UTests/utestChebyshevDirectPeriodic.cpp
+3
-3
UTests/utestRotationDirectPeriodic.cpp
UTests/utestRotationDirectPeriodic.cpp
+2
-3
UTests/utestSphericalDirectPeriodic.cpp
UTests/utestSphericalDirectPeriodic.cpp
+2
-4
No files found.
Src/Core/FFmmAlgorithmPeriodic.hpp
View file @
a50a6eaf
This diff is collapsed.
Click to expand it.
Tests/Kernels/testSphericalEwalAlgorithm.cpp
View file @
a50a6eaf
...
...
@@ -135,8 +135,7 @@ int main(int argc, char ** argv){
counter
.
tic
();
FmmClass
algo
(
&
tree
,
PeriodicDeep
);
KernelClass
kernels
(
DevP
,
algo
.
treeHeightForKernel
(),
algo
.
boxwidthForKernel
(
loader
.
getBoxWidth
()),
loader
.
getCenterOfBox
());
KernelClass
kernels
(
DevP
,
algo
.
extendedTreeHeight
(),
algo
.
extendedBoxWidth
(),
algo
.
extendedBoxCenter
());
algo
.
setKernel
(
&
kernels
);
algo
.
execute
();
...
...
Tests/Utils/testFmmAlgorithmPeriodic.cpp
View file @
a50a6eaf
...
...
@@ -127,7 +127,7 @@ int main(int argc, char ** argv){
const
long
long
NbParticlesEntireSystem
=
NbParticles
*
totalRepeatedBox
;
std
::
cout
<<
"The total number of particles is "
<<
NbParticlesEntireSystem
<<
"
\n
"
;
FTreeCoordinate
min
,
max
;
algo
.
repetitions
(
&
min
,
&
max
);
algo
.
repetitions
Intervals
(
&
min
,
&
max
);
std
::
cout
<<
"Min is "
<<
min
<<
" Max is "
<<
max
<<
std
::
endl
;
OctreeClass
::
Iterator
octreeIterator
(
&
tree
);
...
...
Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
View file @
a50a6eaf
...
...
@@ -113,7 +113,7 @@ int main(int argc, char ** argv){
//////////////////////////////////////////////////////////////////////////////////
{
const
int
repeatedBox
=
algo
.
repeatedBox
();
const
int
repeatedBox
=
algo
.
theoricalRepetition
();
const
int
totalRepeatedBox
=
FMath
::
pow
(
algo
.
repeatedBox
()
,
3
);
std
::
cout
<<
"The box is repeated "
<<
repeatedBox
<<
" there are "
<<
totalRepeatedBox
<<
" boxes in total
\n
"
;
const
long
long
NbParticlesEntireSystem
=
app
.
global
().
processCount
()
*
NbParticles
*
totalRepeatedBox
;
...
...
UTests/utestChebyshevDirectPeriodic.cpp
View file @
a50a6eaf
...
...
@@ -88,8 +88,8 @@ class TestChebyshevDirect : public FUTester<TestChebyshevDirect> {
// Run FMM
Print
(
"Fmm..."
);
FmmClass
algo
(
&
tree
,
PeriodicDeep
);
KernelClass
kernels
(
algo
.
treeHeightForKernel
(),
algo
.
boxcenterForKernel
(
loader
.
getCenterOfBox
(),
loader
.
getBoxWidth
()
),
algo
.
boxwidthForKernel
(
loader
.
getBoxWidth
()
),
epsilon
);
KernelClass
kernels
(
algo
.
extendedTreeHeight
(),
algo
.
extendedBoxCenter
(
),
algo
.
extendedBoxWidth
(
),
epsilon
);
algo
.
setKernel
(
&
kernels
);
algo
.
execute
();
...
...
@@ -98,7 +98,7 @@ class TestChebyshevDirect : public FUTester<TestChebyshevDirect> {
Print
(
"Direct..."
);
FTreeCoordinate
min
,
max
;
algo
.
repetitions
(
&
min
,
&
max
);
algo
.
repetitions
Intervals
(
&
min
,
&
max
);
for
(
int
idxTarget
=
0
;
idxTarget
<
loader
.
getNumberOfParticles
()
;
++
idxTarget
){
for
(
int
idxOther
=
idxTarget
+
1
;
idxOther
<
loader
.
getNumberOfParticles
()
;
++
idxOther
){
...
...
UTests/utestRotationDirectPeriodic.cpp
View file @
a50a6eaf
...
...
@@ -76,15 +76,14 @@ class TestRotationDirectPeriodic : public FUTester<TestRotationDirectPeriodic> {
// Run FMM
Print
(
"Fmm..."
);
FmmClass
algo
(
&
tree
,
PeriodicDeep
,
DirX
|
DirMinusY
|
DirPlusZ
);
KernelClass
kernels
(
algo
.
treeHeightForKernel
(),
algo
.
boxwidthForKernel
(
loader
.
getBoxWidth
()),
algo
.
boxcenterForKernel
(
loader
.
getCenterOfBox
(),
loader
.
getBoxWidth
()));
KernelClass
kernels
(
algo
.
extendedTreeHeight
(),
algo
.
extendedBoxWidth
(),
algo
.
extendedBoxCenter
());
algo
.
setKernel
(
&
kernels
);
algo
.
execute
();
// Run Direct
Print
(
"Run direct..."
);
FTreeCoordinate
min
,
max
;
algo
.
repetitions
(
&
min
,
&
max
);
algo
.
repetitions
Intervals
(
&
min
,
&
max
);
for
(
int
idxTarget
=
0
;
idxTarget
<
NbParticles
;
++
idxTarget
){
for
(
int
idxSource
=
idxTarget
+
1
;
idxSource
<
NbParticles
;
++
idxSource
){
...
...
UTests/utestSphericalDirectPeriodic.cpp
View file @
a50a6eaf
...
...
@@ -78,16 +78,14 @@ class TestSphericalDirectPeriodic : public FUTester<TestSphericalDirectPeriodic>
// Run FMM
Print
(
"Fmm..."
);
FmmClass
algo
(
&
tree
,
PeriodicDeep
);
KernelClass
kernels
(
DevP
,
algo
.
treeHeightForKernel
(),
algo
.
boxwidthForKernel
(
loader
.
getBoxWidth
()),
algo
.
boxcenterForKernel
(
loader
.
getCenterOfBox
(),
loader
.
getBoxWidth
()));
KernelClass
kernels
(
DevP
,
algo
.
extendedTreeHeight
(),
algo
.
extendedBoxWidth
(),
algo
.
extendedBoxCenter
());
algo
.
setKernel
(
&
kernels
);
algo
.
execute
();
// Run Direct
Print
(
"Run direct..."
);
FTreeCoordinate
min
,
max
;
algo
.
repetitions
(
&
min
,
&
max
);
algo
.
repetitions
Intervals
(
&
min
,
&
max
);
for
(
int
idxTarget
=
0
;
idxTarget
<
NbParticles
;
++
idxTarget
){
for
(
int
idxSource
=
idxTarget
+
1
;
idxSource
<
NbParticles
;
++
idxSource
){
...
...
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