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
30ea4ba9
Commit
30ea4ba9
authored
May 26, 2016
by
Martin Khannouz
Committed by
Berenger Bramas
Mar 14, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
blockedImplicitChebyshev, fix reading particle from file
parent
d8ebb5c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
Tests/GroupTree/testBlockedImplicitChebyshev.cpp
Tests/GroupTree/testBlockedImplicitChebyshev.cpp
+5
-3
No files found.
Tests/GroupTree/testBlockedImplicitChebyshev.cpp
View file @
30ea4ba9
...
@@ -59,7 +59,7 @@ using namespace std;
...
@@ -59,7 +59,7 @@ using namespace std;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FStarPUCpuWrapper
<
typename
GroupOctreeClass
::
CellGroupClass
,
GroupCellClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupContainerClass
>
GroupCpuWrapper
;
typedef
FGroupTaskStarPUImplicitAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
typedef
FGroupTaskStarPUImplicitAlgorithm
<
GroupOctreeClass
,
typename
GroupOctreeClass
::
CellGroupClass
,
GroupKernelClass
,
typename
GroupOctreeClass
::
ParticleGroupClass
,
GroupCpuWrapper
>
GroupAlgorithm
;
//
#define LOAD_FILE
#define LOAD_FILE
#ifndef LOAD_FILE
#ifndef LOAD_FILE
typedef
FRandomLoader
<
FReal
>
LoaderClass
;
typedef
FRandomLoader
<
FReal
>
LoaderClass
;
#else
#else
...
@@ -122,7 +122,8 @@ int main(int argc, char* argv[]){
...
@@ -122,7 +122,8 @@ int main(int argc, char* argv[]){
LoaderClass
loader
(
NbParticles
,
1.0
,
FPoint
<
FReal
>
(
0
,
0
,
0
));
LoaderClass
loader
(
NbParticles
,
1.0
,
FPoint
<
FReal
>
(
0
,
0
,
0
));
#else
#else
for
(
FSize
idxPart
=
0
;
idxPart
<
loader
.
getNumberOfParticles
()
;
++
idxPart
){
for
(
FSize
idxPart
=
0
;
idxPart
<
loader
.
getNumberOfParticles
()
;
++
idxPart
){
loader
.
fillParticle
(
&
allParticlesToSort
[
idxPart
]);
//Same with file or not
FReal
physicalValue
=
0.1
;
loader
.
fillParticle
(
&
allParticlesToSort
[
idxPart
],
&
physicalValue
);
//Same with file or not
}
}
#endif
#endif
...
@@ -139,6 +140,7 @@ int main(int argc, char* argv[]){
...
@@ -139,6 +140,7 @@ int main(int argc, char* argv[]){
//GroupOctreeClass groupedTree(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), groupSize, &allParticles, false);
//GroupOctreeClass groupedTree(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), groupSize, &allParticles, false);
GroupOctreeClass
groupedTree
(
NbLevels
,
loader
.
getBoxWidth
(),
loader
.
getCenterOfBox
(),
groupSize
,
&
allParticles
,
sizeForEachGroup
,
true
);
GroupOctreeClass
groupedTree
(
NbLevels
,
loader
.
getBoxWidth
(),
loader
.
getCenterOfBox
(),
groupSize
,
&
allParticles
,
sizeForEachGroup
,
true
);
groupedTree
.
printInfoBlocks
();
// Run the algorithm
// Run the algorithm
int
operationsToProceed
=
FFmmP2M
|
FFmmM2M
|
FFmmM2L
|
FFmmL2L
|
FFmmL2P
|
FFmmP2P
;
int
operationsToProceed
=
FFmmP2M
|
FFmmM2M
|
FFmmM2L
|
FFmmL2L
|
FFmmL2P
|
FFmmP2P
;
...
@@ -276,7 +278,7 @@ void timeAverage(int mpi_rank, int nproc, double elapsedTime)
...
@@ -276,7 +278,7 @@ void timeAverage(int mpi_rank, int nproc, double elapsedTime)
if
(
tmp
>
sumElapsedTime
)
if
(
tmp
>
sumElapsedTime
)
sumElapsedTime
=
tmp
;
sumElapsedTime
=
tmp
;
}
}
std
::
cout
<<
"Average time per node (implicit Cheby) : "
<<
sumElapsedTime
<<
"s"
<<
std
::
endl
;
std
::
cout
<<
std
::
endl
<<
"Average time per node (implicit Cheby) : "
<<
sumElapsedTime
<<
"s"
<<
std
::
endl
<<
std
::
endl
;
}
}
else
else
{
{
...
...
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