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
9ac079da
Commit
9ac079da
authored
Mar 14, 2014
by
PIACIBELLO Cyrille
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
All test files have been modified in order to follow the new way to choose the balancing algorithm
parent
86db170e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
13 deletions
+31
-13
Tests/Kernels/testChebAlgorithmProc.cpp
Tests/Kernels/testChebAlgorithmProc.cpp
+3
-1
Tests/Kernels/testSphericalProcAlgorithm.cpp
Tests/Kernels/testSphericalProcAlgorithm.cpp
+4
-1
Tests/Kernels/testUnifAlgorithmProc.cpp
Tests/Kernels/testUnifAlgorithmProc.cpp
+3
-1
Tests/Utils/testFmmAlgorithmProc.cpp
Tests/Utils/testFmmAlgorithmProc.cpp
+4
-1
Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
+3
-1
Tests/Utils/testFmmAlgorithmProcRotation.cpp
Tests/Utils/testFmmAlgorithmProcRotation.cpp
+10
-6
Tests/Utils/testOctreeRearrangeProc.cpp
Tests/Utils/testOctreeRearrangeProc.cpp
+4
-2
No files found.
Tests/Kernels/testChebAlgorithmProc.cpp
View file @
9ac079da
...
...
@@ -47,6 +47,7 @@
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
/**
* This program runs the FMM Algorithm Distributed with the Chebyshev kernel
*/
...
...
@@ -110,10 +111,11 @@ int main(int argc, char* argv[])
loader
.
fillParticle
(
&
particles
[
idxPart
].
position
,
&
particles
[
idxPart
].
physicalValue
);
}
FVector
<
TestParticle
>
finalParticles
;
FLeafBalance
balancer
;
FMpiTreeBuilder
<
TestParticle
>::
ArrayToTree
(
app
.
global
(),
particles
,
loader
.
getNumberOfParticles
(),
tree
.
getBoxCenter
(),
tree
.
getBoxWidth
(),
tree
.
getHeight
(),
&
finalParticles
);
tree
.
getHeight
(),
&
finalParticles
,
&
balancer
);
{
// -----------------------------------------------------
std
::
cout
<<
"Creating & Inserting "
<<
loader
.
getNumberOfParticles
()
...
...
Tests/Kernels/testSphericalProcAlgorithm.cpp
View file @
9ac079da
...
...
@@ -42,6 +42,8 @@
#include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "../../Src/Files/FFmaBinLoader.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include <iostream>
#include <cstdio>
...
...
@@ -281,10 +283,11 @@ int main(int argc, char ** argv){
}
FVector
<
TestParticle
>
finalParticles
;
FLeafBalance
balancer
;
FMpiTreeBuilder
<
TestParticle
>::
ArrayToTree
(
app
.
global
(),
particles
,
loader
.
getNumberOfParticles
(),
tree
.
getBoxCenter
(),
tree
.
getBoxWidth
(),
tree
.
getHeight
(),
&
finalParticles
);
tree
.
getHeight
(),
&
finalParticles
,
&
balancer
);
for
(
int
idx
=
0
;
idx
<
finalParticles
.
getSize
();
++
idx
){
tree
.
insert
(
finalParticles
[
idx
].
position
,
finalParticles
[
idx
].
physicalValue
);
...
...
Tests/Kernels/testUnifAlgorithmProc.cpp
View file @
9ac079da
...
...
@@ -47,6 +47,7 @@
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
/**
* This program runs the FMM Algorithm Distributed with the Uniform kernel
*/
...
...
@@ -110,10 +111,11 @@ int main(int argc, char* argv[])
loader
.
fillParticle
(
&
particles
[
idxPart
].
position
,
&
particles
[
idxPart
].
physicalValue
);
}
FVector
<
TestParticle
>
finalParticles
;
FLeafBalance
balancer
;
FMpiTreeBuilder
<
TestParticle
>::
ArrayToTree
(
app
.
global
(),
particles
,
loader
.
getNumberOfParticles
(),
tree
.
getBoxCenter
(),
tree
.
getBoxWidth
(),
tree
.
getHeight
(),
&
finalParticles
);
tree
.
getHeight
(),
&
finalParticles
,
&
balancer
);
{
// -----------------------------------------------------
std
::
cout
<<
"Creating & Inserting "
<<
loader
.
getNumberOfParticles
()
...
...
Tests/Utils/testFmmAlgorithmProc.cpp
View file @
9ac079da
...
...
@@ -44,6 +44,8 @@
#include "../../Src/Components/FBasicKernels.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include <iostream>
#include <cstdio>
#include <cstdlib>
...
...
@@ -357,10 +359,11 @@ int main(int argc, char ** argv){
}
FVector
<
TestParticle
>
finalParticles
;
FLeafBalance
balancer
;
FMpiTreeBuilder
<
TestParticle
>::
ArrayToTree
(
app
.
global
(),
particles
,
loader
.
getNumberOfParticles
(),
realTree
.
getBoxCenter
(),
realTree
.
getBoxWidth
(),
realTree
.
getHeight
(),
&
finalParticles
);
realTree
.
getHeight
(),
&
finalParticles
,
&
balancer
);
for
(
int
idx
=
0
;
idx
<
finalParticles
.
getSize
();
++
idx
){
realTree
.
insert
(
finalParticles
[
idx
].
position
);
...
...
Tests/Utils/testFmmAlgorithmProcPeriodic.cpp
View file @
9ac079da
...
...
@@ -43,6 +43,7 @@
#include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
/** This program show an example of use of
* the fmm basic algo
...
...
@@ -100,8 +101,9 @@ int main(int argc, char ** argv){
}
FVector
<
TestParticle
>
finalParticles
;
FLeafBalance
balancer
;
FMpiTreeBuilder
<
TestParticle
>::
ArrayToTree
(
app
.
global
(),
particles
,
NbParticles
,
loader
.
getCenterOfBox
(),
loader
.
getBoxWidth
(),
tree
.
getHeight
(),
&
finalParticles
);
loader
.
getBoxWidth
(),
tree
.
getHeight
(),
&
finalParticles
,
&
balancer
);
for
(
int
idx
=
0
;
idx
<
finalParticles
.
getSize
();
++
idx
){
tree
.
insert
(
finalParticles
[
idx
].
position
);
...
...
Tests/Utils/testFmmAlgorithmProcRotation.cpp
View file @
9ac079da
...
...
@@ -42,13 +42,15 @@
#include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "../../Src/Files/FFmaBinLoader.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include <iostream>
#include <cstdio>
#include <cstdlib>
// Uncoment to validate the FMM
#define VALIDATE_FMM
//
#define VALIDATE_FMM
/** This program show an example of use of
* the fmm basic algo it also check that eachh particles is little or longer
...
...
@@ -282,10 +284,11 @@ int main(int argc, char ** argv){
}
FVector
<
TestParticle
>
finalParticles
;
FleafBalance
balancer
;
FMpiTreeBuilder
<
TestParticle
>::
ArrayToTree
(
app
.
global
(),
particles
,
loader
.
getNumberOfParticles
(),
tree
.
getBoxCenter
(),
tree
.
getBoxWidth
(),
tree
.
getHeight
(),
&
finalParticles
);
tree
.
getHeight
(),
&
finalParticles
,
&
balancer
);
for
(
int
idx
=
0
;
idx
<
finalParticles
.
getSize
();
++
idx
){
tree
.
insert
(
finalParticles
[
idx
].
position
,
finalParticles
[
idx
].
physicalValue
);
...
...
@@ -312,7 +315,7 @@ int main(int argc, char ** argv){
// -----------------------------------------------------
std
::
cout
<<
"Create kernel..."
<<
std
::
endl
;
{
KernelClass
kernels
(
NbLevels
,
loader
.
getBoxWidth
(),
loader
.
getCenterOfBox
());
std
::
cout
<<
"Done "
<<
" in "
<<
counter
.
elapsed
()
<<
"s)."
<<
std
::
endl
;
...
...
@@ -320,11 +323,11 @@ int main(int argc, char ** argv){
// -----------------------------------------------------
std
::
cout
<<
"Working on particles ..."
<<
std
::
endl
;
{
FmmClass
algo
(
app
.
global
(),
&
tree
,
&
kernels
);
counter
.
tic
();
algo
.
execute
();
algo
.
execute
(
FFmmM2M
);
counter
.
tac
();
std
::
cout
<<
"Done "
<<
"(@Algorithm = "
<<
counter
.
elapsed
()
<<
"s)."
<<
std
::
endl
;
...
...
@@ -408,7 +411,8 @@ int main(int argc, char ** argv){
ValidateFMMAlgoProc
<
OctreeClass
,
ContainerClass
>
(
&
tree
,
&
treeValide
,
&
app
);
}
#endif
}
}
// -----------------------------------------------------
...
...
Tests/Utils/testOctreeRearrangeProc.cpp
View file @
9ac079da
...
...
@@ -40,6 +40,7 @@
#include "../../Src/Components/FBasicParticleContainer.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
struct
TestParticle
{
FPoint
position
;
...
...
@@ -117,9 +118,10 @@ int main(int argc, char ** argv){
}
FVector
<
TestParticle
>
finalParticles
;
FLeafBalance
balancer
;
FMpiTreeBuilder
<
TestParticle
>::
ArrayToTree
(
app
.
global
(),
particles
,
NbPart
,
FPoint
(
BoxCenter
,
BoxCenter
,
BoxCenter
),
BoxWidth
,
tree
.
getHeight
(),
&
finalParticles
);
FPoint
(
BoxCenter
,
BoxCenter
,
BoxCenter
),
BoxWidth
,
tree
.
getHeight
(),
&
finalParticles
,
&
balancer
);
for
(
int
idx
=
0
;
idx
<
finalParticles
.
getSize
();
++
idx
){
tree
.
insert
(
finalParticles
[
idx
].
position
);
...
...
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