Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
fd6ce2c6
Commit
fd6ce2c6
authored
Mar 03, 2014
by
COULAUD Olivier
Browse files
:Merge branch 'master' of
git+ssh://scm.gforge.inria.fr//gitroot/scalfmm/scalfmm
parents
026ea67c
e8d88803
Changes
1
Hide whitespace changes
Inline
Side-by-side
Src/Core/FFmmAlgorithmThreadProc.hpp
View file @
fd6ce2c6
...
...
@@ -246,7 +246,7 @@ private:
}
FLOG
(
computationCounter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Bottom Pass (P2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
elapsed
()
<<
" s
\n
"
);
}
...
...
@@ -433,7 +433,7 @@ private:
}
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Upward Pass (M2M) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Prepare : "
<<
prepareCounter
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Wait : "
<<
waitCounter
.
cumulated
()
<<
" s
\n
"
);
...
...
@@ -786,7 +786,7 @@ private:
delete
[]
requests
;
delete
[]
status
;
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (M2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Send : "
<<
sendCounter
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Receive : "
<<
receiveCounter
.
cumulated
()
<<
" s
\n
"
);
...
...
@@ -922,7 +922,7 @@ private:
delete
[]
requests
;
delete
[]
status
;
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Downward Pass (L2L) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation : "
<<
computationCounter
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Prepare : "
<<
prepareCounter
.
cumulated
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Wait : "
<<
waitCounter
.
cumulated
()
<<
" s
\n
"
);
...
...
@@ -1088,7 +1088,6 @@ private:
(
*
sendBuffer
[
idxProc
])
<<
toSend
[
idxProc
][
idxLeaf
].
getCurrentGlobalIndex
();
toSend
[
idxProc
][
idxLeaf
].
getCurrentListSrc
()
->
save
(
*
sendBuffer
[
idxProc
]);
}
//TEST BERENGER
//if(sendBuffer[idxProc]->getSize() != partsToSend[idxProc]){
FMpi
::
MpiAssert
(
MPI_Isend
(
sendBuffer
[
idxProc
]
->
data
(),
sendBuffer
[
idxProc
]
->
getSize
()
,
MPI_PACKED
,
...
...
@@ -1289,7 +1288,7 @@ private:
FLOG
(
computation2Counter
.
tac
());
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"
s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation L2P + P2P : "
<<
computationCounter
.
elapsed
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Computation P2P 2 : "
<<
computation2Counter
.
elapsed
()
<<
" s
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t\t
Prepare P2P : "
<<
prepareCounter
.
elapsed
()
<<
" s
\n
"
);
...
...
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